[SCM] calf/master: Fix a few bugs in compilation of limited versions (DSSI without GUI, no JACK host).

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c260e0d491235f7332f54ab8eb67105052d8149d
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sat Nov 6 22:53:40 2010 +0000

    Fix a few bugs in compilation of limited versions (DSSI without GUI, no JACK host).

diff --git a/Makefile.am b/Makefile.am
index 9716dc8..caf4475 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,15 @@ clean-local:
 	rm -rf autom4te.cache
 
 install-data-local:
+if USE_JACK
+if USE_GUI
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/calf.schemas
+endif
+endif
         
 uninstall-local:
+if USE_JACK
+if USE_GUI
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_srcdir)/calf.schemas
-        
+endif
+endif        
diff --git a/configure.ac b/configure.ac
index 1b14835..cb8f659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,8 +160,13 @@ AC_ARG_ENABLE(debug,
 AC_MSG_RESULT($set_enable_debug)
 
 if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
-  AC_PATH_PROG(GCONFTOOL, gconftool-2)
+  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+  if test "$GCONFTOOL" = "no"; then
+    AC_MSG_ERROR([gconftool-2 not found - do you have GConf devel package installed?])
+  fi
   AM_GCONF_SOURCE_2
+else
+  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
 fi
 
 ############################################################################################
diff --git a/src/plugin.cpp b/src/plugin.cpp
index cd466c4..1c86636 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -116,7 +116,7 @@ void ladspa_instance::run_synth(unsigned long SampleCount, snd_seq_event_t *Even
 
 char *ladspa_instance::configure(const char *key, const char *value)
 {
-#if USE_DSSI
+#if USE_DSSI_GUI
     if (!strcmp(key, "OSC:FEEDBACK_URI"))
     {
         const line_graph_iface *lgi = dynamic_cast<const line_graph_iface *>(metadata);

-- 
calf audio plugins packaging