--- linuxsampler/trunk/configure.in	2009/03/01 22:22:03	1852
+++ linuxsampler/trunk/configure.in	2010/09/15 10:04:07	2123
@@ -3,9 +3,9 @@
 #------------------------------------------------------------------------------------
 # LinuxSampler's / liblinuxsampler's "official" release version:
 
-LINUXSAMPLER_RELEASE_MAJOR=0
-LINUXSAMPLER_RELEASE_MINOR=5
-LINUXSAMPLER_RELEASE_BUILD=1.10cvs
+LINUXSAMPLER_RELEASE_MAJOR=1
+LINUXSAMPLER_RELEASE_MINOR=0
+LINUXSAMPLER_RELEASE_BUILD=0.cvs5
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -24,16 +24,16 @@
 #  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"
 
 #------------------------------------------------------------------------------------
 # 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.])
@@ -46,22 +46,18 @@
 AC_SUBST(SHARED_VERSION_INFO)
 
 AC_C_BIGENDIAN
-AC_CANONICAL_SYSTEM
-
-AC_SUBST(target)
-AC_SUBST(target_alias)
-AC_SUBST(target_cpu)
-AC_SUBST(target_os)
-AC_SUBST(target_vendor)
+AC_CANONICAL_HOST
 
 PKG_PROG_PKG_CONFIG
 
 ###########################################################################
 # General Checks
 
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
 AC_MSG_CHECKING([whether x86 architecture])
 def_arch_x86=0
-case $target_cpu in
+case $host_cpu in
   "i386" | "i486" | "i586" | "i686" | "i786" | "x86_64")
     echo "yes"
     def_arch_x86=1;;
@@ -74,10 +70,10 @@
 # (only if the user did not provide one)
 CXX_CPU_SWITCH=
 if ! echo "X $CXXFLAGS " | grep -q -- " \(-march=\|-mcpu=\|-mtune=\|-arch=\)" ; then
-  if test "$def_arch_x86" = 1 -a "$target_cpu" != "x86_64"; then
-    CXX_CPU_SWITCH="-march=$target_cpu"
+  if test "$def_arch_x86" = 1 -a "$host_cpu" != "x86_64"; then
+    CXX_CPU_SWITCH="-march=$host_cpu"
   elif test "$target_cpu" = "ppc"; then
-    CXX_CPU_SWITCH="-arch=$target_cpu"
+    CXX_CPU_SWITCH="-arch=$host_cpu"
   fi
 fi
 AC_SUBST([CXX_CPU_SWITCH])
