--- linuxsampler/trunk/configure.in	2007/03/24 15:02:48	1120
+++ linuxsampler/trunk/configure.in	2007/05/03 18:09:02	1165
@@ -308,16 +308,22 @@
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
-# SQLITE3
-PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=true, HAVE_SQLITE3=false)
+# 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 = false; then
+if test $HAVE_SQLITE3_CMD = false -o $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.])
@@ -856,6 +862,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.])
 
@@ -887,6 +902,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.])
 
@@ -918,6 +942,7 @@
     man/Makefile \
     man/linuxsampler.1 \
     src/Makefile \
+    src/db/Makefile \
     src/network/Makefile \
     src/engines/Makefile \
     src/engines/gig/Makefile \
@@ -984,6 +1009,7 @@
 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 "#-------------------------------------------------------------------#"
 echo "# Read './configure --help' or file 'configure.in' for details.     #"
 echo "#####################################################################"