# HG changeset patch
# User Fabio Fantoni
# Date 1334149338 -7200
# Node ID b3fcddfb22f269f725d2b81a6c0737bd38a7dd32
# Parent  02996f14cf9af9e3acddabd1a2fa566223dcd44a
autoconf: add variable for pass arbitrary options to qemu upstream v3

Signed-off-by: Fabio Fantoni <fabio.fantoni@xxxxxxxxxx>

diff -r 02996f14cf9a -r b3fcddfb22f2 README
--- a/README	mer apr 11 14:26:12 2012 +0200
+++ b/README	mer apr 11 15:02:18 2012 +0200
@@ -67,6 +67,11 @@
     * Development install of Ocaml (e.g. ocaml-nox and
       ocaml-findlib). Required to build ocaml components which
       includes the alternative ocaml xenstored.
+    * Dev of spice protocol (e.g. libspice-protocol-dev >=0.10)
+    * Dev of spice server (e.g. libspice-server-dev >=0.10)
+      Required to build Spice for qemu upstream if enabled with configure
+    * Dev of usb redirection (e.g. libusbredir-dev). Required to build usb
+      redirection for qemu upstream if enabled with configure
 
 Second, you need to acquire a suitable kernel for use in domain 0. If
 possible you should use a kernel provided by your OS distributor. If
diff -r 02996f14cf9a -r b3fcddfb22f2 config/Tools.mk.in
--- a/config/Tools.mk.in	mer apr 11 14:26:12 2012 +0200
+++ b/config/Tools.mk.in	mer apr 11 15:02:18 2012 +0200
@@ -48,3 +48,4 @@
 CONFIG_GCRYPT       := @libgcrypt@
 CONFIG_EXT2FS       := @libext2fs@
 CURSES_LIBS         := @CURSES_LIBS@
+CONFIG_QEMUU_ADD_PAR:= @qemuu_add_par@
diff -r 02996f14cf9a -r b3fcddfb22f2 tools/Makefile
--- a/tools/Makefile	mer apr 11 14:26:12 2012 +0200
+++ b/tools/Makefile	mer apr 11 15:02:18 2012 +0200
@@ -157,6 +157,7 @@
 		--datadir=$(SHAREDIR)/qemu-xen \
 		--disable-kvm \
 		--python=$(PYTHON) \
+		$(CONFIG_QEMUU_ADD_PAR) \
 		$(IOEMU_CONFIGURE_CROSS); \
 	$(MAKE) install
 
diff -r 02996f14cf9a -r b3fcddfb22f2 tools/configure
--- a/tools/configure	mer apr 11 14:26:12 2012 +0200
+++ b/tools/configure	mer apr 11 15:02:18 2012 +0200
@@ -649,6 +649,7 @@
 APPEND_INCLUDES
 PREPEND_LIB
 PREPEND_INCLUDES
+qemuu_add_par
 debug
 lomount
 miniterm
@@ -726,6 +727,9 @@
 enable_miniterm
 enable_lomount
 enable_debug
+enable_qemuu_spice
+enable_qemuu_usbredir
+enable_qemuu_debug
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1384,6 +1388,9 @@
   --enable-miniterm       Enable miniterm (default is DISABLED)
   --enable-lomount        Enable lomount (default is DISABLED)
   --disable-debug         Disable debug build of tools (default is ENABLED)
+  --enable-qemuu-spice	Enable Spice build on qemu upstream
+  --enable-qemuu-usbredir	Enable usb redirection build on qemu upstream
+  --enable-qemuu-debug	Enable debug build on qemu upstream
 
 Some influential environment variables:
   CC          C compiler command
@@ -4133,6 +4140,22 @@
 debug=$ax_cv_debug
 
 
+# Check whether --enable-qemuu-spice was given.
+if test "${enable_qemuu_spice+set}" = set; then :
+  enableval=$enable_qemuu_spice; qemuu_add_par+=" --enable-spice"
+fi
+
+# Check whether --enable-qemuu-usbredir was given.
+if test "${enable_qemuu_usbredir+set}" = set; then :
+  enableval=$enable_qemuu_usbredir; qemuu_add_par+=" --enable-usb-redir"
+fi
+
+# Check whether --enable-qemuu-debug was given.
+if test "${enable_qemuu_debug+set}" = set; then :
+  enableval=$enable_qemuu_debug; qemuu_add_par+=" --enable-debug"
+fi
+
+
 
 
 
diff -r 02996f14cf9a -r b3fcddfb22f2 tools/configure.ac
--- a/tools/configure.ac	mer apr 11 14:26:12 2012 +0200
+++ b/tools/configure.ac	mer apr 11 15:02:18 2012 +0200
@@ -44,6 +44,16 @@
 AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm])
 AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount])
 AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
+AC_ARG_ENABLE([qemuu-spice],
+[  --enable-qemuu-spice	Enable Spice build on qemu upstream],
+[qemuu_add_par+=" --enable-spice"])
+AC_ARG_ENABLE([qemuu-usbredir],
+[  --enable-qemuu-usbredir	Enable usb redirection build on qemu upstream],
+[qemuu_add_par+=" --enable-usb-redir"])
+AC_ARG_ENABLE([qemuu-debug],
+[  --enable-qemuu-debug	Enable debug build on qemu upstream],
+[qemuu_add_par+=" --enable-debug"])
+AC_SUBST(qemuu_add_par)
 
 AC_ARG_VAR([PREPEND_INCLUDES],
     [List of include folders to prepend to CFLAGS (without -I)])