@@ -86,7 +82,8 @@
 AC_CHECK_HEADERS(
     mmsystem.h,
     have_windows=1,
-    have_windows=0
+    have_windows=0,
+    [#include <windef.h>]
 )
 AM_CONDITIONAL(HAVE_WINDOWS, test $have_windows = "1")
 
@@ -256,6 +253,10 @@
 fi
 AM_CONDITIONAL(HAVE_ALSA, test $have_alsa = "1")
 AC_DEFINE_UNQUOTED(HAVE_ALSA,$have_alsa,[Define to 1 if you have ALSA installed.])
+config_have_alsa="no"
+if test $have_alsa = "1"; then
+    config_have_alsa="yes"
+fi
 
 # JACK
 AC_ARG_ENABLE(jack-driver,
@@ -282,6 +283,10 @@
 fi
 AM_CONDITIONAL(HAVE_JACK, test $have_jack = "1")
 AC_DEFINE_UNQUOTED(HAVE_JACK,$have_jack,[Define to 1 if you have JACK installed.])
+config_have_jack="no"
+if test $have_jack = "1"; then
+    config_have_jack="yes"
+fi
 
 # JACK MIDI
 have_jack_midi=0
@@ -305,6 +310,10 @@
 AM_CONDITIONAL(HAVE_JACK_MIDI, test $have_jack_midi = "1")
 AC_DEFINE_UNQUOTED(HAVE_JACK_MIDI, $have_jack_midi,
                    [Define to 1 if you have JACK with MIDI support installed.])
+config_have_jack_midi="no"
+if test $have_jack_midi = "1"; then
+    config_have_jack_midi="yes"
+fi
 
 # ARTS
 AC_ARG_ENABLE(arts-driver,
@@ -327,6 +336,10 @@
 fi
 AM_CONDITIONAL(HAVE_ARTS, test "$have_arts" = "1")
 AC_DEFINE_UNQUOTED(HAVE_ARTS,$have_arts,[Define to 1 if you have aRts installed.])
+config_have_arts="no"
+if test $have_arts = "1"; then
+    config_have_arts="yes"
+fi
 
 # ASIO AUDIO (Win32)
 AC_ARG_ENABLE(asiosdk-dir,
@@ -366,6 +379,10 @@
 AC_SUBST(ASIOSDK_BASEDIR)
 AM_CONDITIONAL(HAVE_ASIO, test $have_asio = "1")
 AC_DEFINE_UNQUOTED(HAVE_ASIO,$have_asio,[Define to 1 if you have ASIO installed.])
+config_have_asio="no"
+if test $have_asio = "1"; then
+    config_have_asio="yes"
+fi
 
 # MidiShare (Linux, OS X, Windows)
 AC_ARG_ENABLE(midishare-driver,
@@ -392,6 +409,10 @@
 fi
 AM_CONDITIONAL(HAVE_MIDISHARE, test $have_midishare = "1")
 AC_DEFINE_UNQUOTED(HAVE_MIDISHARE,$have_midishare,[Define to 1 if you have MidiShare installed.])
+config_have_midishare="no"
+if test $have_midishare = "1"; then
+    config_have_midishare="yes"
+fi
 
 # CoreMIDI (OS X)
 AC_ARG_ENABLE(coremidi-driver,
@@ -414,6 +435,10 @@
 fi
 AM_CONDITIONAL(HAVE_COREMIDI, test $have_coremidi = "1")
 AC_DEFINE_UNQUOTED(HAVE_COREMIDI,$have_coremidi,[Define to 1 if you have CoreMIDI installed.])
+config_have_coremidi="no"
+if test $have_coremidi = "1"; then
+    config_have_coremidi="yes"
+fi
 
 # CoreAudio (OS X)
 AC_ARG_ENABLE(coreaudio-driver,
@@ -436,6 +461,10 @@
 fi
 AM_CONDITIONAL(HAVE_COREAUDIO, test $have_coreaudio = "1")
 AC_DEFINE_UNQUOTED(HAVE_COREAUDIO,$have_coreaudio,[Define to 1 if you have CoreAudio installed.])
+config_have_coreaudio="no"
+if test $have_coreaudio = "1"; then
+    config_have_coreaudio="yes"
+fi
 
 # MME MIDI (Win32)
 AC_ARG_ENABLE(mmemidi-driver,
@@ -458,20 +487,23 @@
 fi
 AM_CONDITIONAL(HAVE_MME_MIDI, test $have_mmemidi = "1")
 AC_DEFINE_UNQUOTED(HAVE_MME_MIDI,$have_mmemidi,[Define to 1 if you have MME MIDI installed.])
-
+config_have_mme="no"
+if test $have_mmemidi = "1"; then
+    config_have_mme="yes"
+fi
 
 # DSSI
 AC_CHECK_HEADERS(dssi.h,
-	have_dssi=1,
-	have_dssi=0)
-AM_CONDITIONAL(HAVE_DSSI, test $have_dssi = "1")
+	config_have_dssi="yes",
+	config_have_dssi="no")
+AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
 
 # LV2
-PKG_CHECK_MODULES(LV2, lv2core, have_lv2=1, have_lv2=0)
-if test $have_lv2 = "0"; then
-    AC_CHECK_HEADER(lv2.h, have_lv2=1, have_lv2=0)
+PKG_CHECK_MODULES(LV2, lv2core, config_have_lv2="yes", config_have_lv2="no")
+if test $config_have_lv2 = "no"; then
+    AC_CHECK_HEADER(lv2.h, config_have_lv2="yes", config_have_lv2="no")
 fi
-AM_CONDITIONAL(HAVE_LV2, test $have_lv2 = "1")
+AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
 
 # VST
 AC_ARG_ENABLE(vstsdk-dir,
@@ -484,13 +516,17 @@
 )
 AC_SUBST(VSTSDK_DIR)
 AM_CONDITIONAL(HAVE_VST, test "x$VSTSDK_DIR" != "x")
+config_have_vst="no"
+if test "x$VSTSDK_DIR" != "x"; then
+    config_have_vst="yes"
+fi
 
 # AU
 AC_CHECK_HEADERS(AudioUnit/AudioUnit.h,
-	have_au=1,
-	have_au=0)
-AM_CONDITIONAL(HAVE_AU, test $have_au = "1")
-AM_CONDITIONAL(HAVE_AUFLAGS, test test "$AUFLAGS" != "")
+	config_have_au="yes",
+	config_have_au="no")
+AM_CONDITIONAL(HAVE_AU, test $config_have_au = "yes")
+AM_CONDITIONAL(HAVE_AUFLAGS, test "$AUFLAGS" != "")
 
 
 # have we found at least one MIDI input and one audio output driver ?
@@ -515,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!"
@@ -527,6 +563,46 @@
 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)
+
+# 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
@@ -1201,13 +1277,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)
@@ -1221,6 +1290,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 \
@@ -1261,6 +1332,9 @@
 echo "#####################################################################"
 echo "# LinuxSampler Configuration                                        #"
 echo "#-------------------------------------------------------------------#"
+echo "# Release Version: ${LINUXSAMPLER_RELEASE_MAJOR}.${LINUXSAMPLER_RELEASE_MINOR}.${LINUXSAMPLER_RELEASE_BUILD}"
+echo "# LSCP Version: ${LSCP_RELEASE_MAJOR}.${LSCP_RELEASE_MINOR}"
+echo "#-------------------------------------------------------------------"
 echo "# Assembly Optimizations: ${config_asm}"
 echo "# Development Mode: ${config_dev_mode}"
 echo "# Debug Level: ${config_debug_level}"
@@ -1301,6 +1375,18 @@
 echo "# Instruments DB default location: ${config_default_instruments_db_file}"
 fi
 echo "# Plugin Path: ${config_plugin_dir}"
+echo "#-------------------------------------------------------------------"
+echo "# MIDI Input Drivers:"
+echo "# ALSA: ${config_have_alsa}, JACK: ${config_have_jack_midi}, CoreMIDI: ${config_have_coremidi}, MME: ${config_have_mme}, MidiShare: ${config_have_midishare}"
+echo "#-------------------------------------------------------------------"
+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 "#-------------------------------------------------------------------#"
 echo "# Read './configure --help' or file 'configure.in' for details.     #"
 echo "#####################################################################"