[SCM] calf/master: + AutoHell: proper glib detection and linking + Benchmark: fixed crash bug when -u option was not specified

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6aee4090ae807a77075f761b53e27cd1acad8e2e
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Thu May 29 18:43:30 2008 +0000

    + AutoHell: proper glib detection and linking
    + Benchmark: fixed crash bug when -u option was not specified
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@192 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/configure.ac b/configure.ac
index 28654ab..9f6a202 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ AC_CHECK_LIB(expat, XML_Parse, true, AC_MSG_ERROR([Expat XML library not found])
 
 AC_CHECK_HEADERS([jack/jack.h], have_jack_header=yes, have_jack_header=no)
 
+PKG_CHECK_MODULES(GLIB_DEPS, glib-2.0 >= 2.0.0, true, AC_MSG_ERROR([glib-2.0 library not found]))
+
 if test "$have_jack_header" = "yes"; then
   PKG_CHECK_MODULES(JACK_DEPS, jack >= 0.103.0,
     AC_CHECK_LIB([jack], [jack_port_new], JACK_FOUND="yes", JACK_FOUND="no"),
@@ -47,6 +49,8 @@ if test "$JACK_FOUND" = "yes"; then
   PKG_CHECK_MODULES(JACK_MIDI_DEPS, jack >= 0.105.0, OLD_JACK="no", OLD_JACK="yes")
 fi
 
+AC_SUBST(GLIB_DEPS_CFLAGS)
+AC_SUBST(GLIB_DEPS_LIBS)
 AC_SUBST(GUI_DEPS_CFLAGS)
 AC_SUBST(GUI_DEPS_LIBS)
 AC_SUBST(JACK_DEPS_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index d1f6122..4e50058 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,16 +32,17 @@ calfjackhost_LDADD += $(LASH_DEPS_LIBS)
 endif
 endif
 
+AM_CXXFLAGS += $(GLIB_DEPS_CFLAGS)
 noinst_PROGRAMS += calfmakerdf
 calfmakerdf_SOURCES = makerdf.cpp
 calfmakerdf_LDADD = libcalfstatic.la
 
 calfbenchmark_SOURCES = benchmark.cpp
-calfbenchmark_LDADD =  -lglib-2.0
+calfbenchmark_LDADD = $(GLIB_DEPS_LIBS)
 
 if USE_DSSI_GUI
 calfdssigui_SOURCES = dssigui.cpp
-calfdssigui_LDADD =  -lglib-2.0 libcalfstatic.la libcalfgui.la $(GUI_DEPS_LIBS)
+calfdssigui_LDADD = libcalfstatic.la libcalfgui.la $(GLIB_DEPS_LIBS) $(GUI_DEPS_LIBS)
 endif
 
 calf_la_SOURCES = modules.cpp giface.cpp monosynth.cpp organ.cpp osctl.cpp preset.cpp synth.cpp utils.cpp
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 3e86b4c..dd65ef2 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -382,7 +382,7 @@ int main(int argc, char *argv[])
     }
     
 #ifdef TEST_OSC
-    if (!strcmp(unit, "osc"))
+    if (unit && !strcmp(unit, "osc"))
         osctl_test();
 #endif
     
@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
     if (!unit || !strcmp(unit, "effects"))
         effect_test();
 
-    if (!strcmp(unit, "reverbir"))
+    if (unit && !strcmp(unit, "reverbir"))
         reverbir_calc();
 
     return 0;

-- 
calf audio plugins packaging