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

* configure.ac: Avoid some annoying error messages if freetype-config 

program is not found.
This commit is contained in:
Yves Blusseau 2010-09-16 17:07:42 +02:00
parent 108538d8ff
commit 10854d0d79
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-16 Yves Blusseau <blusseau@zetam.org>
* configure.ac: Avoid some annoying error messages if freetype-config
program is not found.
2010-09-16 Colin Watson <cjwatson@ubuntu.com>
Support RAID on virtio devices, and others.

4
configure.ac
View File

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