--- linuxsampler/trunk/configure.in	2006/04/14 19:13:32	852
+++ linuxsampler/trunk/configure.in	2007/05/29 23:59:36	1212
@@ -4,8 +4,8 @@
 # LinuxSampler's / liblinuxsampler's "official" release version:
 
 LINUXSAMPLER_RELEASE_MAJOR=0
-LINUXSAMPLER_RELEASE_MINOR=3
-LINUXSAMPLER_RELEASE_BUILD=3cvs
+LINUXSAMPLER_RELEASE_MINOR=4
+LINUXSAMPLER_RELEASE_BUILD=0.5cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -29,6 +29,15 @@
 LIBLINUXSAMPLER_LT_AGE=0
 SHARED_VERSION_INFO="$LIBLINUXSAMPLER_LT_CURRENT:$LIBLINUXSAMPLER_LT_REVISION:$LIBLINUXSAMPLER_LT_AGE"
 
+#------------------------------------------------------------------------------------
+# the LSCP specification version this LinuSampler release complies with:
+
+LSCP_RELEASE_MAJOR=1
+LSCP_RELEASE_MINOR=2
+
+AC_DEFINE_UNQUOTED(LSCP_RELEASE_MAJOR, ${LSCP_RELEASE_MAJOR}, [LSCP spec major version this release complies with.])
+AC_DEFINE_UNQUOTED(LSCP_RELEASE_MINOR, ${LSCP_RELEASE_MINOR}, [LSCP spec minor version this release complies with.])
+
 AM_PROG_LIBTOOL
 
 AC_SUBST(SHLIB_VERSION_ARG)
@@ -64,7 +73,7 @@
 if ! echo "X $CXXFLAGS " | grep -q -- " \(-march=\|-mcpu=\|-mtune=\|-arch=\)" ; then
   if test "$def_arch_x86" = 1; then
     CXX_CPU_SWITCH="-march=$target_cpu"
-  elif test "$target_cpu" = "powerpc"; then
+  elif test "$target_cpu" = "ppc"; then
     CXX_CPU_SWITCH="-arch=$target_cpu"
   fi
 fi
@@ -287,7 +296,7 @@
 AC_DEFINE_UNQUOTED(HAVE_COREMIDI,$have_coremidi,[Define to 1 if you have CoreMIDI installed.])
 
 # Check presence of libgig
-libgig_version="2.0.2"
+libgig_version="3.1.1"
 PKG_CHECK_MODULES(GIG, gig >= $libgig_version, HAVE_GIG=true, HAVE_GIG=false)
 if test "$HAVE_GIG" = "false"; then
     echo "Required libgig version not found!"
@@ -299,16 +308,21 @@
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
-# SQLITE3
-PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=true, HAVE_SQLITE3=false)
+# Check presence of sqlite3
+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 = false; then
     HAVE_SQLITE3=0;
-    echo "no, support for instrument DB will be disabled!"
+    instruments_db_support="no"
+    echo "*** Required sqlite version not found!"
+    echo "*** You need to have sqlite version ${sqlite_version} or higher"
+    echo "*** for instruments database support to be enabled."
+    echo "*** Support for instruments DB will be disabled!"
 else
     HAVE_SQLITE3=1
-    echo "yes"
+    instruments_db_support="yes"
 fi
 AM_CONDITIONAL(HAVE_SQLITE3, test $HAVE_SQLITE3 = 1)
 AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$HAVE_SQLITE3,[Define to 1 if you have SQLITE3 installed.])
@@ -526,15 +540,16 @@
 )
 AC_DEFINE_UNQUOTED(CONFIG_DEFAULT_SUBFRAGMENT_SIZE, $config_subfragment_size, [Define default subfragment size (in sample points).])
 
-AC_ARG_ENABLE(global-attenuation,
-  [  --enable-global-attenuation
+AC_ARG_ENABLE(global-attenuation-default,
+  [  --enable-global-attenuation-default
                           To prevent clipping all samples will be lowered
-                          in amplitude by this given factor.
+                          in amplitude by this given default factor (can
+                          be overridden at runtime).
                           (default=0.35)],
-  [config_global_attenuation="${enableval}"],
-  [config_global_attenuation="0.35"]
+  [config_global_attenuation_default="${enableval}"],
+  [config_global_attenuation_default="0.35"]
 )
-AC_DEFINE_UNQUOTED(CONFIG_GLOBAL_ATTENUATION, $config_global_attenuation, [Define global volume attenuation (as floating point factor).])
+AC_DEFINE_UNQUOTED(CONFIG_GLOBAL_ATTENUATION_DEFAULT, $config_global_attenuation_default, [Define default global volume attenuation (as floating point factor).])
 
 AC_ARG_ENABLE(voice-steal-algo,
   [  --enable-voice-steal-algo
@@ -812,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)
@@ -846,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.])
 
@@ -877,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.])
 
@@ -908,6 +954,7 @@
     man/Makefile \
     man/linuxsampler.1 \
     src/Makefile \
+    src/db/Makefile \
     src/network/Makefile \
     src/engines/Makefile \
     src/engines/gig/Makefile \
@@ -924,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 \
@@ -932,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
@@ -956,7 +1009,7 @@
 echo "# Maximum Disk Streams: ${config_max_streams}"
 echo "# Maximum Voices: ${config_max_voices}"
 echo "# Default Subfragment Size: ${config_subfragment_size}"
-echo "# Global Volume Attenuation: ${config_global_attenuation}"
+echo "# Default Global Volume Attenuation: ${config_global_attenuation_default}"
 echo "# Voice Stealing Algorithm: ${config_voice_steal_algo}"
 echo "# Signed Triangular Oscillator Algorithm: ${config_signed_triang_algo}"
 echo "# Unsigned Triangular Oscillator Algorithm: ${config_unsigned_triang_algo}"
@@ -974,6 +1027,8 @@
 echo "# Process Muted Channels: ${config_process_muted_channels}"
 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 "#####################################################################"