[Xen-changelog] [xen master] tools/configure: fix --with-system-{ovmf/seabios}

[patchbot@xxxxxxx]

commit ecee7bfc18c69892e2a3b213448e592eceeccb7a
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Tue Sep 27 10:13:17 2016 +0200
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Tue Sep 27 10:37:05 2016 +0100

    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@xxxxxxxxxx>
    Suggested-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    [ wei: run autogen.sh ]
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/configure    | 4 ++--
 tools/configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/configure b/tools/configure
index 7b22305..65ad241 100755
--- 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 f010d72..5724ace 100644
--- 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])
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog