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

* configure.ac: Make unifont mandatory for powerpc-ieee1275.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-16 15:04:38 +02:00
parent 7b966834c5
commit b2e9d2761e
2 changed files with 8 additions and 4 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: Make unifont mandatory for powerpc-ieee1275.
2013-08-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-08-16 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Disable unifont and starfield if no freetype was found. * configure.ac: Disable unifont and starfield if no freetype was found.

8
configure.ac
View file

@ -1010,8 +1010,8 @@ if test x"$grub_build_mkfont_excuse" = x ; then
else else
enable_build_grub_mkfont=no enable_build_grub_mkfont=no
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 || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then
AC_MSG_ERROR([loongson port needs build-time grub-mkfont]) AC_MSG_ERROR([qemu, powerpc-ieee1275 and loongson ports needs build-time grub-mkfont])
fi fi
AC_SUBST([build_freetype_cflags]) AC_SUBST([build_freetype_cflags])
@ -1062,8 +1062,8 @@ if test x"$enable_build_grub_mkfont" = xno ; then
FONT_SOURCE= FONT_SOURCE=
fi 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 || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then
AC_MSG_ERROR([qemu and loongson ports need unifont]) AC_MSG_ERROR([qemu, powerpc-ieee1275 and loongson ports need unifont])
fi fi
AC_SUBST([FONT_SOURCE]) AC_SUBST([FONT_SOURCE])