From a5b55c4b32bc2fc1b424527b8b7067fca91b0d1a Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 15 Jun 2013 21:13:04 +0200 Subject: [PATCH] * configure.ac (FREETYPE): Change AC_CHECK_PROGS to AC_CHECK_TOOLS. (freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE. --- ChangeLog | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index abed6fa0d..4e7abb564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-06-15 David Michael + + * configure.ac (FREETYPE): Change AC_CHECK_PROGS to AC_CHECK_TOOLS. + (freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE. + 2013-06-15 Vladimir Serbinenko * tests/grub_script_eval.in: Really add the eval test. diff --git a/configure.ac b/configure.ac index 2f7b8b3c4..536de2908 100644 --- a/configure.ac +++ b/configure.ac @@ -944,7 +944,7 @@ fi if test x"$grub_mkfont_excuse" = x ; then # Check for freetype libraries. - AC_CHECK_PROGS([FREETYPE], [freetype-config]) + AC_CHECK_TOOLS([FREETYPE], [freetype-config]) if test "x$FREETYPE" = x ; then grub_mkfont_excuse=["need freetype2 library"] fi @@ -952,8 +952,8 @@ fi if test x"$grub_mkfont_excuse" = x ; then # Check for freetype libraries. - freetype_cflags=`freetype-config --cflags` - freetype_libs=`freetype-config --libs` + freetype_cflags=`$FREETYPE --cflags` + freetype_libs=`$FREETYPE --libs` SAVED_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $freetype_cflags" AC_CHECK_HEADERS([ft2build.h], [],