--- linuxsampler/trunk/configure.in	2007/04/16 15:51:18	1161
+++ linuxsampler/trunk/configure.in	2007/06/26 21:41:09	1259
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=4
-LINUXSAMPLER_RELEASE_BUILD=0.4cvs
+LINUXSAMPLER_RELEASE_BUILD=0.6cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -348,17 +348,18 @@
 # TODO: should we use AC_ARG_VAR(variable, description) instead?
 
 AC_ARG_ENABLE(asm,
-  [  --enable-asm
+  [  --disable-asm
                           Enable hand-crafted assembly optimizations
-                          (default=off). LinuxSampler provides CPU specific
-                          assembly optimizations for the most important
-                          synthesis algorithms. This is currently disabled
-                          by default since current asm code is broken.],
-  [config_asm="yes"],
-  [config_asm="no"]
+                          (default=on). LinuxSampler provides CPU specific
+                          assembly optimizations. This is currently limited
+                          to just enter a fast (denormal) FPU mode on x86
+                          platforms. There are currently no synthesis core
+                          assembly optimizations anymore since LS 0.4.0],
+  [config_asm="no"],
+  [config_asm="yes"]
 )
 if test "$config_asm" = "yes"; then
-  AC_DEFINE_UNQUOTED(CONFIG_ASM, 1, [Define to 1 if you want to enable hand-crafted asm optimizations.])
+  AC_DEFINE_UNQUOTED(CONFIG_ASM, 1, [Define to 1 if you want to enable asm optimizations.])
 fi
 
 AC_ARG_ENABLE(dev-mode,
@@ -827,6 +828,19 @@
   AC_DEFINE_UNQUOTED(CONFIG_INTERPOLATE_VOLUME, 1, [Define to 1 if you want to enable interpolation of volume modulation.])
 fi
 
+AC_ARG_ENABLE(plugin-dir,
+  [  --enable-plugin-dir
+                          Directory where the sampler shall look for potential plugins,
+                          that is 3rd party shared libraries that should be loaded by
+                          the sampler on startup. By default the sampler will search
+                          for plugins in the subdirectory "plugins" below its own
+                          library directory.
+                          (i.e. /usr/local/lib/linuxsampler/plugins)],
+  [config_plugin_dir="${enableval}"],
+  [config_plugin_dir="${libdir}/linuxsampler/plugins"]
+)
+AC_SUBST(config_plugin_dir)
+
 
 ###########################################################################
 # Automatic Benchmarks (to detect the best algorithms for the system)
@@ -861,6 +875,15 @@
         echo "Call './configure --help' for further information or read configure.in."
         exit -1;
     fi
+else
+    case "$config_signed_triang_algo" in
+        intmath)
+            triang_signed=2 ;;
+        diharmonic)
+            triang_signed=3 ;;
+        intmathabs)
+            triang_signed=5 ;;
+    esac
 fi
 AC_DEFINE_UNQUOTED(CONFIG_SIGNED_TRIANG_ALGO, ${triang_signed}, [Define signed triangular wave algorithm to be used.])
 
@@ -892,6 +915,15 @@
         echo "Call './configure --help' for further information or read configure.in."
         exit -1;
     fi
+else
+    case "$config_unsigned_triang_algo" in
+        intmath)
+            triang_unsigned=2 ;;
+        diharmonic)
+            triang_unsigned=3 ;;
+        intmathabs)
+            triang_unsigned=5 ;;
+    esac
 fi
 AC_DEFINE_UNQUOTED(CONFIG_UNSIGNED_TRIANG_ALGO, ${triang_unsigned}, [Define unsigned triangular wave algorithm to be used.])
 
@@ -940,7 +972,7 @@
     Artwork/Makefile \
     scripts/Makefile \
     osx/Makefile \
-    osx/LinuxSampler.xcode/Makefile \
+    osx/linuxsampler.xcodeproj/Makefile \
     Documentation/Makefile \
     Documentation/Engines/Makefile \
     Documentation/Engines/gig/Makefile \
@@ -948,6 +980,12 @@
     Doxyfile \
 )
 
+# resolve all nested variables in '${config_plugin_dir}'
+# (merely for providing a human readable summary below)
+while test $config_plugin_dir != `eval echo ${config_plugin_dir}` ; do
+	config_plugin_dir=`eval echo ${config_plugin_dir}`
+done
+
 
 ###########################################################################
 # Output All Configuration Options
@@ -991,6 +1029,7 @@
 echo "# Process All-Notes-Off MIDI message: ${config_process_all_notes_off}"
 echo "# Interpolate Volume: ${config_interpolate_volume}"
 echo "# Instruments database support: ${instruments_db_support}"
+echo "# Plugin Path: ${config_plugin_dir}"
 echo "#-------------------------------------------------------------------#"
 echo "# Read './configure --help' or file 'configure.in' for details.     #"
 echo "#####################################################################"