--- linuxsampler/trunk/configure.in	2007/10/14 22:00:17	1424
+++ 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
+LINUXSAMPLER_RELEASE_BUILD=1
 
 #------------------------------------------------------------------------------------
 # 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
@@ -79,6 +80,14 @@
 fi
 AC_SUBST([CXX_CPU_SWITCH])
 
+# check if we're on MS Windows
+AC_CHECK_HEADERS(
+    mmsystem.h,
+    have_windows=1,
+    have_windows=0
+)
+AM_CONDITIONAL(HAVE_WINDOWS, test $have_windows = "1")
+
 AC_MSG_CHECKING([whether UNIX98 compatible])
 AC_LANG_SAVE
 AC_LANG_C
@@ -101,7 +110,7 @@
 )
 AC_LANG_RESTORE
 AC_MSG_RESULT([$have_unix98])
-if test "$have_unix98" = "no"; then
+if test "$have_unix98" = "no" -a "have_windows" = "0"; then
     if test "x$HAVE_UNIX98" = "x"; then
         echo "LinuxSampler only runs on UNIX98 compatible systems, which is mandatory for"
         echo "pthread_mutexattr_settype() call in Mutex.cpp. You may want to run
@@ -114,6 +123,45 @@
 # check for <features.h>
 AC_CHECK_HEADERS(features.h)
 
+# test for POSIX thread library
+m4_ifdef([m4_include(m4/pthread.m4)],,
+             [sinclude([m4/pthread.m4])])
+ACX_PTHREAD
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+CC="$PTHREAD_CC"
+
+# check for a bug in NPTL-enabled glibc
+# (see Gentoo bug report #194076)
+AC_ARG_ENABLE(nptl-bug-check,
+  [  --disable-nptl-bug-check
+                          Disable check for a bug in certain NPTL-enabled
+                          glibc versions that caused crashs.],
+  [config_check_nptl_bug="$enableval"],
+  [config_check_nptl_bug="yes"]
+)
+if test "$config_check_nptl_bug" = "yes"; then
+    m4_ifdef([m4_include(m4/nptl_bug.m4)],,
+             [sinclude([m4/nptl_bug.m4])])
+    ACX_NPTL_GLIBC_BUG([
+        echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+        echo "You seem to have a buggy PTHREAD library! LinuxSampler would"
+        echo "probably crash due to this. Please report us the system you are"
+        echo "using and/or file a bug report to the bug tracking system of"
+        echo "your distribution."
+        echo "If you have a NPTL-enabled glibc AND it was compiled for TLS as"
+        echo "well, you can try to circumvent this problem for now by setting"
+        echo "the environment variable LD_ASSUME_KERNEL=\"2.4.1\" , which"
+        echo "should cause this test to pass."
+        echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+        AC_MSG_ERROR([possibly NPTL glibc bug detected])
+    ])
+else
+    echo "NPTL glibc bug check disabled"
+fi
+
+
 
 ###########################################################################
 # Checks for available audio and MIDI systems / drivers
@@ -225,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
@@ -247,6 +317,45 @@
 AM_CONDITIONAL(HAVE_ARTS, test "$have_arts" = "1")
 AC_DEFINE_UNQUOTED(HAVE_ARTS,$have_arts,[Define to 1 if you have aRts installed.])
 
+# ASIO AUDIO (Win32)
+AC_ARG_ENABLE(asiosdk-dir,
+  [  --enable-asiosdk-dir
+                          Directory where the ASIO SDK is located, this automatically
+                          enables the compilation of the ASIO audio output driver.],
+  [config_asiosdk_dir="${enableval}"],
+  [config_asiosdk_dir="."]
+)
+AC_SUBST(config_asiosdk_dir)
+
+AC_ARG_ENABLE(asio-driver,
+  [  --disable-asio-driver
+                          Disable support for the Windows ASIO driver.],
+  [config_asio_driver="$enableval"],
+  [config_asio_driver="yes"]
+)
+have_asio=0
+ASIOSDK_BASEDIR=
+if test "$config_asio_driver" = "yes"; then
+    asiosdk_headerfile=$config_asiosdk_dir/ASIOSDK2/common/asio.h
+    echo -n "checking for ASIO headerfile: $asiosdk_headerfile ...."
+    if test -e $asiosdk_headerfile ; then
+        echo yes
+        have_asio=1
+        ASIOSDK_BASEDIR="$config_asiosdk_dir"
+    else
+        echo no
+        have_asio=0
+    fi
+    if test "$have_asio" = "1"; then
+        have_audio_output_driver="true"
+    fi
+else
+    echo "Windows ASIO support disabled by configure script parameter"
+fi
+AC_SUBST(ASIOSDK_BASEDIR)
+AM_CONDITIONAL(HAVE_ASIO, test $have_asio = "1")
+AC_DEFINE_UNQUOTED(HAVE_ASIO,$have_asio,[Define to 1 if you have ASIO installed.])
+
 # MidiShare (Linux, OS X, Windows)
 AC_ARG_ENABLE(midishare-driver,
   [  --disable-midishare-driver
@@ -295,6 +404,28 @@
 AM_CONDITIONAL(HAVE_COREMIDI, test $have_coremidi = "1")
 AC_DEFINE_UNQUOTED(HAVE_COREMIDI,$have_coremidi,[Define to 1 if you have CoreMIDI installed.])
 
+# MME MIDI (Win32)
+AC_ARG_ENABLE(mmemidi-driver,
+  [  --disable-mmemidi-driver
+                          Disable support for the Windows MME MIDI system.],
+  [config_mmemidi_driver="$enableval"],
+  [config_mmemidi_driver="yes"]
+)
+have_mmemidi=0
+if test "$config_mmemidi_driver" = "yes"; then
+    AC_CHECK_HEADERS(mmsystem.h,
+        have_mmemidi=1,
+        have_mmemidi=0
+    )
+    if test "$have_mmemidi" = "1"; then
+        have_midi_input_driver="true"
+    fi
+else
+    echo "MME MIDI support disabled by configure script parameter"
+fi
+AM_CONDITIONAL(HAVE_MME_MIDI, test $have_mmemidi = "1")
+AC_DEFINE_UNQUOTED(HAVE_MME_MIDI,$have_mmemidi,[Define to 1 if you have MME MIDI installed.])
+
 # have we found at least one MIDI input and one audio output driver ?
 if test "$have_midi_input_driver" = "false"; then
     echo "No supported MIDI input system found!"
@@ -317,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!"
@@ -424,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
@@ -875,7 +1017,7 @@
     "$config_default_instruments_db_file",
     [Only when instruments DB feature is enabled: default location of the DB file.]
 )
-
+AC_SUBST(config_default_instruments_db_file)
 
 
 ###########################################################################