diff options
| -rw-r--r-- | Config.mk | 4 | ||||
| -rw-r--r-- | config/Tools.mk.in | 3 | ||||
| -rwxr-xr-x | tools/configure | 78 | ||||
| -rw-r--r-- | tools/configure.ac | 3 |
4 files changed, 84 insertions, 4 deletions
@@ -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 912d02199a..ee6cda384d 100644 --- 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 86618f5dae..a7cb994bc2 100755 --- 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 250dffdf47..11a743f485 100644 --- 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], |