--- linuxsampler/trunk/configure.in	2009/10/25 22:22:52	2015
+++ linuxsampler/trunk/configure.in	2011/07/11 17:52:01	2205
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=1
 LINUXSAMPLER_RELEASE_MINOR=0
-LINUXSAMPLER_RELEASE_BUILD=0.cvs2
+LINUXSAMPLER_RELEASE_BUILD=0.cvs11
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -33,7 +33,7 @@
 # the LSCP specification version this LinuSampler release complies with:
 
 LSCP_RELEASE_MAJOR=1
-LSCP_RELEASE_MINOR=4
+LSCP_RELEASE_MINOR=5
 
 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.])
@@ -78,6 +78,19 @@
 fi
 AC_SUBST([CXX_CPU_SWITCH])
 
+mac=no
+linux=no
+case "$host" in
+    *-*-darwin*)
+        mac=yes
+        ;;
+    *-*-linux*)
+        linux=yes
+        ;;
+esac
+AM_CONDITIONAL(LINUX, test "$linux" = yes)
+AM_CONDITIONAL(MAC, test "$mac" = yes)
+
 # check if we're on MS Windows
 AC_CHECK_HEADERS(
     mmsystem.h,
@@ -528,6 +541,21 @@
 AM_CONDITIONAL(HAVE_AU, test $config_have_au = "yes")
 AM_CONDITIONAL(HAVE_AUFLAGS, test "$AUFLAGS" != "")
 
+if test $config_have_au = "yes" ; then
+    if test "x$DEVELOPER_EXTRAS_DIR" = "x" ; then
+        if test -d /Developer/Extras ; then
+            DEVELOPER_EXTRAS_DIR=/Developer/Extras
+        else      
+            DEVELOPER_EXTRAS_DIR=/Developer/Examples
+        fi
+    fi
+    AC_SUBST(DEVELOPER_EXTRAS_DIR)
+fi
+
+if test "x$MAC_PLUGIN_INSTALL_DIR" = "x" ; then
+    MAC_PLUGIN_INSTALL_DIR=/Library/Audio/Plug-Ins
+fi
+AC_SUBST(MAC_PLUGIN_INSTALL_DIR)
 
 # have we found at least one MIDI input and one audio output driver ?
 if test "$have_midi_input_driver" = "false"; then
@@ -563,31 +591,17 @@
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
-# SF2 Engine (requires libsf2)
+# SF2 Engine (requires libgig)
 AC_ARG_ENABLE(sf2-engine,
   [  --disable-sf2-engine
                           Disable compilation of the SF2 engine.
-			  You need to have libsf2 installed.],
+			  You need to have libgig installed.],
   [config_sf2_engine="$enableval"],
   [config_sf2_engine="yes"]
 )
 HAVE_SF2=0;
 if test "$config_sf2_engine" = "yes"; then
-    # Check presence of libsf2
-    libsf2_version="0.0.1"
-    PKG_CHECK_MODULES(SF2, sf2 >= $libsf2_version, HAVE_SF2=true, HAVE_SF2=false)
-    AC_SUBST(SF2_LIBS)
-    AC_SUBST(SF2_CFLAGS)
-    if test $HAVE_SF2 = false; then
-        HAVE_SF2=0
-        config_sf2_engine="no"
-        echo "*** Required libsf2 version not found!"
-        echo "*** You need to have libsf2 version ${libsf2_version} or higher"
-        echo "*** for SF2 engine to be enabled."
-        echo "*** Support for SF2 instruments will be disabled!"
-    else
-        HAVE_SF2=1
-    fi
+    HAVE_SF2=1
 else
     echo "SF2 engine disabled by configure script parameter"
 fi
@@ -611,6 +625,19 @@
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
 
+# Check for Vorbis support in libsndfile
+linuxsampler_save_CFLAGS=$CFLAGS
+CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
+AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [] ,[[#include <sndfile.h>]])
+
+# Check for loop functionality in libsndfile
+AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
+		 [AC_MSG_WARN([Your version of libsndfile does not support
+    reading of loop information. LinuxSampler will not be able to
+    extract loop information from sample files.])],
+		 [#include <sndfile.h>])
+CFLAGS=$linuxsampler_save_CFLAGS
+
 # Instruments DB feature (requires SQLite 3.3)
 AC_ARG_ENABLE(instruments-db,
   [  --disable-instruments-db
@@ -706,12 +733,14 @@
   AC_DEFINE_UNQUOTED(CONFIG_RT_EXCEPTIONS, 1, [Define to 1 to allow exceptions in the realtime context.])
 fi
 
+config_pthread_testcancel="$mac"
 AC_ARG_ENABLE(pthread-testcancel,
   [  --enable-pthread-testcancel
-                          Enable pthread_testcancel() calls and avoid asynchronous
-                          cancel of pthreads (default=no).],
+                          Enable pthread_testcancel() calls and avoid
+                          asynchronous cancel of pthreads (default=yes
+                          for Mac targets, no otherwise).],
   [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.])
@@ -1393,6 +1422,9 @@
 echo "# Sampler Engines:"
 echo "# GIG: yes, SF2: ${config_have_sf2}, SFZ: yes"
 echo "#-------------------------------------------------------------------"
+echo "# Effect plugin systems for internal effects:"
+echo "# LADSPA: yes"
+echo "#-------------------------------------------------------------------"
 echo "# Building sampler as plugin for following host standards:"
 echo "# DSSI: ${config_have_dssi}, LV2: ${config_have_lv2}, VST: ${config_have_vst}, AU: ${config_have_au}"
 echo "#-------------------------------------------------------------------#"