--- linuxsampler/trunk/configure.in	2007/11/21 07:29:52	1502
+++ linuxsampler/trunk/configure.in	2008/02/03 16:21:38	1662
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=5
-LINUXSAMPLER_RELEASE_BUILD=0
+LINUXSAMPLER_RELEASE_BUILD=1.2cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -24,16 +24,16 @@
 #  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"
 
 #------------------------------------------------------------------------------------
 # the LSCP specification version this LinuSampler release complies with:
 
 LSCP_RELEASE_MAJOR=1
-LSCP_RELEASE_MINOR=2
+LSCP_RELEASE_MINOR=3
 
 AC_DEFINE_UNQUOTED(LSCP_RELEASE_MAJOR, ${LSCP_RELEASE_MAJOR}, [LSCP spec major version this release complies with.])
 AC_DEFINE_UNQUOTED(LSCP_RELEASE_MINOR, ${LSCP_RELEASE_MINOR}, [LSCP spec minor version this release complies with.])
@@ -52,6 +52,7 @@
 AC_SUBST(target_os)
 AC_SUBST(target_vendor)
 
+PKG_PROG_PKG_CONFIG
 
 ###########################################################################
 # General Checks
@@ -272,6 +273,29 @@
 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.])])
+        have_midi_input_driver="true"
+    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
@@ -407,14 +431,14 @@
 if test "$have_midi_input_driver" = "false"; then
     echo "No supported MIDI input system found!"
     echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:"
-    echo "ALSA, MIDIShare, CoreMIDI."
+    echo "ALSA, JACK, MIDIShare, CoreMIDI, MME."
     echo "If you think you have one of those available on your system, make sure you"
     echo "also have the respective development (header) files installed."
     exit -1;
 fi
 if test "$have_audio_output_driver" = "false"; then
     echo "No supported audio output system found!"
-    echo "Sorry, LinuxSampler only supports ALSA, JACK and ARTS as audio output"
+    echo "Sorry, LinuxSampler only supports ALSA, JACK, ARTS and ASIO as audio output"
     echo "driver at the moment!"
     exit -1;
 fi
@@ -425,7 +449,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 +556,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