--- linuxsampler/trunk/configure.in	2008/05/28 03:44:46	1741
+++ linuxsampler/trunk/configure.in	2008/07/10 15:00:38	1750
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=5
-LINUXSAMPLER_RELEASE_BUILD=1.5cvs
+LINUXSAMPLER_RELEASE_BUILD=1.6cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -162,6 +162,11 @@
     echo "NPTL glibc bug check disabled"
 fi
 
+# FIXME: this is actually a dependency of libgig, not of LS directly, why
+# isn't it hidden by libgig?
+AC_CHECK_HEADERS(uuid/uuid.h)
+AC_SEARCH_LIBS(uuid_generate, uuid)
+
 
 
 ###########################################################################
@@ -265,7 +270,10 @@
     if test $have_jack = "1"; then
         AC_SUBST(JACK_LIBS)
         AC_SUBST(JACK_CFLAGS)
-        AC_CHECK_LIB(jack, jack_client_name_size, [AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE, 1, [Define to 1 if you have the `jack_client_name_size' function.])], , $JACK_LIBS)
+        linuxsampler_save_LIBS=$LIBS
+        LIBS="$JACK_LIBS $LIBS"
+        AC_CHECK_FUNCS(jack_client_name_size jack_client_open)
+        LIBS=$linuxsampler_save_LIBS
         have_audio_output_driver="true";
     fi
 else
@@ -559,7 +567,7 @@
 
 AC_ARG_ENABLE(pthread-testcancel,
   [  --enable-pthread-testcancel
-                          Enable pthread_testcancel() calls and avoid asynchronous 
+                          Enable pthread_testcancel() calls and avoid asynchronous
                           cancel of pthreads (default=no).],
   [config_pthread_testcancel="$enableval"],
   [config_pthread_testcancel="no"]