--- linuxsampler/trunk/configure.in	2006/01/08 21:12:33	828
+++ linuxsampler/trunk/configure.in	2006/01/14 14:07:47	829
@@ -59,11 +59,15 @@
 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"
+echo "X $CXXFLAGS "
+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])
 
@@ -599,6 +603,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).
@@ -834,6 +865,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"