[SCM] calf/master: + autostuff: configure.in renamed to configure.ac, added --disable-phat switch, phat check fix + LV2: add dummy store_preset function to improve compatibility with SLV2 library

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 911bba96404bbda30ed7ffb36995523b39c7653a
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sun Jan 13 19:48:32 2008 +0000

    + autostuff: configure.in renamed to configure.ac, added --disable-phat switch, phat check fix
    + LV2: add dummy store_preset function to improve compatibility with SLV2 library
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@95 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/autogen.sh b/autogen.sh
index add1707..16feee2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,4 +4,4 @@ libtoolize --force --automake --copy
 autoheader --force
 autoconf --force
 automake --force-missing --copy
-./configure --prefix=/usr --enable-experimental $@
+./configure --enable-experimental $@
diff --git a/config.h.in b/config.h.in
index bd49e05..26bb8dd 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
diff --git a/configure.in b/configure.ac
similarity index 93%
rename from configure.in
rename to configure.ac
index 5e8e56a..e3139b8 100644
--- a/configure.in
+++ b/configure.ac
@@ -85,18 +85,18 @@ else
   LV2_GUI_ENABLED="no"
 fi
 
-if test "$JACK_ENABLED" = "yes"; then
+AC_ARG_ENABLE(phat, [  --disable-phat          to disable usage of PHAT widget set], [], [
   PKG_CHECK_MODULES(PHAT_DEPS, phat >= 0.4.1, 
-    [
-      CFLAGS="$CFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
-      CPPFLAGS="$CPPFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
-      AC_CHECK_HEADERS([phat/phatknob.h], 
-        PHAT_ENABLED="yes", 
-        PHAT_ENABLED="no (phat library is too old, SVN version required)")
-    ],
-    PHAT_ENABLED="no"
+  [
+    CFLAGS="$CFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
+    AC_CHECK_HEADERS([phat/phatknob.h], 
+      PHAT_ENABLED="yes", 
+      PHAT_ENABLED="no (phat library is too old, SVN version required)")
+  ],
+  PHAT_ENABLED="no"
   )
-fi
+])
 
 AC_MSG_CHECKING([whether to enable experimental/unfinished features])
 AC_ARG_ENABLE(experimental,
diff --git a/src/lv2gui.cpp b/src/lv2gui.cpp
index 9463418..cf12339 100644
--- a/src/lv2gui.cpp
+++ b/src/lv2gui.cpp
@@ -176,6 +176,11 @@ void activate_preset(GtkAction *action, activate_preset_params *params)
 {
 }
 
+// so is this function
+void store_preset(GtkWindow *toplevel, plugin_gui *gui)
+{
+}
+
 };
 
 const LV2UI_Descriptor* lv2ui_descriptor(uint32_t index)

-- 
calf audio plugins packaging