--- linuxsampler/trunk/configure.in	2007/11/25 17:47:46	1525
+++ linuxsampler/trunk/configure.in	2008/01/27 15:07:11	1651
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=5
-LINUXSAMPLER_RELEASE_BUILD=0.1cvs
+LINUXSAMPLER_RELEASE_BUILD=1
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -24,9 +24,9 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBLINUXSAMPLER_LT_CURRENT=1
+LIBLINUXSAMPLER_LT_CURRENT=2
 LIBLINUXSAMPLER_LT_REVISION=0
-LIBLINUXSAMPLER_LT_AGE=0
+LIBLINUXSAMPLER_LT_AGE=1
 SHARED_VERSION_INFO="$LIBLINUXSAMPLER_LT_CURRENT:$LIBLINUXSAMPLER_LT_REVISION:$LIBLINUXSAMPLER_LT_AGE"
 
 #------------------------------------------------------------------------------------
@@ -52,6 +52,7 @@
 AC_SUBST(target_os)
 AC_SUBST(target_vendor)
 
+PKG_PROG_PKG_CONFIG
 
 ###########################################################################
 # General Checks
@@ -272,6 +273,28 @@
 AM_CONDITIONAL(HAVE_JACK, test $have_jack = "1")
 AC_DEFINE_UNQUOTED(HAVE_JACK,$have_jack,[Define to 1 if you have JACK installed.])
 
+# JACK MIDI
+have_jack_midi=0
+if test $have_jack = "1"; then
+   linuxsampler_save_CFLAGS=$CFLAGS
+   linuxsampler_save_LIBS=$LIBS
+   CFLAGS="$JACK_CFLAGS $CFLAGS"
+   LIBS="$JACK_LIBS $LIBS"
+   AC_CHECK_HEADER(jack/midiport.h, have_jack_midi=1, have_jack_midi=0)
+   if test $have_jack_midi = "1"; then
+     AC_CHECK_FUNCS(jack_midi_get_event_count)
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jack/midiport.h>]], [[
+         jack_midi_clear_buffer(0, 0);
+     ]])], [AC_DEFINE(JACK_MIDI_FUNCS_NEED_NFRAMES, 1,
+             [Define to 1 if you have the old jack midi functions that need an nframes argument.])])
+   fi
+   CFLAGS=$linuxsampler_save_CFLAGS
+   LIBS=$linuxsampler_save_LIBS
+fi
+AM_CONDITIONAL(HAVE_JACK_MIDI, test $have_jack_midi = "1")
+AC_DEFINE_UNQUOTED(HAVE_JACK_MIDI, $have_jack_midi,
+                   [Define to 1 if you have JACK with MIDI support installed.])
+
 # ARTS
 AC_ARG_ENABLE(arts-driver,
   [  --disable-arts-driver
@@ -425,7 +448,7 @@
 # Checks for various DLL libraries
 
 # Check presence of libgig
-libgig_version="3.2.0"
+libgig_version="3.2.1"
 PKG_CHECK_MODULES(GIG, gig >= $libgig_version, HAVE_GIG=true, HAVE_GIG=false)
 if test "$HAVE_GIG" = "false"; then
     echo "Required libgig version not found!"
@@ -532,6 +555,17 @@
   AC_DEFINE_UNQUOTED(CONFIG_RT_EXCEPTIONS, 1, [Define to 1 to allow exceptions in the realtime context.])
 fi
 
+AC_ARG_ENABLE(pthread-testcancel,
+  [  --enable-pthread-testcancel
+                          Enable pthread_testcancel() calls and avoid asynchronous 
+                          cancel of pthreads (default=no).],
+  [config_pthread_testcancel="$enableval"],
+  [config_pthread_testcancel="no"]
+)
+if test "$config_pthread_testcancel" = "yes"; then
+  AC_DEFINE_UNQUOTED(CONFIG_PTHREAD_TESTCANCEL, 1, [Define to 1 to enable pthread_testcancel() calls.])
+fi
+
 AC_ARG_ENABLE(preload-samples,
   [  --enable-preload-samples
                           Due to seeking and latency issues with hard drives