--- linuxsampler/trunk/configure.in	2005/02/13 18:02:29	379
+++ linuxsampler/trunk/configure.in	2005/05/09 11:59:58	527
@@ -10,7 +10,7 @@
 
 
 
-echo -n "checking whether x86 architecture... "
+AC_MSG_CHECKING([whether x86 architecture])
 def_arch_x86=0
 case $target_cpu in
   "i386" | "i486" | "i586" | "i686" | "i786")
@@ -22,6 +22,16 @@
 AC_DEFINE_UNQUOTED(ARCH_X86,$def_arch_x86,[Define to 1 if you build for x86 architecture.])
 
 
+# determine the right gcc switch for CPU specific optimizations
+CXX_CPU_SWITCH=
+if test "$def_arch_x86" = 1; then
+  CXX_CPU_SWITCH="-march=$target_cpu"
+elif test "$target_cpu" = "powerpc"; then
+  CXX_CPU_SWITCH="-arch=$target_cpu"
+fi
+AC_SUBST([CXX_CPU_SWITCH])
+
+
 AC_MSG_CHECKING([whether UNIX98 compatible])
 AC_LANG_SAVE
 AC_LANG_C
@@ -144,6 +154,31 @@
 AC_DEFINE_UNQUOTED(HAVE_JACK,$HAVE_JACK,[Define to 1 if you have JACK installed.])
 
 
+# Check presence of libgig
+libgig_version="1.0.0"
+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!"
+    echo "You need to have libgig version ${libgig_version} installed!"
+    exit -1;
+fi
+AC_SUBST(GIG_CFLAGS)
+AC_SUBST(GIG_LIBS)
+
+
+# SQLITE3
+PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=true, HAVE_SQLITE3=false)
+AC_SUBST(SQLITE3_LIBS)
+AC_SUBST(SQLITE3_CFLAGS)
+if test $HAVE_SQLITE3 = false; then
+    HAVE_SQLITE3=0;
+else
+    HAVE_SQLITE3=1
+fi
+AM_CONDITIONAL(HAVE_SQLITE3, test $HAVE_SQLITE3 = 1)
+AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$HAVE_SQLITE3,[Define to 1 if you have SQLITE3 installed.])
+
+
 if test "$have_midi_input_driver" = "false"; then
     echo "No supported MIDI input system found!"
     echo "Sorry, LinuxSampler only supports ALSA as MIDI input driver at the moment!"
@@ -157,10 +192,15 @@
 
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(linuxsampler, 0.2)
+AM_INIT_AUTOMAKE(linuxsampler, 0.3.1)
 
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
+
+# autoconf 2.59/libtool 1.5.12 bug? work-around. Without a check like
+# this, the dlfcn.h check in am_prog_libtool may fail.
+AC_CHECK_HEADER(stdlib.h)
+
 AM_PROG_LIBTOOL
 
 AC_OUTPUT(Makefile src/Makefile src/network/Makefile 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/testcases/Makefile src/drivers/Makefile src/drivers/audio/Makefile src/drivers/midi/Makefile)