--- linuxsampler/trunk/configure.in	2009/10/25 22:22:52	2015
+++ linuxsampler/trunk/configure.in	2010/08/27 16:27:16	2119
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=1
 LINUXSAMPLER_RELEASE_MINOR=0
-LINUXSAMPLER_RELEASE_BUILD=0.cvs2
+LINUXSAMPLER_RELEASE_BUILD=0.cvs3
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -33,7 +33,7 @@
 # the LSCP specification version this LinuSampler release complies with:
 
 LSCP_RELEASE_MAJOR=1
-LSCP_RELEASE_MINOR=4
+LSCP_RELEASE_MINOR=5
 
 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.])
@@ -563,31 +563,17 @@
 AC_SUBST(GIG_CFLAGS)
 AC_SUBST(GIG_LIBS)
 
-# SF2 Engine (requires libsf2)
+# SF2 Engine (requires libgig)
 AC_ARG_ENABLE(sf2-engine,
   [  --disable-sf2-engine
                           Disable compilation of the SF2 engine.
-			  You need to have libsf2 installed.],
+			  You need to have libgig installed.],
   [config_sf2_engine="$enableval"],
   [config_sf2_engine="yes"]
 )
 HAVE_SF2=0;
 if test "$config_sf2_engine" = "yes"; then
-    # Check presence of libsf2
-    libsf2_version="0.0.1"
-    PKG_CHECK_MODULES(SF2, sf2 >= $libsf2_version, HAVE_SF2=true, HAVE_SF2=false)
-    AC_SUBST(SF2_LIBS)
-    AC_SUBST(SF2_CFLAGS)
-    if test $HAVE_SF2 = false; then
-        HAVE_SF2=0
-        config_sf2_engine="no"
-        echo "*** Required libsf2 version not found!"
-        echo "*** You need to have libsf2 version ${libsf2_version} or higher"
-        echo "*** for SF2 engine to be enabled."
-        echo "*** Support for SF2 instruments will be disabled!"
-    else
-        HAVE_SF2=1
-    fi
+    HAVE_SF2=1
 else
     echo "SF2 engine disabled by configure script parameter"
 fi
@@ -611,6 +597,12 @@
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
 
+# Check for Vorbis support in libsndfile
+linuxsampler_save_CFLAGS=$CFLAGS
+CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
+AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [] ,[[#include <sndfile.h>]])
+CFLAGS=$linuxsampler_save_CFLAGS
+
 # Instruments DB feature (requires SQLite 3.3)
 AC_ARG_ENABLE(instruments-db,
   [  --disable-instruments-db