--- linuxsampler/trunk/configure.in	2007/04/16 21:56:18	1163
+++ linuxsampler/trunk/configure.in	2007/05/29 23:59:36	1212
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=4
-LINUXSAMPLER_RELEASE_BUILD=0.4cvs
+LINUXSAMPLER_RELEASE_BUILD=0.5cvs
 
 #------------------------------------------------------------------------------------
 # 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!"
@@ -828,6 +827,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)
@@ -862,6 +874,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.])
 
@@ -893,6 +914,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.])
 
@@ -941,7 +971,7 @@
     Artwork/Makefile \
     scripts/Makefile \
     osx/Makefile \
-    osx/LinuxSampler.xcode/Makefile \
+    osx/linuxsampler.xcodeproj/Makefile \
     Documentation/Makefile \
     Documentation/Engines/Makefile \
     Documentation/Engines/gig/Makefile \
@@ -949,6 +979,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
@@ -992,6 +1028,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 "#####################################################################"