--- linuxsampler/trunk/configure.in	2005/12/22 21:45:30	822
+++ linuxsampler/trunk/configure.in	2006/05/03 20:40:19	857
@@ -5,7 +5,7 @@
 
 LINUXSAMPLER_RELEASE_MAJOR=0
 LINUXSAMPLER_RELEASE_MINOR=3
-LINUXSAMPLER_RELEASE_BUILD=3
+LINUXSAMPLER_RELEASE_BUILD=3cvs
 
 #------------------------------------------------------------------------------------
 # The following is the libtool / shared library version. This doesn't have to
@@ -59,11 +59,14 @@
 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
+# (only if the user did not provide one)
 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"
+if ! echo "X $CXXFLAGS " | grep -q -- " \(-march=\|-mcpu=\|-mtune=\|-arch=\)" ; then
+  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
 fi
 AC_SUBST([CXX_CPU_SWITCH])
 
@@ -102,120 +105,189 @@
 # check for <features.h>
 AC_CHECK_HEADERS(features.h)
 
+
+###########################################################################
 # Checks for available audio and MIDI systems / drivers
 # (we throw an error if there's not at least one system for audio output and MIDI input available)
+
 have_midi_input_driver="false"
 have_audio_output_driver="false"
 
-AC_CHECK_HEADER(alsa/asoundlib.h,
-    AC_CHECK_LIB(asound, main,
-                             have_alsa=1
-                             ,
-                             have_alsa=0
-                )
-                ,
-                have_alsa=0
-)
-if test "$have_alsa" = "1"; then
-    have_midi_input_driver="true"
-    have_audio_output_driver="true";
+# ALSA
+AC_ARG_ENABLE(alsa-driver,
+  [  --disable-alsa-driver
+                          Disable support for the Advanced Linux Sound
+                          Architecture (ALSA).],
+  [config_alsa_driver="no"],
+  [config_alsa_driver="yes"]
+)
+have_alsa=0
+if test "$config_alsa_driver" = "yes"; then
+    AC_CHECK_HEADER(alsa/asoundlib.h,
+        AC_CHECK_LIB(asound, main,
+                                 have_alsa=1
+                                 ,
+                                 have_alsa=0
+                    )
+                    ,
+                    have_alsa=0
+    )
+    if test "$have_alsa" = "1"; then
+        have_midi_input_driver="true"
+        have_audio_output_driver="true";
+    fi
+
+    echo -n "checking Alsa version... "
+    AC_LANG_SAVE
+    AC_LANG_C
+    AC_TRY_RUN([
+        #include <alsa/asoundlib.h>
+        void main(void) {
+            /* ensure backward compatibility */
+            #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
+            #define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
+            #endif
+            exit(SND_LIB_MAJOR);
+        }
+    ],
+    alsa_major=0,
+    alsa_major=$?,
+    alsa_major=0
+    )
+    AC_TRY_RUN([
+        #include <alsa/asoundlib.h>
+        void main(void) {
+            /* ensure backward compatibility */
+            #if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
+            #define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
+            #endif
+            exit(SND_LIB_MINOR);
+        }
+    ],
+    alsa_minor=0,
+    alsa_minor=$?,
+    alsa_minor=0
+    )
+    AC_TRY_RUN([
+        #include <alsa/asoundlib.h>
+        void main(void) {
+            /* ensure backward compatibility */
+            #if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
+            #define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
+            #endif
+            exit(SND_LIB_SUBMINOR);
+        }
+    ],
+    alsa_subminor=0,
+    alsa_subminor=$?,
+    alsa_subminor=0
+    )
+    AC_LANG_RESTORE
+    echo "$alsa_major.$alsa_minor.$alsa_subminor";
+    AC_DEFINE_UNQUOTED(ALSA_MAJOR,$alsa_major,[Define to the major version number of your Alsa installation.])
+    AC_DEFINE_UNQUOTED(ALSA_MINOR,$alsa_minor,[Define to the minor version number of your Alsa installation.])
+    AC_DEFINE_UNQUOTED(ALSA_SUBMINOR,$alsa_subminor,[Define to the subminor version number of your Alsa installation.])
+else
+    echo "ALSA support disabled by configure script parameter"
 fi
 AM_CONDITIONAL(HAVE_ALSA, test $have_alsa = "1")
 AC_DEFINE_UNQUOTED(HAVE_ALSA,$have_alsa,[Define to 1 if you have ALSA installed.])
 
