[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] tools: only define {OVMF, SEABIOS}_PATH when they are enabled
commit ea27761b5d4c3f695fc9123bd5f815b013bac47f Author: Wei Liu <wei.liu2@xxxxxxxxxx> AuthorDate: Mon Aug 22 16:05:14 2016 +0100 Commit: Wei Liu <wei.liu2@xxxxxxxxxx> CommitDate: Wed Aug 24 12:43:49 2016 +0100 tools: only define {OVMF,SEABIOS}_PATH when they are enabled Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> Tested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> --- tools/configure | 8 ++++++++ tools/configure.ac | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/configure b/tools/configure index 81ccf34..998090a 100755 --- a/tools/configure +++ b/tools/configure @@ -4449,12 +4449,16 @@ if test "${with_system_seabios+set}" = set; then : fi +if test "x$seabios" = "xy"; then : + cat >>confdefs.h <<_ACEOF #define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}" _ACEOF +fi + # Check whether --with-system-ovmf was given. if test "${with_system_ovmf+set}" = set; then : @@ -4468,12 +4472,16 @@ if test "${with_system_ovmf+set}" = set; then : fi +if test "x$ovmf" = "xy"; then : + cat >>confdefs.h <<_ACEOF #define OVMF_PATH "${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}" _ACEOF +fi + # Check whether --with-extra-qemuu-configure-args was given. if test "${with_extra_qemuu_configure_args+set}" = set; then : diff --git a/tools/configure.ac b/tools/configure.ac index c12ad79..1fb4a55 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -222,9 +222,11 @@ AC_ARG_WITH([system-seabios], *) seabios_path=$withval ;; esac ],[]) -AC_DEFINE_UNQUOTED([SEABIOS_PATH], - ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"], - [SeaBIOS path]) +AS_IF([test "x$seabios" = "xy"], [ + AC_DEFINE_UNQUOTED([SEABIOS_PATH], + ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"], + [SeaBIOS path]) +]) AC_ARG_WITH([system-ovmf], AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], @@ -237,9 +239,11 @@ AC_ARG_WITH([system-ovmf], *) ovmf_path=$withval ;; esac ],[]) -AC_DEFINE_UNQUOTED([OVMF_PATH], - ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], - [OVMF path]) +AS_IF([test "x$ovmf" = "xy"], [ + AC_DEFINE_UNQUOTED([OVMF_PATH], + ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], + [OVMF path]) +]) AC_ARG_WITH([extra-qemuu-configure-args], AS_HELP_STRING([--with-extra-qemuu-configure-args@<:@="--ARG1 ..."@:>@], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |