[SCM] calf/master: + Autohell: fix JACK2-incompatible JACK check and possible problem with GTK+ headers

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eec58d15f445f3902c980f2486ca5357ba81d9d9
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Wed Oct 15 21:25:04 2008 +0000

    + Autohell: fix JACK2-incompatible JACK check and possible problem with GTK+ headers
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@335 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/configure.ac b/configure.ac
index 82415fe..47e5707 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ PKG_CHECK_MODULES(GLIB_DEPS, glib-2.0 >= 2.0.0, true, AC_MSG_ERROR([glib-2.0 lib
 
 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"),
+    AC_CHECK_LIB([jack], [jack_port_register], JACK_FOUND="yes", JACK_FOUND="no"),
     JACK_FOUND="no")
 else
   JACK_FOUND="no"
diff --git a/src/Makefile.am b/src/Makefile.am
index c0510b2..08de89d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,8 +20,11 @@ endif
 
 AM_CXXFLAGS = -ffast-math -finline-limit=80 -DPKGLIBDIR=\"$(pkglibdir)\"
 
+if USE_GUI
+AM_CXXFLAGS += $(GUI_DEPS_CFLAGS)
+endif
 if USE_JACK
-AM_CXXFLAGS += $(JACK_DEPS_CFLAGS) $(GUI_DEPS_CFLAGS)
+AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
 noinst_LTLIBRARIES += libcalfgui.la
 bin_PROGRAMS += calfjackhost 
 calfjackhost_SOURCES = jackhost.cpp

-- 
calf audio plugins packaging