[SCM] calf/master: + AutoHell: allow disabling DSSI plugins while leaving LADSPA enabled; set version to 0.0.19

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dbc6fa733cfaa3eedb884b15a2d5284f1221f6a4
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Feb 8 22:18:56 2009 +0000

    + AutoHell: allow disabling DSSI plugins while leaving LADSPA enabled; set version to 0.0.19

diff --git a/configure.ac b/configure.ac
index ee3c171..e5adf3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([calf],[0.0.18.2],[wdev at foltman.com])
+AC_INIT([calf],[0.0.19],[wdev at foltman.com])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
@@ -63,15 +63,6 @@ PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
 PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.5.2, LASH_ENABLED="yes", LASH_ENABLED="no")
 PKG_CHECK_MODULES(SLV2_HACK, slv2 <= 0.6.1, SLV2_UNSUPPORTED="yes", SLV2_UNSUPPORTED="no")
 
-if test "$JACK_FOUND" = "yes" -o "$DSSI_FOUND" = "yes" -o "$LV2_ENABLED" = "yes"; then
-  PKG_CHECK_MODULES(GUI_DEPS, gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0 cairo >= 1.2.0,
-    GUI_ENABLED="yes",
-    GUI_ENABLED="no (GTK+ 2.8, cairo 1.2 and libglade 2.4.0 or newer required)"
-  )
-else
-  GUI_ENABLED="no"
-fi
-
 if test "$LADSPA_FOUND" = "yes"; then
   AC_MSG_CHECKING([whether to allow LADSPA])
   AC_ARG_WITH(ladspa,
@@ -80,6 +71,14 @@ if test "$LADSPA_FOUND" = "yes"; then
   AC_MSG_RESULT($LADSPA_FOUND)
 fi
 
+if test "$DSSI_FOUND" = "yes"; then
+  AC_MSG_CHECKING([whether to allow DSSI])
+  AC_ARG_WITH(dssi,
+    AC_HELP_STRING([--without-dssi],[disable DSSI interface]),
+      [if test "$withval" = "no"; then DSSI_FOUND="no"; fi],[])
+  AC_MSG_RESULT($DSSI_FOUND)
+fi
+
 if test "$LV2_ENABLED" = "yes"; then
   AC_MSG_CHECKING([whether to allow LV2])
   AC_ARG_WITH(lv2,
@@ -88,6 +87,15 @@ if test "$LV2_ENABLED" = "yes"; then
   AC_MSG_RESULT($LV2_ENABLED)
 fi
 
+if test "$JACK_FOUND" = "yes" -o "$DSSI_FOUND" = "yes" -o "$LV2_ENABLED" = "yes"; then
+  PKG_CHECK_MODULES(GUI_DEPS, gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0 cairo >= 1.2.0,
+    GUI_ENABLED="yes",
+    GUI_ENABLED="no (GTK+ 2.8, cairo 1.2 and libglade 2.4.0 or newer required)"
+  )
+else
+  GUI_ENABLED="no"
+fi
+
 if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
   JACK_ENABLED="yes"
 else

-- 
calf audio plugins packaging