* configure.ac: Remove leftover COND_BUILD_GRUB_MKFONT and

	COND_GRUB_PE2ELF conditions.

diff --git a/ChangeLog b/ChangeLog
index 39541adb494ec83d2eb0f1b63ce91db35c0f1d3c..5a98c7b8188ccc25e3ca0ec8a910d02c8e098797 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: Remove leftover COND_BUILD_GRUB_MKFONT and
+       COND_GRUB_PE2ELF conditions.
+
 2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Accept "sd", "cd",

diff --git a/configure.ac b/configure.ac
index e08aecb6c0e8da9419cdcb51a0014516db805eb1..b430135b53352eb6a365a942df347feb80cdabf0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1351,10 +1351,8 @@ AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
 AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
 AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
 AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
-AM_CONDITIONAL([COND_BUILD_GRUB_MKFONT], [test x$enable_build_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
-AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
 AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC = x1])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1])