* configure.ac: The Loongson port requires grub-mkfont due to its

use of -DUSE_ASCII_FAILBACK.  Raise an error if it is not going to
be built.

diff --git a/ChangeLog b/ChangeLog
index fa33902abe16a4e30c137e718dc75a5c131714af..19e034dc040b30b873f77f59b93ba610cb66065b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-26  Colin Watson  <cjwatson@ubuntu.com>
+
+       * configure.ac: The Loongson port requires grub-mkfont due to its
+       use of -DUSE_ASCII_FAILBACK.  Raise an error if it is not going to
+       be built.
+
 2011-07-26  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-install.in: Don't source grub-mkconfig_lib until after

diff --git a/configure.ac b/configure.ac
index f674a90aacf3925a5313c38a6dc23b38031d9a54..e6d726548f6321f97d96c59bf28046267366adf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -866,6 +866,9 @@ enable_grub_mkfont=yes
 else
 enable_grub_mkfont=no
 fi
+if test x"$enable_grub_mkfont" = xno && test "x$platform" = xloongson; then
+  AC_MSG_ERROR([loongson port needs grub-mkfont])
+fi
 AC_SUBST([enable_grub_mkfont])
 AC_SUBST([freetype_cflags])
 AC_SUBST([freetype_libs])