--- linuxsampler/trunk/configure.in	2011/06/19 09:09:38	2185
+++ 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,15 +733,7 @@
   AC_DEFINE_UNQUOTED(CONFIG_RT_EXCEPTIONS, 1, [Define to 1 to allow exceptions in the realtime context.])
 fi
 
-case "$host" in
-    *-*-darwin*)
-        config_pthread_testcancel=yes
-        ;;
-    *)
-        config_pthread_testcancel=no
-        ;;
-esac
-
+config_pthread_testcancel="$mac"
 AC_ARG_ENABLE(pthread-testcancel,
   [  --enable-pthread-testcancel
                           Enable pthread_testcancel() calls and avoid