[Spice-commits] configure.ac gtk/Makefile.am

[Christophe Fergau]

 configure.ac    |    7 +++++++
 gtk/Makefile.am |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 9057d3ac9c169836274ef5eb62a3b0a76744367f
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Aug 7 16:23:53 2012 +0200

    build: make controller build optional
    
    Apart from the Vala bindings, this is the only part of spice-gtk
    which requires Vala to be built from git. Since it's only useful
    when spice-gtk is used in conjunction with an oVirt browser plugin,
    letting people disabling it will not necessarily cause issues.

diff --git a/configure.ac b/configure.ac
index 233ce4d..e246f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,6 +513,13 @@ PKG_CHECK_EXISTS([GOBJECT_INTROSPECTION],
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 AM_CONDITIONAL([G_IR_SCANNER_SYMBOL_PREFIX], [test "x$has_symbol_prefix" = "xyes"])
 
+AC_ARG_ENABLE([controller],
+  AS_HELP_STRING([--enable-controller], [Enable controller build @<:@default=yes@:>@]),
+  [],
+  enable_controller="yes")
+
+AM_CONDITIONAL(WITH_CONTROLLER, [test "x$enable_controller" != "xno"])
+
 AC_ARG_ENABLE([vala],
   AS_HELP_STRING([--enable-vala], [Check for vala requirements @<:@default=no@:>@]),
   [],
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index fcfc086..785736d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,6 +1,10 @@
 NULL =
 
-SUBDIRS = controller
+SUBDIRS =
+
+if WITH_CONTROLLER
+SUBDIRS += controller
+endif
 
 # Avoid need for perl(Text::CSV) by end users
 KEYMAPS =					\