--- linuxsampler/trunk/configure.in	2010/09/15 10:04:07	2123
+++ linuxsampler/trunk/configure.in	2011/08/12 17:30:47	2238
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=1
 LINUXSAMPLER_RELEASE_MINOR=0
-LINUXSAMPLER_RELEASE_BUILD=0.cvs5
+LINUXSAMPLER_RELEASE_BUILD=0.cvs14
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -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
@@ -601,6 +629,13 @@
 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)
@@ -698,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.])
@@ -1385,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 "#-------------------------------------------------------------------#"