Mercurial > hg > octave-nkf

comparison configure.ac @ 15728:1090b62af49d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
USe pkg-config for freetype2 configure check. * configure.ac: Use PKG_CHECK_MODULES to check for freetype2 instead of AC_CHECK_FT2. * acinclude.m4 (AC_CHECK_FT2): Delete macro definition.
author John W. Eaton <jwe@octave.org>
date Tue, 04 Dec 2012 13:52:51 -0500
parents e88b31c485c0
children 6faa01ff2967
comparison
equal deleted inserted replaced
15727:81d80a272da9 15728:1090b62af49d
1052 if test -n "$OPENGL_LIBS"; then 1052 if test -n "$OPENGL_LIBS"; then
1053 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.]) 1053 AC_DEFINE(HAVE_OPENGL, 1, [Define to 1 if OpenGL is available.])
1054 1054
1055 ## Check for FreeType 2 library 1055 ## Check for FreeType 2 library
1056 1056
1057 AC_CHECK_FT2([9.0.3], 1057 PKG_CHECK_MODULES([FT2], [freetype2], [
1058 [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have FreeType library.]) 1058 min_ft2_version=9.03
1059 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], 1059 AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
1060 [warn_freetype="FreeType library not found. Native graphics will be disabled."]) 1060 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
1061 ac_status=$?
1062 if test $ac_status = 0; then
1063 AC_MSG_RESULT(yes)
1064 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
1065 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
1066 else
1067 AC_MSG_RESULT(no)
1068 warn_freetype="FreeType library not found. Native graphics will be disabled."
1069 fi])
1061 1070
1062 if test -n "$warn_freetype"; then 1071 if test -n "$warn_freetype"; then
1063 OCTAVE_CONFIGURE_WARNING([warn_freetype]) 1072 OCTAVE_CONFIGURE_WARNING([warn_freetype])
1064 native_graphics=false 1073 native_graphics=false
1065 fi 1074 fi