diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-08-07 16:23:53 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-08-07 17:06:01 +0200 |
| commit | 9057d3ac9c169836274ef5eb62a3b0a76744367f (patch) | |
| tree | 7e845a596b840b29297c2b7814af475399eb27a5 | |
| parent | 6160f08134fa42b422239fc3be0425576f58d808 (diff) | |
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.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | gtk/Makefile.am | 6 |
2 files changed, 12 insertions, 1 deletions
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 = \ |