--- linuxsampler/trunk/configure.in	2011/06/11 17:53:32	2183
+++ linuxsampler/trunk/configure.in	2012/08/16 17:01:35	2360
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=1
 LINUXSAMPLER_RELEASE_MINOR=0
-LINUXSAMPLER_RELEASE_BUILD=0.cvs10
+LINUXSAMPLER_RELEASE_BUILD=0.svn18
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -45,6 +45,9 @@
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
 
+module=yes eval LIB_EXT=$shrext_cmds
+AC_SUBST(LIB_EXT)
+
 AC_C_BIGENDIAN
 AC_CANONICAL_HOST
 
@@ -78,6 +81,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,
@@ -499,10 +515,9 @@
 AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
 
 # LV2
-PKG_CHECK_MODULES(LV2, lv2core, config_have_lv2="yes", config_have_lv2="no")
-if test $config_have_lv2 = "no"; then
-    AC_CHECK_HEADER(lv2.h, config_have_lv2="yes", config_have_lv2="no")
-fi
+PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+AC_SUBST(LV2_CFLAGS)
+AC_SUBST(LV2_LIBS)
 AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
 
 # VST
@@ -539,6 +554,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!"
@@ -610,7 +630,7 @@
 # Check for Vorbis support in libsndfile
 linuxsampler_save_CFLAGS=$CFLAGS
 CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
-AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [] ,[[#include <sndfile.h>]])
+AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [], [[#include <sndfile.h>]])
 
 # Check for loop functionality in libsndfile
 AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
@@ -715,13 +735,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.])
 fi
@@ -1320,6 +1341,7 @@
     src/hostplugins/Makefile \
     src/hostplugins/dssi/Makefile \
     src/hostplugins/lv2/Makefile \
+    src/hostplugins/lv2/manifest.ttl \
     src/hostplugins/vst/Makefile \
     src/hostplugins/au/Makefile \
     linuxsampler.spec \