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

* configure.ac: Disable unifont and starfield if no freetype was found.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-16 14:54:01 +02:00
parent d5c1eef106
commit 7b966834c5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-16 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Disable unifont and starfield if no freetype was found.
2013-08-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-08-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/posix_wrap/wchar.h: Fix wchar_t and mbstate_t conflict * grub-core/lib/posix_wrap/wchar.h: Fix wchar_t and mbstate_t conflict

10
configure.ac
View File

@ -1009,8 +1009,6 @@ if test x"$grub_build_mkfont_excuse" = x ; then
enable_build_grub_mkfont=yes enable_build_grub_mkfont=yes
else else
enable_build_grub_mkfont=no enable_build_grub_mkfont=no
starfield_excuse="No build-time grub-mkfont"
FONT_SOURCE=
fi fi
if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips ); then if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips ); then
AC_MSG_ERROR([loongson port needs build-time grub-mkfont]) AC_MSG_ERROR([loongson port needs build-time grub-mkfont])
@ -1028,6 +1026,10 @@ DJVU_FONT_SOURCE=
starfield_excuse= starfield_excuse=
if test x"$enable_build_grub_mkfont" = xno ; then
starfield_excuse="No build-time grub-mkfont"
fi
if test x"$starfield_excuse" = x; then if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do
@ -1056,6 +1058,10 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
done done
done done
if test x"$enable_build_grub_mkfont" = xno ; then
FONT_SOURCE=
fi
if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips ); then if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips ); then
AC_MSG_ERROR([qemu and loongson ports need unifont]) AC_MSG_ERROR([qemu and loongson ports need unifont])
fi fi