[PATCH] autoconf: add ovmf, rombios and seabios and configure options

[Roger Pau Monne <roger.pau@citrix.com>]

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>
---
 Config.mk          |    4 ----
 config/Tools.mk.in |    3 +++
 tools/configure.ac |    3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Config.mk b/Config.mk
index 796fb8c..09ac1f9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -207,10 +207,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 339a7b6..5d9276a 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -40,6 +40,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.ac b/tools/configure.ac
index 0204e36..52571e8 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -43,6 +43,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],
-- 
1.7.7.5 (Apple Git-26)