-echo -n "checking Alsa version... "
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_RUN([
-#include <alsa/asoundlib.h>
-void main(void) {
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
-#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
-#endif
-exit(SND_LIB_MAJOR);
-}
-],
-alsa_major=0,
-alsa_major=$?,
-alsa_major=0
-)
-AC_TRY_RUN([
-#include <alsa/asoundlib.h>
-void main(void) {
-/* ensure backward compatibility */
-#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
-#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
-#endif
-exit(SND_LIB_MINOR);
-}
-],
-alsa_minor=0,
-alsa_minor=$?,
-alsa_minor=0
-)
-AC_TRY_RUN([
-#include <alsa/asoundlib.h>
-void main(void) {
-/* ensure backward compatibility */
-#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
-#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
-#endif
-exit(SND_LIB_SUBMINOR);
-}
-],
-alsa_subminor=0,
-alsa_subminor=$?,
-alsa_subminor=0
-)
-AC_LANG_RESTORE
-echo "$alsa_major.$alsa_minor.$alsa_subminor";
-AC_DEFINE_UNQUOTED(ALSA_MAJOR,$alsa_major,[Define to the major version number of your Alsa installation.])
-AC_DEFINE_UNQUOTED(ALSA_MINOR,$alsa_minor,[Define to the minor version number of your Alsa installation.])
-AC_DEFINE_UNQUOTED(ALSA_SUBMINOR,$alsa_subminor,[Define to the subminor version number of your Alsa installation.])
-
 # JACK
