--- linuxsampler/trunk/configure.in	2007/04/16 15:51:18	1161
+++ linuxsampler/trunk/configure.in	2007/05/06 16:38:35	1175
@@ -309,11 +309,12 @@
 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 = false; then
+if test $HAVE_SQLITE3_CMD = false -o $HAVE_SQLITE3 = false; then
     HAVE_SQLITE3=0;
     instruments_db_support="no"
     echo "*** Required sqlite version not found!"
@@ -861,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.])
 
@@ -892,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.])
 
@@ -940,7 +959,7 @@
     Artwork/Makefile \
     scripts/Makefile \
     osx/Makefile \
-    osx/LinuxSampler.xcode/Makefile \
+    osx/linuxsampler.xcodeproj/Makefile \
     Documentation/Makefile \
     Documentation/Engines/Makefile \
     Documentation/Engines/gig/Makefile \