[Spice-devel] [PATCH 10/13] jhbuildrc: use module_autogenargs

[Victor Toso]

It is better to have the default configure options inside jhbuildrc
instead of xml moduleset.
---
 jhbuildrc            | 24 ++++++++++++++++++++++++
 modulesets/spice.xml |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/jhbuildrc b/jhbuildrc
index 8b15ef6..4cfff9b 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -33,3 +33,27 @@ os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \
 # Additional flags for make can be specified here
 # Set makeargs to 'V=1' for verbose build output.
 # makeargs = '-j8'
+
+# ---------------------------- #
+# configure options of modules #
+# ---------------------------- #
+
+# Disabling polkit: spice-gtk with polkit breaks `make install` with --prefix
+# http://lists.freedesktop.org/archives/spice-devel/2014-December/018350.html
+module_autogenargs['spice-gtk'] = "--enable-werror " + \
+                                  "--enable-webdav " + \
+                                  "--enable-smartcard " + \
+                                  "--enable-usbredir " + \
+                                  "--disable-polkit " + \
+                                  "--with-gtk=3.0 " + \
+                                  "--with-audio=pulse "
+
+module_autogenargs['spice-server'] = "--enable-werror " + \
+                                     "--enable-smartcard " + \
+                                     "--enable-lz4 " + \
+                                     "--with-sasl "
+
+module_autogenargs['virt-viewer'] = '--enable-werror ' + \
+                                    '--with-spice-gtk ' + \
+                                    '--with-gtk="3.0" ' + \
+                                    '--with-ovirt '
diff --git a/modulesets/spice.xml b/modulesets/spice.xml
index 29fa7b9..589b250 100644
--- a/modulesets/spice.xml
+++ b/modulesets/spice.xml
@@ -26,7 +26,7 @@
   <repository type="git" name="git.gnome.org"
       href="git://git.gnome.org/"/>
 
-  <autotools id="spice-server" autogenargs="--enable-werror --enable-smartcard --with-sasl --disable-client" >
+  <autotools id="spice-server">
     <branch repo="spice" module="spice"/>
     <dependencies>
       <dep package="spice-protocol"/>
@@ -82,7 +82,7 @@
     <dep package="libusb"/>
   </autotools>
 
-  <autotools id="spice-gtk" autogenargs="--disable-usbredir">
+  <autotools id="spice-gtk">
     <branch repo="spice" module="spice-gtk.git"/>
     <dependencies>
       <dep package="spice-protocol"/>
-- 
2.3.6