enable emuusb and emupci on emu platform only

Also explicitly disable them in configure unless built for emu platform.

Signed-off-by: Andrey Borzenkov <arvidjaar@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 085ce9f1c7dba5f991d36cad6acf0bb4bd8c80a3..5367d190fd10d7cbdf28fdb5c53de38467174714 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-04  Andrey Borzenkov <arvidjaar@gmail.com>
+
+       *  configure.ac: Explicitly disable emusdl, emuusb and emupci on non-
+       emu platforms.
+       * grub-core/Makefile.core.def: Enable emupci and emuucb only for emu.
+
 2013-11-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi: Document usage of menuentry id.

diff --git a/configure.ac b/configure.ac
index 4df64f8861b837ff8987bf64d514ed66cba616af..1094b9249b5e7347ba3bd377e9c70dfe3d3f7a97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1026,6 +1026,13 @@ fi
 AC_SUBST([enable_grub_emu_sdl])
 AC_SUBST([enable_grub_emu_usb])
 AC_SUBST([enable_grub_emu_pci])
+
+else
+
+# Ignore --enable-emu-* if platform is not emu
+enable_grub_emu_sdl=no
+enable_grub_emu_usb=no
+enable_grub_emu_pci=no
 fi
 
 AC_ARG_ENABLE([grub-mkfont],

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0878f0102421fbef7315ef940de853faa9403379..199016103f1fc776aceeb67834ff90eb5c5f3968 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -497,6 +497,7 @@ module = {
 module = {
   name = emuusb;
   common = bus/usb/usb.c;
+  enable = emu;
   condition = COND_GRUB_EMU_USB;
 };
 
@@ -566,6 +567,7 @@ module = {
   common = bus/emu/pci.c;
   common = commands/lspci.c;
 
+  enable = emu;
   condition = COND_GRUB_EMU_PCI;
 };