diff --git a/ChangeLog b/ChangeLog index ca072dbd8..96ea4f698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-08-16 Vladimir Serbinenko + + * configure.ac: Disable unifont and starfield if no freetype was found. + 2013-08-16 Vladimir Serbinenko * grub-core/lib/posix_wrap/wchar.h: Fix wchar_t and mbstate_t conflict diff --git a/configure.ac b/configure.ac index 3e29b3964..d038984e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1009,8 +1009,6 @@ if test x"$grub_build_mkfont_excuse" = x ; then enable_build_grub_mkfont=yes else enable_build_grub_mkfont=no - starfield_excuse="No build-time grub-mkfont" - FONT_SOURCE= fi 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]) @@ -1028,6 +1026,10 @@ DJVU_FONT_SOURCE= 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 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 @@ -1056,6 +1058,10 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do 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 AC_MSG_ERROR([qemu and loongson ports need unifont]) fi