Current 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....@citrix.com>
Cc: Wei Liu <wei.l...@citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
---
Please re-run autogen.sh before committing.
---
tools/configure.ac | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tools/configure.ac b/tools/configure.ac
index f010d72..6788ea2 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -222,10 +222,9 @@ AC_ARG_WITH([system-seabios],
*) seabios_path=$withval ;;
esac
],[])
-AS_IF([test "x$seabios" = "xy"], [
- AC_DEFINE_UNQUOTED([SEABIOS_PATH],
- ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
- [SeaBIOS path])
+AS_IF([test "x$seabios" = "xy"], [seabios_path=$XENFIRMWAREDIR/seabios.bin])
+AS_IF([test -n "$seabios_path"], [
+ AC_DEFINE_UNQUOTED([SEABIOS_PATH],["$seabios_path"],[SeaBIOS path])
])
AC_ARG_WITH([system-ovmf],
@@ -239,10 +238,9 @@ AC_ARG_WITH([system-ovmf],
*) ovmf_path=$withval ;;
esac
],[])
-AS_IF([test "x$ovmf" = "xy"], [
- AC_DEFINE_UNQUOTED([OVMF_PATH],
- ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
- [OVMF path])
+AS_IF([test "x$ovmf" = "xy"], [ovmf_path=$XENFIRMWAREDIR/ovmf.bin])
+AS_IF([test -n "$ovmf_path"], [
+ AC_DEFINE_UNQUOTED([OVMF_PATH],["$ovmf_path"],[OVMF path])
])
AC_ARG_WITH([extra-qemuu-configure-args],
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
