* configure.ac (FREETYPE): Change AC_CHECK_PROGS to AC_CHECK_TOOLS.

	(freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE.

diff --git a/ChangeLog b/ChangeLog
index abed6fa0dd2584758b21786020830e2e5fdb89ff..4e7abb564aa8a062c170724a85244a814306aac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-15  David Michael  <fedora.dm0@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * tests/grub_script_eval.in: Really add the eval test.

diff --git a/configure.ac b/configure.ac
index 2f7b8b3c4df9ccc60137060c2510863cdc7abd31..536de29083c7e205bf3766b621a771fcf55203e7 100644 (file)
--- 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], [],