--- linuxsampler/trunk/configure.in	2011/06/11 17:53:32	2183
+++ linuxsampler/trunk/configure.in	2011/07/09 16:44:27	2203
@@ -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,
@@ -539,6 +552,11 @@
     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
     echo "No supported MIDI input system found!"
@@ -715,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.])