2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>

	* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
	ft2build.h.

diff --git a/ChangeLog b/ChangeLog
index 4792506a9880a3cbbdf9e43b6ce6729514de9d18..33e87f310b6e0220bd640ac2fc50b9677105a0ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: Update CPPFLAGS and not CFLAGS when checking for
+       ft2build.h.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * normal/cmdline.c (grub_cmdline_get): Fix gabled line after

diff --git a/configure.ac b/configure.ac
index cf43608d1a8120bfa8e531183d1852a36bd758f4..6deac6c6d7022588a822d425fefa2b9864bd3076 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -696,11 +696,11 @@ fi
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  SAVED_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $freetype_cflags"
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
   AC_CHECK_HEADERS([ft2build.h], [],
        [grub_mkfont_excuse=["need freetype2 headers"]])
-  CFLAGS="$SAVED_CFLAGS"
+  CPPFLAGS="$SAVED_CPPFLAGS"
 fi
 
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then