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

* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
	ft2build.h.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-06 21:27:04 +01:00
parent 696fd607c6
commit d1e8a02f11
2 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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