From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Aug 2013 13:04:38 +0000 (+0200)
Subject: 	* configure.ac: Make unifont mandatory for powerpc-ieee1275.
X-Git-Tag: grub-2.02-beta1~894
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2e9d2761e59b395b3de0e9b3b07ae7f1747d75d;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index 96ea4f698..56ad50ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* 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])