Mercurial > octave-nkf

comparison configure.ac @ 15831:1cdca9bf7b7e stable

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 2e8eb9ac43a5
children f366e9948259 858cbf6fc2ec
comparison
equal deleted inserted replaced
15830:5b3e56d588b1 15831:1cdca9bf7b7e
855 if test -n "$OPENGL_LIBS"; then 855 if test -n "$OPENGL_LIBS"; then
856 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available]) 856 AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
857 857
858 ## freetype 2 858 ## freetype 2
859 859
860 AC_CHECK_FT2([9.0.3], [AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.]) 860 PKG_CHECK_MODULES([FT2], [freetype2], [
861 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], 861 min_ft2_version=9.03
862 [warn_freetype="FreeType library not found. Native graphics will be disabled."]) 862 AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
863 $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
864 ac_status=$?
865 if test $ac_status = 0; then
866 AC_MSG_RESULT(yes)
867 AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
868 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
869 else
870 AC_MSG_RESULT(no)
871 warn_freetype="FreeType library not found. Native graphics will be disabled."
872 fi])
863 873
864 ## fontconfig library 874 ## fontconfig library
865 875
866 warn_fontconfig="" 876 warn_fontconfig=""
867 if test -z "$warn_freetype"; then 877 if test -z "$warn_freetype"; then