Mercurial > octave-nkf
changeset 9845:722bd8f6a750
configure.ac: fix freetype check
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 21 Nov 2009 21:34:18 -0500 |
| parents | edf065b51fa9 |
| children | 1d90fc211872 |
| files | ChangeLog common.mk configure.ac |
| diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 20 10:35:49 2009 +0100 +++ b/ChangeLog Sat Nov 21 21:34:18 2009 -0500 @@ -1,3 +1,9 @@ +2009-11-21 John W. Eaton <jwe@octave.org> + + * common.mk: Substitute FT2_CFLAGS. + * configure.ac: Remove spurious lines in check for freetype. Add + $FT2_CFLAGS to $XTRA_CXXFLAGS. + 2009-11-18 Jaroslav Hajek <highegg@gmail.com> * NEWS: Update.
--- a/common.mk Fri Nov 20 10:35:49 2009 +0100 +++ b/common.mk Sat Nov 21 21:34:18 2009 -0500 @@ -166,6 +166,7 @@ LIBOCTAVE = @LIBOCTAVE@ LIBCRUFT = @LIBCRUFT@ +FT2_CFLAGS = @FT2_CFLAGS@ FT2_LIBS = @FT2_LIBS@ HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
--- a/configure.ac Fri Nov 20 10:35:49 2009 +0100 +++ b/configure.ac Sat Nov 21 21:34:18 2009 -0500 @@ -746,29 +746,22 @@ if test -n "$OPENGL_LIBS"; then AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available]) -## freetype 2 - AC_CHECK_FT2([9.0.3],[AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])], + ## freetype 2 + + AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) + XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"]) - if test -z "$warn_freetype"; then - AC_LANG_PUSH(C++) - save_LIBS="$LIBS" - save_CXXFLAGS="$CXXFLAGS" - save_CPPFLAGS="$CPPFLAGS" - LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS" - CXXFLAGS="$CXXFLAGS $FT2_CFLAGS" - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" - fi fi -# fontconfig library +## fontconfig library warn_fontconfig="" if test -z "$warn_freetype"; then - PKG_CHECK_MODULES(FONTCONFIG,[fontconfig],[ + PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [ have_fontconfig=yes OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS" XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS" - AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present])],[ + AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present])], [ have_fontconfig=no warn_fontconfig="Fontconfig not found. Native text rendering will use hard-coded font instead."]) fi