[Xen-devel] [PATCH 2/2] tools: Clear private variables from configure --with-opt

[Olaf Hering <olaf@xxxxxxxxx>]

Configure will use variables from environment when substituting a
private variable if the corresponding --with*-foo option is omited.
This happens for seabios_path, ovmf_path and EXTRA_QEMUU_CONFIGURE_ARGS:

git clean -dfx
env EXTRA_QEMUU_CONFIGURE_ARGS=XXXXXXXXXXXXXXXX ./configure
grep XXXXXXXXXXXXXXXX config/Tools.mk
CONFIG_QEMUU_EXTRA_ARGS:= XXXXXXXXXXXXXXXX

The reason is the empty "action-if-not-given" case. Fix the bug by
clearing the variables in this case.

Please rerun autogen.sh after applying this patch.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/configure.ac b/tools/configure.ac
index 12b8824..c359339 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -208,7 +208,7 @@ AC_ARG_WITH([system-seabios],
         no) seabios_path= ;;
         *)  seabios_path=$withval ;;
     esac
-],[])
+],[seabios_path=])
 AC_SUBST(seabios_path)
 
 AC_ARG_WITH([system-ovmf],
@@ -219,7 +219,7 @@ AC_ARG_WITH([system-ovmf],
         no) ovmf_path= ;;
         *)  ovmf_path=$withval ;;
     esac
-],[])
+],[ovmf_path=])
 AC_SUBST(ovmf_path)
 
 AC_ARG_WITH([extra-cflags-tools],
@@ -259,7 +259,7 @@ AC_ARG_WITH([extra-qemuu-configure-args],
         no) EXTRA_QEMUU_CONFIGURE_ARGS= ;;
         *)  EXTRA_QEMUU_CONFIGURE_ARGS=$withval ;;
     esac
-],[])
+],[EXTRA_QEMUU_CONFIGURE_ARGS=])
 AC_SUBST(EXTRA_QEMUU_CONFIGURE_ARGS)
 
 AC_ARG_VAR([PREPEND_INCLUDES],

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel