--- linuxsampler/trunk/configure.in	2009/05/03 12:15:40	1895
+++ linuxsampler/trunk/configure.in	2009/10/27 19:04:57	2018
@@ -3,9 +3,9 @@
 #------------------------------------------------------------------------------------
 # LinuxSampler's / liblinuxsampler's "official" release version:
 
-LINUXSAMPLER_RELEASE_MAJOR=0
-LINUXSAMPLER_RELEASE_MINOR=5
-LINUXSAMPLER_RELEASE_BUILD=1.12cvs
+LINUXSAMPLER_RELEASE_MAJOR=1
+LINUXSAMPLER_RELEASE_MINOR=0
+LINUXSAMPLER_RELEASE_BUILD=0.cvs2
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -24,9 +24,9 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBLINUXSAMPLER_LT_CURRENT=2
+LIBLINUXSAMPLER_LT_CURRENT=3
 LIBLINUXSAMPLER_LT_REVISION=0
-LIBLINUXSAMPLER_LT_AGE=1
+LIBLINUXSAMPLER_LT_AGE=0
 SHARED_VERSION_INFO="$LIBLINUXSAMPLER_LT_CURRENT:$LIBLINUXSAMPLER_LT_REVISION:$LIBLINUXSAMPLER_LT_AGE"
 
 #------------------------------------------------------------------------------------
@@ -53,6 +53,8 @@
 ###########################################################################
 # General Checks
 
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
 AC_MSG_CHECKING([whether x86 architecture])
 def_arch_x86=0
 case $host_cpu in
@@ -549,7 +551,7 @@
 # Checks for various DLL libraries
 
 # Check presence of libgig
-libgig_version="3.2.1"
+libgig_version="3.3.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!"
@@ -561,6 +563,40 @@
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
+# SF2 Engine (requires libgig)
+AC_ARG_ENABLE(sf2-engine,
+  [  --disable-sf2-engine
+                          Disable compilation of the SF2 engine.
+			  You need to have libgig installed.],
+  [config_sf2_engine="$enableval"],
+  [config_sf2_engine="yes"]
+)
+HAVE_SF2=0;
+if test "$config_sf2_engine" = "yes"; then
+    HAVE_SF2=1
+else
+    echo "SF2 engine disabled by configure script parameter"
+fi
+AM_CONDITIONAL(HAVE_SF2, test $HAVE_SF2 = 1)
+AC_DEFINE_UNQUOTED(HAVE_SF2,$HAVE_SF2,[Define to 1 if you want SF2 engine and have libsf2 installed.])
+config_have_sf2="no"
+if test $HAVE_SF2 = "1"; then
+    config_have_sf2="yes"
+fi
+
+# Check presence of libsndfile
+libsndfile_version="1.0"
+PKG_CHECK_MODULES(SNDFILE, sndfile >= $libsndfile_version, HAVE_SNDFILE=true, HAVE_SNDFILE=false)
+if test "$HAVE_SNDFILE" = "false"; then
+    echo "Required libsndfile version not found!"
+    echo "You need to have libsndfile version ${libsndfile_version} installed!"
+    exit -1;
+else
+    echo "yes, found libsndfile $libsndfile_version"
+fi
+AC_SUBST(SNDFILE_CFLAGS)
+AC_SUBST(SNDFILE_LIBS)
+
 # Instruments DB feature (requires SQLite 3.3)
 AC_ARG_ENABLE(instruments-db,
   [  --disable-instruments-db
@@ -1235,13 +1271,6 @@
 
 AC_LANG_CPLUSPLUS
 
-# some gcc 4.0 versions need -msse for SSE register allocations
-if test "$config_asm" = "yes"; then
-  if test "$def_arch_x86" = 1; then
-    CXXFLAGS="$CXXFLAGS -msse"
-  fi
-fi
-
 # 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)
@@ -1255,6 +1284,8 @@
     src/network/Makefile \
     src/engines/Makefile \
     src/engines/gig/Makefile \
+    src/engines/sf2/Makefile \
+    src/engines/sfz/Makefile \
     src/engines/common/Makefile \
     src/effects/Makefile \
     src/common/Makefile \
@@ -1345,6 +1376,9 @@
 echo "# Audio Output Drivers:"
 echo "# ALSA: ${config_have_alsa}, JACK: ${config_have_jack}, ARTS: ${config_have_arts}, CoreAudio: ${config_have_coreaudio}, ASIO: ${config_have_asio}"
 echo "#-------------------------------------------------------------------"
+echo "# Sampler Engines:"
+echo "# GIG: yes, SF2: ${config_have_sf2}, SFZ: yes"
+echo "#-------------------------------------------------------------------"
 echo "# Building sampler as plugin for following host standards:"
 echo "# DSSI: ${config_have_dssi}, LV2: ${config_have_lv2}, VST: ${config_have_vst}, AU: ${config_have_au}"
 echo "#-------------------------------------------------------------------#"