vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
(freetype_cflags,freetype_libs): Change freetype-config to $FREETYPE.
This commit is contained in:
David Michael 2013-06-15 21:13:04 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 0301a8b36d
commit a5b55c4b32
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-06-15 Vladimir Serbinenko <phcoder@gmail.com>
* tests/grub_script_eval.in: Really add the eval test. * tests/grub_script_eval.in: Really add the eval test.

6
configure.ac
View file

@ -944,7 +944,7 @@ fi
if test x"$grub_mkfont_excuse" = x ; then if test x"$grub_mkfont_excuse" = x ; then
# Check for freetype libraries. # Check for freetype libraries.
AC_CHECK_PROGS([FREETYPE], [freetype-config]) AC_CHECK_TOOLS([FREETYPE], [freetype-config])
if test "x$FREETYPE" = x ; then if test "x$FREETYPE" = x ; then
grub_mkfont_excuse=["need freetype2 library"] grub_mkfont_excuse=["need freetype2 library"]
fi fi
@ -952,8 +952,8 @@ fi
if test x"$grub_mkfont_excuse" = x ; then if test x"$grub_mkfont_excuse" = x ; then
# Check for freetype libraries. # Check for freetype libraries.
freetype_cflags=`freetype-config --cflags` freetype_cflags=`$FREETYPE --cflags`
freetype_libs=`freetype-config --libs` freetype_libs=`$FREETYPE --libs`
SAVED_CPPFLAGS="$CPPFLAGS" SAVED_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $freetype_cflags" CPPFLAGS="$CPPFLAGS $freetype_cflags"
AC_CHECK_HEADERS([ft2build.h], [], AC_CHECK_HEADERS([ft2build.h], [],