-PKG_CHECK_MODULES(JACK, jack, HAVE_JACK=true, HAVE_JACK=false)
-AC_SUBST(JACK_LIBS)
-AC_SUBST(JACK_CFLAGS)
-if test $HAVE_JACK = false; then
-    HAVE_JACK=0;
+AC_ARG_ENABLE(jack-driver,
+  [  --disable-jack-driver
+                          Disable support for the Jack Audio Connection Kit
+                          (JACK).],
+  [config_jack_driver="no"],
+  [config_jack_driver="yes"]
+)
+have_jack=0
+if test "$config_jack_driver" = "yes"; then
+    PKG_CHECK_MODULES(JACK, jack, have_jack=1, have_jack=0)
+    if test $have_jack = "1"; then
+        AC_SUBST(JACK_LIBS)
+        AC_SUBST(JACK_CFLAGS)
+        AC_CHECK_LIB(jack, jack_client_name_size, [AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE, 1, [Define to 1 if you have the `jack_client_name_size' function.])], , $JACK_LIBS)
+        have_audio_output_driver="true";
+    fi
 else
-    HAVE_JACK=1
-    have_audio_output_driver="true";
-    AC_CHECK_LIB(jack, jack_client_name_size, [AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE, 1, [Define to 1 if you have the `jack_client_name_size' function.])], , $JACK_LIBS)
+    echo "JACK support disabled by configure script parameter"
 fi
-AM_CONDITIONAL(HAVE_JACK, test $HAVE_JACK = 1)
-AC_DEFINE_UNQUOTED(HAVE_JACK,$HAVE_JACK,[Define to 1 if you have JACK installed.])
+AM_CONDITIONAL(HAVE_JACK, test $have_jack = "1")
+AC_DEFINE_UNQUOTED(HAVE_JACK,$have_jack,[Define to 1 if you have JACK installed.])
+
+# ARTS
+AC_ARG_ENABLE(arts-driver,
+  [  --disable-arts-driver
+                          Disable support for the Analogue Realtime System
+                          (aRts).],
+  [config_arts_driver="no"],
+  [config_arts_driver="yes"]
+)
+have_arts=0
+if test "$config_arts_driver" = "yes"; then
+    m4_ifdef([m4_include(m4/arts.m4)],,
+             [sinclude([m4/arts.m4])])
+    AM_PATH_ARTS(0.9.5, have_arts=1, have_arts=0)
+    if test "$have_arts" = "1"; then
+        have_audio_output_driver="true"
+    fi
+else
+    echo "ARTS support disabled by configure script parameter"
+fi
+AM_CONDITIONAL(HAVE_ARTS, test "$have_arts" = "1")
+AC_DEFINE_UNQUOTED(HAVE_ARTS,$have_arts,[Define to 1 if you have aRts installed.])
 
 # MidiShare (Linux, OS X, Windows)
-AC_CHECK_HEADER(MidiShare.h,
-    AC_CHECK_LIB(MidiShare, MidiCountEvs,
-                            have_midishare=1,
-                            have_midishare=0
-                )
-                ,
-                have_midishare=0
-)
-if test "$have_midishare" = "1"; then
-    have_midi_input_driver="true"
+AC_ARG_ENABLE(midishare-driver,
+  [  --disable-midishare-driver
+                          Disable support for the MidiShare system.],
+  [config_midishare_driver="no"],
+  [config_midishare_driver="yes"]
+)
+have_midishare=0
+if test "$config_midishare_driver" = "yes"; then
+    AC_CHECK_HEADER(MidiShare.h,
+        AC_CHECK_LIB(MidiShare, MidiCountEvs,
+                                have_midishare=1,
+                                have_midishare=0
+                    )
+                    ,
+                    have_midishare=0
+    )
+    if test "$have_midishare" = "1"; then
+        have_midi_input_driver="true"
+    fi
+else
+    echo "MidiShare support disabled by configure script parameter"
 fi
 AM_CONDITIONAL(HAVE_MIDISHARE, test $have_midishare = "1")
 AC_DEFINE_UNQUOTED(HAVE_MIDISHARE,$have_midishare,[Define to 1 if you have MidiShare installed.])
 
 # CoreMIDI (OS X)
-AC_CHECK_HEADER(CoreMIDI/CoreMIDI.h,
-                have_coremidi=1,
-                have_coremidi=0
-)
-if test "$have_coremidi" = "1"; then
-    have_midi_input_driver="true"
+AC_ARG_ENABLE(coremidi-driver,
+  [  --disable-coremidi-driver
+                          Disable support for the Apple CoreMIDI system.],
+  [config_coremidi_driver="no"],
+  [config_coremidi_driver="yes"]
+)
+have_coremidi=0
+if test "$config_coremidi_driver" = "yes"; then
+    AC_CHECK_HEADER(CoreMIDI/CoreMIDI.h,
+        have_coremidi=1,
+        have_coremidi=0
+    )
+    if test "$have_coremidi" = "1"; then
+        have_midi_input_driver="true"
+    fi
+else
+    echo "CoreMIDI support disabled by configure script parameter"
 fi
 AM_CONDITIONAL(HAVE_COREMIDI, test $have_coremidi = "1")
 AC_DEFINE_UNQUOTED(HAVE_COREMIDI,$have_coremidi,[Define to 1 if you have CoreMIDI installed.])
 
 # Check presence of libgig
-libgig_version="2.0.2"
+libgig_version="3.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!"
@@ -599,6 +671,33 @@
   AC_DEFINE_UNQUOTED(CONFIG_ASSERT_GS_SYSEX_CHECKSUM, 1, [Define to 1 if you want to enable GS SysEx check.])
 fi
 
+AC_ARG_ENABLE(portamento-time-min,
+  [  --enable-portamento-time-min
+                          Minimum Portamento time in seconds
+                          (default=0.1).],
+  [config_portamento_time_min="${enableval}"],
+  [config_portamento_time_min="0.1"]
+)
+AC_DEFINE_UNQUOTED(CONFIG_PORTAMENTO_TIME_MIN, $config_portamento_time_min, [Define min. portamento time.])
+
+AC_ARG_ENABLE(portamento-time-max,
+  [  --enable-portamento-time-max
+                          Maximum Portamento time in seconds
+                          (default=32).],
+  [config_portamento_time_max="${enableval}"],
+  [config_portamento_time_max="32"]
+)
+AC_DEFINE_UNQUOTED(CONFIG_PORTAMENTO_TIME_MAX, $config_portamento_time_max, [Define max. portamento time.])
+
+AC_ARG_ENABLE(portamento-time-default,
+  [  --enable-portamento-time-default
+                          Default Portamento time in seconds
+                          (default=1).],
+  [config_portamento_time_default="${enableval}"],
+  [config_portamento_time_default="1"]
+)
+AC_DEFINE_UNQUOTED(CONFIG_PORTAMENTO_TIME_DEFAULT, $config_portamento_time_default, [Define default portamento time.])
+
 AC_ARG_ENABLE(signed-triang-algo,
   [  --enable-signed-triang-algo
                           Signed triangular wave algorithm to be used (e.g. for LFOs).
@@ -685,6 +784,34 @@
   AC_DEFINE_UNQUOTED(CONFIG_PROCESS_MUTED_CHANNELS, 1, [Define to 1 if you want to enable processing of muted channels.])
 fi
 
+AC_ARG_ENABLE(process-all-notes-off,
+  [  --disable-process-all-notes-off
+                          Disable interpretation of All-Notes-Off MIDI
+                          messages (default=on). By default LS will release
+                          all voices whenever it receives an All-Notes-Off
+                          MIDI message. You can disable this behavior, so
+                          that LS simply ignores such messages.],
+  [config_process_all_notes_off="no"],
+  [config_process_all_notes_off="yes"]
+)
+if test "$config_process_all_notes_off" = "yes"; then
+  AC_DEFINE_UNQUOTED(CONFIG_PROCESS_ALL_NOTES_OFF, 1, [Define to 1 if you want to enable processing of All-Notes-Off MIDI messages.])
+fi
+
+AC_ARG_ENABLE(interpolate-volume,
+  [  --disable-interpolate-volume
+                          Disable interpolation of volume modulation
+                          (default=on). With this enabled, the volume changes
+                          generated by for example the envelope generator
+                          will be smoother, minimizing the risk for audio
+                          clicks. Disable it to reduce CPU usage.],
+  [config_interpolate_volume="no"],
+  [config_interpolate_volume="yes"]
+)
+if test "$config_interpolate_volume" = "yes"; then
+  AC_DEFINE_UNQUOTED(CONFIG_INTERPOLATE_VOLUME, 1, [Define to 1 if you want to enable interpolation of volume modulation.])
+fi
+
 
 ###########################################################################
 # Automatic Benchmarks (to detect the best algorithms for the system)
@@ -834,6 +961,9 @@
 echo "# Signed Triangular Oscillator Algorithm: ${config_signed_triang_algo}"
 echo "# Unsigned Triangular Oscillator Algorithm: ${config_unsigned_triang_algo}"
 echo "# SysEx Buffer Size: ${config_sysex_buffer_size} Byte"
+echo "# Min. Portamento Time: ${config_portamento_time_min} s"
+echo "# Max. Portamento Time: ${config_portamento_time_max} s"
+echo "# Default Portamento Time: ${config_portamento_time_default} s"
 echo "# Force Filter Usage: ${config_force_filter}"
 echo "# Filter Cutoff Minimum: ${config_filter_cutoff_min} Hz"
 echo "# Filter Cutoff Maximum: ${config_filter_cutoff_max} Hz"
@@ -842,6 +972,8 @@
 echo "# Override Filter Type: ${config_override_filter_type}"
 echo "# Assert GS SysEx Checksum: ${config_assert_gs_sysex_checksum}"
 echo "# Process Muted Channels: ${config_process_muted_channels}"
+echo "# Process All-Notes-Off MIDI message: ${config_process_all_notes_off}"
+echo "# Interpolate Volume: ${config_interpolate_volume}"
 echo "#-------------------------------------------------------------------#"
 echo "# Read './configure --help' or file 'configure.in' for details.     #"
 echo "#####################################################################"