--- linuxsampler/trunk/configure.in	2007/05/06 16:38:35	1175
+++ linuxsampler/trunk/configure.in	2007/09/04 01:12:49	1321
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=4
-LINUXSAMPLER_RELEASE_BUILD=0.4cvs
+LINUXSAMPLER_RELEASE_BUILD=0.7cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -309,12 +309,11 @@
 AC_SUBST(GIG_LIBS)
 
 # Check presence of sqlite3
-AC_CHECK_PROG(HAVE_SQLITE3_CMD, sqlite3, true, false)
 sqlite_version="3.3"
 PKG_CHECK_MODULES(SQLITE3, sqlite3 >= $sqlite_version, HAVE_SQLITE3=true, HAVE_SQLITE3=false)
 AC_SUBST(SQLITE3_LIBS)
 AC_SUBST(SQLITE3_CFLAGS)
-if test $HAVE_SQLITE3_CMD = false -o $HAVE_SQLITE3 = false; then
+if test $HAVE_SQLITE3 = false; then
     HAVE_SQLITE3=0;
     instruments_db_support="no"
     echo "*** Required sqlite version not found!"
@@ -349,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,
@@ -828,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)
@@ -947,9 +960,7 @@
     src/engines/Makefile \
     src/engines/gig/Makefile \
     src/engines/common/Makefile \
-    src/common/Makefile src/lib/Makefile \
-    src/lib/fileloader/Makefile \
-    src/lib/fileloader/libgig/Makefile \
+    src/common/Makefile \
     src/testcases/Makefile \
     src/drivers/Makefile \
     src/drivers/audio/Makefile \
@@ -967,6 +978,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
@@ -1010,6 +1027,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 "#####################################################################"