mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/configure: make iPXE dependent on QEMU traditional
iPXE is only used by QEMU traditional, so make it off by default
unless QEMU traditional is enabled.
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Fixes: bcf77ce510 ('configure: modify default of building rombios')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Reviewed-by: Ian Jackson <iwj@xenproject.org>
This commit is contained in:
Roger Pau Monne authored and Ian Jackson committed
1 parent
7379f9e10a
commit
9d9cd0c6f5
2 files changed
+23
-19
No files matched your search
Vendored
+16
-12
@@ -1504,8 +1504,8 @@ Optional Features:
|
||||
--enable-qemu-traditional
|
||||
Enable qemu traditional device model, (DEFAULT is
|
||||
off)
|
||||
--enable-ipxe Enable in-tree IPXE, (DEFAULT is on for x86,
|
||||
otherwise off, see also --with-system-ipxe)
|
||||
--enable-ipxe Enable in-tree IPXE, (DEFAULT is off, see also
|
||||
--with-system-ipxe)
|
||||
--enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional
|
||||
or ipxe is enabled, otherwise off)
|
||||
--enable-systemd Enable systemd support (default is DISABLED)
|
||||
@@ -4300,25 +4300,29 @@ else
|
||||
|
||||
fi
|
||||
|
||||
if test "x$enable_ipxe" = "xno"; then :
|
||||
ipxe=n
|
||||
else
|
||||
ipxe=y
|
||||
fi
|
||||
|
||||
# Check whether --enable-ipxe was given.
|
||||
if test "${enable_ipxe+set}" = set; then :
|
||||
enableval=$enable_ipxe;
|
||||
else
|
||||
|
||||
case "$host_cpu" in
|
||||
i[3456]86|x86_64)
|
||||
enable_ipxe="yes";;
|
||||
*) enable_ipxe="no";;
|
||||
esac
|
||||
if test "x$enable_qemu_traditional" = "xyes"; then :
|
||||
|
||||
enable_ipxe="yes"
|
||||
|
||||
else
|
||||
|
||||
enable_ipxe="no"
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "x$enable_ipxe" = "xno"; then :
|
||||
ipxe=n
|
||||
else
|
||||
ipxe=y
|
||||
fi
|
||||
|
||||
# Check whether --with-system-ipxe was given.
|
||||
if test "${with_system_ipxe+set}" = set; then :
|
||||
|
||||
+7
-7
@@ -130,13 +130,13 @@ AC_SUBST(qemu_traditional)
|
||||
|
||||
AC_ARG_ENABLE([ipxe],
|
||||
AS_HELP_STRING([--enable-ipxe],
|
||||
[Enable in-tree IPXE, (DEFAULT is on for x86,
|
||||
otherwise off, see also --with-system-ipxe)]),,[
|
||||
case "$host_cpu" in
|
||||
i[[3456]]86|x86_64)
|
||||
enable_ipxe="yes";;
|
||||
*) enable_ipxe="no";;
|
||||
esac
|
||||
[Enable in-tree IPXE,
|
||||
(DEFAULT is off, see also --with-system-ipxe)]),,[
|
||||
AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
|
||||
enable_ipxe="yes"
|
||||
], [
|
||||
enable_ipxe="no"
|
||||
])
|
||||
])
|
||||
AS_IF([test "x$enable_ipxe" = "xno"], [ipxe=n], [ipxe=y])
|
||||
AC_ARG_WITH([system-ipxe],
|
||||
|
||||