From: Fabio Fantoni <fabio.fantoni@m2r.biz>
Date: Fri, 9 May 2014 12:06:46 +0000 (+0200)
Subject: autoconf: add variable for pass arbitrary options to qemu upstream
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4998
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9aa2cef51f3dced396a5ae10de586206956f9ffd;p=xen.git

autoconf: add variable for pass arbitrary options to qemu upstream

Added configure options for pass arbitrary configure options to qemu
upstream build.

Usage example:
./configure --with-extra-qemuu-configure-args="--enable-spice --enable-usb-redir"

Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 18f3b8ab2b..84b261211a 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -55,6 +55,7 @@ CONFIG_QEMU_TRAD    := @qemu_traditional@
 CONFIG_QEMU_XEN     := @qemu_xen@
 CONFIG_BLKTAP1      := @blktap1@
 CONFIG_VTPM         := @vtpm@
+CONFIG_QEMUU_EXTRA_ARGS:= @EXTRA_QEMUU_CONFIGURE_ARGS@
 
 #System options
 ZLIB                := @zlib@
diff --git a/tools/Makefile b/tools/Makefile
index 3675515eb8..992fe3e8e8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -203,6 +203,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--disable-docs \
 		--disable-guest-agent \
 		--python=$(PYTHON) \
+		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		$(IOEMU_CONFIGURE_CROSS); \
 	$(MAKE) all
 
diff --git a/tools/configure b/tools/configure
index e1eeff4230..d4a7919745 100755
--- a/tools/configure
+++ b/tools/configure
@@ -683,6 +683,7 @@ APPEND_LIB
 APPEND_INCLUDES
 PREPEND_LIB
 PREPEND_INCLUDES
+EXTRA_QEMUU_CONFIGURE_ARGS
 ovmf_path
 seabios_path
 qemu_xen
@@ -767,6 +768,7 @@ enable_qemu_traditional
 with_system_qemu
 with_system_seabios
 with_system_ovmf
+with_extra_qemuu_configure_args
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1440,6 +1442,9 @@ Optional Packages:
   --with-system-ovmf[=PATH]
                           Use system supplied OVMF PATH instead of building
                           and installing our own version
+  --with-extra-qemuu-configure-args[="--ARG1 ..."]
+                          List of additional configure options for upstream
+                          qemu
 
 Some influential environment variables:
   CC          C compiler command
@@ -3825,6 +3830,19 @@ fi
 
 
 
+# Check whether --with-extra-qemuu-configure-args was given.
+if test "${with_extra_qemuu_configure_args+set}" = set; then :
+  withval=$with_extra_qemuu_configure_args;
+    case $withval in
+        no) EXTRA_QEMUU_CONFIGURE_ARGS= ;;
+        *)  EXTRA_QEMUU_CONFIGURE_ARGS=$withval ;;
+    esac
+
+fi
+
+
+
+
 
 
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 00fb47bae9..25d7ca389c 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -118,6 +118,16 @@ AC_ARG_WITH([system-ovmf],
 ],[])
 AC_SUBST(ovmf_path)
 
+AC_ARG_WITH([extra-qemuu-configure-args],
+    AS_HELP_STRING([--with-extra-qemuu-configure-args@<:@="--ARG1 ..."@:>@],
+       [List of additional configure options for upstream qemu]),[
+    case $withval in
+        no) EXTRA_QEMUU_CONFIGURE_ARGS= ;;
+        *)  EXTRA_QEMUU_CONFIGURE_ARGS=$withval ;;
+    esac
+],[])
+AC_SUBST(EXTRA_QEMUU_CONFIGURE_ARGS)
+
 AC_ARG_VAR([PREPEND_INCLUDES],
     [List of include folders to prepend to CFLAGS (without -I)])
 AC_ARG_VAR([PREPEND_LIB],