tools/configure: fix --with-system-{ovmf/seabios}

Currently configure code doesn't define {SEABIOS/OVMF}_PATH when
--with-system-{ovmf/seabios} is used. Fix this by making sure those
defines are always set if the internal {ovmf/seabios}_path variables are
also set.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Suggested-by: Wei Liu <wei.liu2@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
[ wei: run autogen.sh ]
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/configure b/tools/configure
index 7b223051a0330d3e10b010e155d76b0d177e1abc..65ad241757b68130a625710a97fc57884007ecb9 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -4449,7 +4449,7 @@ if test "${with_system_seabios+set}" = set; then :
 
 fi
 
-if test "x$seabios" = "xy"; then :
+if test "x$seabios" = "xy" -o -n "$seabios_path" ; then :
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4472,7 +4472,7 @@ if test "${with_system_ovmf+set}" = set; then :
 
 fi
 
-if test "x$ovmf" = "xy"; then :
+if test "x$ovmf" = "xy" -o -n "$ovmf_path" ; then :
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/tools/configure.ac b/tools/configure.ac
index f010d7233ee6eb649de941e8f44fc17d9b4560df..5724ace2dfd0d3c88b5abb6178f9ad48b1e69cdd 100644 (file)
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -222,7 +222,7 @@ AC_ARG_WITH([system-seabios],
         *)  seabios_path=$withval ;;
     esac
 ],[])
-AS_IF([test "x$seabios" = "xy"], [
+AS_IF([test "x$seabios" = "xy" -o -n "$seabios_path" ], [
     AC_DEFINE_UNQUOTED([SEABIOS_PATH],
                        ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
                        [SeaBIOS path])
@@ -239,7 +239,7 @@ AC_ARG_WITH([system-ovmf],
         *)  ovmf_path=$withval ;;
     esac
 ],[])
-AS_IF([test "x$ovmf" = "xy"], [
+AS_IF([test "x$ovmf" = "xy" -o -n "$ovmf_path" ], [
     AC_DEFINE_UNQUOTED([OVMF_PATH],
                        ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
                        [OVMF path])