autoconf: add ovmf, rombios and seabios and configure options

Move this hardcoded options from Config.mk to config/Tools.mk and add the
appropiate configure options.

Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 0dc2d8e650d664de65e812d2a1905be646c20689..8c3e3b396559712042608ba8a4d9bd535bc2279f 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -208,10 +208,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2
 
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
-CONFIG_OVMF ?= n
-CONFIG_ROMBIOS ?= y
-CONFIG_SEABIOS ?= y
-
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.
 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 912d02199aaa0ff81416a8b38c97294f8dddca1a..ee6cda384d333fe593c2ca781f91e82f6ddd755b 100644 (file)
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -44,6 +44,9 @@ PYTHON_TOOLS        := @pythontools@
 OCAML_TOOLS         := @ocamltools@
 CONFIG_MINITERM     := @miniterm@
 CONFIG_LOMOUNT      := @lomount@
+CONFIG_OVMF         := @ovmf@
+CONFIG_ROMBIOS      := @rombios@
+CONFIG_SEABIOS      := @seabios@
 
 #System options
 CONFIG_SYSTEM_LIBAIO:= @system_aio@

diff --git a/tools/configure b/tools/configure
index 86618f5dae62d3092b465f9bb01e7152ba835c4f..a7cb994bc27cbecc8dc7e73126af1b8413c23f7c 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -653,6 +653,9 @@ APPEND_INCLUDES
 PREPEND_LIB
 PREPEND_INCLUDES
 debug
+seabios
+rombios
+ovmf
 lomount
 miniterm
 ocamltools
@@ -728,6 +731,9 @@ enable_pythontools
 enable_ocamltools
 enable_miniterm
 enable_lomount
+enable_ovmf
+enable_rombios
+enable_seabios
 enable_debug
 '
       ac_precious_vars='build_alias
@@ -1386,6 +1392,9 @@ Optional Features:
   --disable-ocamltools    Disable Ocaml tools (default is ENABLED)
   --enable-miniterm       Enable miniterm (default is DISABLED)
   --enable-lomount        Enable lomount (default is DISABLED)
+  --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)
 
 Some influential environment variables:
@@ -4133,6 +4142,75 @@ lomount=$ax_cv_lomount
 
 
 
+# Check whether --enable-ovmf was given.
+if test "${enable_ovmf+set}" = set; then :
+  enableval=$enable_ovmf;
+fi
+
+
+if test "x$enable_ovmf" = "xno"; then :
+
+    ax_cv_ovmf="n"
+
+elif test "x$enable_ovmf" = "xyes"; then :
+
+    ax_cv_ovmf="y"
+
+elif test -z $ax_cv_ovmf; then :
+
+    ax_cv_ovmf="n"
+
+fi
+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;
+fi
+
+
+if test "x$enable_seabios" = "xno"; then :
+
+    ax_cv_seabios="n"
+
+elif test "x$enable_seabios" = "xyes"; then :
+
+    ax_cv_seabios="y"
+
+elif test -z $ax_cv_seabios; then :
+
+    ax_cv_seabios="y"
+
+fi
+seabios=$ax_cv_seabios
+
+
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;

diff --git a/tools/configure.ac b/tools/configure.ac
index 250dffdf47a442f43fa12188ac6407ef62285d22..11a743f4852ef6679008f155b980cee1c92f1701 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -45,6 +45,9 @@ AX_ARG_DEFAULT_ENABLE([pythontools], [Disable Python tools])
 AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
 AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm])
 AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount])
+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])
 
 AC_ARG_VAR([PREPEND_INCLUDES],