configure: disable ROMBIOS if qemu-trad is disabled

ROMBIOS only works with qemu-traditional, so if it is disabled,
disable ROMBIOS also.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- ran autogen.sh ]

diff --git a/tools/config.h.in b/tools/config.h.in
index bb34f32afbc4ab91e3e32f8ed1663567c31702d5..180966259784ca98bcb75fe472dac29cc8d2eaec 100644 (file)
--- a/tools/config.h.in
+++ b/tools/config.h.in
@@ -24,6 +24,9 @@
 /* Qemu traditional enabled */
 #undef HAVE_QEMU_TRADITIONAL
 
+/* ROMBIOS enabled */
+#undef HAVE_ROMBIOS
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 

diff --git a/tools/configure b/tools/configure
index 80a74e310d1415b48a5fc2fd556a33968ed0735f..ea7b4de00397a638e7eb0ea4e107d84aa70561cd 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -687,11 +687,11 @@ EXTRA_QEMUU_CONFIGURE_ARGS
 ovmf_path
 seabios_path
 qemu_xen
+rombios
 qemu_traditional
 blktap1
 debug
 seabios
-rombios
 ovmf
 xsmpolicy
 ocamltools
@@ -760,11 +760,11 @@ enable_monitors
 enable_ocamltools
 enable_xsmpolicy
 enable_ovmf
-enable_rombios
 enable_seabios
 enable_debug
 enable_blktap1
 enable_qemu_traditional
+enable_rombios
 with_system_qemu
 with_system_seabios
 with_system_ovmf
@@ -1421,13 +1421,14 @@ Optional Features:
   --disable-ocamltools    Disable Ocaml tools (default is ENABLED)
   --disable-xsmpolicy     Disable XSM policy compilation (default is ENABLED)
   --enable-ovmf           Enable OVMF (default is DISABLED)
-  --disable-rombios       Disable ROM BIOS (default is ENABLED)
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
   --disable-debug         Disable debug build of tools (default is ENABLED)
   --enable-blktap1        Enable blktap1 tools (default is DISABLED)
   --enable-qemu-traditional
                           Enable qemu traditional device model, (DEFAULT is on
                           for Linux or NetBSD x86, otherwise off)
+  --enable-rombios        Enable ROMBIOS, (DEFAULT is on if qemu-traditional
+                          is enabled, otherwise off)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3654,29 +3655,6 @@ ovmf=$ax_cv_ovmf
 
 
 
-# Check whether --enable-rombios was given.
-if test "${enable_rombios+set}" = set; then :
-  enableval=$enable_rombios;
-fi
-
-
-if test "x$enable_rombios" = "xno"; then :
-
-    ax_cv_rombios="n"
-
-elif test "x$enable_rombios" = "xyes"; then :
-
-    ax_cv_rombios="y"
-
-elif test -z $ax_cv_rombios; then :
-
-    ax_cv_rombios="y"
-
-fi
-rombios=$ax_cv_rombios
-
-
-
 # Check whether --enable-seabios was given.
 if test "${enable_seabios+set}" = set; then :
   enableval=$enable_seabios;
@@ -3777,6 +3755,36 @@ else
 fi
 
 
+# Check whether --enable-rombios was given.
+if test "${enable_rombios+set}" = set; then :
+  enableval=$enable_rombios;
+else
+
+    if test "x$enable_qemu_traditional" = "xyes"; then :
+
+        enable_rombios="yes"
+
+else
+
+        enable_rombios="no"
+
+fi
+
+fi
+
+if test "x$enable_rombios" = "xyes"; then :
+
+
+$as_echo "#define HAVE_ROMBIOS 1" >>confdefs.h
+
+    rombios=y
+else
+
+    rombios=n
+
+fi
+
+
 
 # Check whether --with-system-qemu was given.
 if test "${with_system_qemu+set}" = set; then :

diff --git a/tools/configure.ac b/tools/configure.ac
index 282dbc4cd8959217a57e18d762e27e8c442b3d0b..d9eab5a6293067d599f6d57881d9506169bd81a2 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -54,7 +54,6 @@ AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools])
 AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
 AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
 AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
-AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS])
 AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
 AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
 AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools])
@@ -80,6 +79,22 @@ AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled])
 ])
 AC_SUBST(qemu_traditional)
 
+AC_ARG_ENABLE([rombios],
+    AS_HELP_STRING([--enable-rombios],
+                   [Enable ROMBIOS, (DEFAULT is on if qemu-traditional is enabled, otherwise off)]),,[
+    AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
+        enable_rombios="yes"
+    ], [
+        enable_rombios="no"
+    ])
+])
+AS_IF([test "x$enable_rombios" = "xyes"], [
+AC_DEFINE([HAVE_ROMBIOS], [1], [ROMBIOS enabled])
+    rombios=y],[
+    rombios=n
+])
+AC_SUBST(rombios)
+
 AC_ARG_WITH([system-qemu],
     AS_HELP_STRING([--with-system-qemu@<:@=PATH@:>@],
        [Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen