From 5ff249072ddf833fa9391b3d262fc9332823b49f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 7 Dec 2013 11:47:19 +0100 Subject: [PATCH] * configure.ac: Make unifont mandatory on coreboot. --- ChangeLog | 4 ++++ configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 990bf5bf3..7ac6c39ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-07 Vladimir Serbinenko + + * configure.ac: Make unifont mandatory on coreboot. + 2013-12-07 Vladimir Serbinenko * configure.ac: Skip unifont 6.3 pcf and bdf. diff --git a/configure.ac b/configure.ac index e9f53f64f..02bc6885f 100644 --- a/configure.ac +++ b/configure.ac @@ -1270,8 +1270,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 || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then - AC_MSG_ERROR([qemu, powerpc-ieee1275 and loongson ports 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 || test "x$platform" = xcoreboot ); then + AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont]) fi AC_SUBST([build_freetype_cflags]) @@ -1339,8 +1339,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 || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then - AC_MSG_ERROR([qemu, powerpc-ieee1275 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 || test "x$platform" = xcoreboot ); then + AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont]) fi AC_SUBST([FONT_SOURCE])