From b2e9d2761e59b395b3de0e9b3b07ae7f1747d75d Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 16 Aug 2013 15:04:38 +0200 Subject: [PATCH] * configure.ac: Make unifont mandatory for powerpc-ieee1275. --- ChangeLog | 4 ++++ configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96ea4f698..56ad50ccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-08-16 Vladimir Serbinenko + + * configure.ac: Make unifont mandatory for powerpc-ieee1275. + 2013-08-16 Vladimir Serbinenko * configure.ac: Disable unifont and starfield if no freetype was found. diff --git a/configure.ac b/configure.ac index d038984e1..cca12b308 100644 --- a/configure.ac +++ b/configure.ac @@ -1010,8 +1010,8 @@ if test x"$grub_build_mkfont_excuse" = x ; then else enable_build_grub_mkfont=no 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]) +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([qemu, powerpc-ieee1275 and loongson ports needs build-time grub-mkfont]) fi AC_SUBST([build_freetype_cflags]) @@ -1062,8 +1062,8 @@ 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]) +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, powerpc-ieee1275 and loongson ports need unifont]) fi AC_SUBST([FONT_SOURCE])