--- linuxsampler/trunk/configure.in	2005/05/22 20:43:32	563
+++ linuxsampler/trunk/configure.in	2005/07/05 19:30:37	685
@@ -150,8 +150,34 @@
 AM_CONDITIONAL(HAVE_JACK, test $HAVE_JACK = 1)
 AC_DEFINE_UNQUOTED(HAVE_JACK,$HAVE_JACK,[Define to 1 if you have JACK 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"
+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"
+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.0"
+libgig_version="2.0.1"
 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!"
@@ -175,7 +201,10 @@
 
 if test "$have_midi_input_driver" = "false"; then
     echo "No supported MIDI input system found!"
-    echo "Sorry, LinuxSampler only supports ALSA as MIDI input driver at the moment!"
+    echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:"
+    echo "ALSA, MIDIShare, CoreMIDI."
+    echo "If you think you have one of those available on your system, make sure you"
+    echo "also have the respective development (header) files installed."
     exit -1;
 fi
 if test "$have_audio_output_driver" = "false"; then
@@ -190,6 +219,20 @@
 
 # TODO: should we use AC_ARG_VAR(variable, description) instead?
 
+AC_ARG_ENABLE(asm,
+  [  --disable-asm
+                          Disable hand-crafted assembly optimizations
+                          (default=on). LinuxSampler provides CPU specific
+                          assembly optimizations for the most important
+                          synthesis algorithms. You usually don't want to
+                          disable that.],
+  [config_asm="no"],
+  [config_asm="yes"]
+)
+if test "$config_asm" = "yes"; then
+  AC_DEFINE_UNQUOTED(CONFIG_ASM, 1, [Define to 1 if you want to enable hand-crafted asm optimizations.])
+fi
+
 AC_ARG_ENABLE(dev-mode,
   [  --enable-dev-mode
                           Enable development mode (default=no). In that mode
@@ -372,7 +415,7 @@
       AC_MSG_ERROR([Unknown voice stealing algorithm for parameter --enable-voice-steal-algo])
     else
       config_voice_steal_algo="${enableval}"
-    fi  
+    fi
   ],
   [config_voice_steal_algo="oldestvoiceonkey"]
 )
@@ -479,7 +522,7 @@
        config_override_filter_type="::gig::vcf_type_lowpassturbo"
     elif test ! "${enableval}" = "no"; then
        AC_MSG_ERROR([Unknown filter type for parameter --enable-override-filter-type])
-    fi  
+    fi
   ],
   [config_override_filter_type="no"]
 )
@@ -506,18 +549,50 @@
 # Create Build Files
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(linuxsampler, 0.3.1)
+AM_INIT_AUTOMAKE(linuxsampler, 0.3.2)
 
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 
+# 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)
 
 AM_PROG_LIBTOOL
 
-AC_OUTPUT(Makefile src/Makefile src/network/Makefile src/engines/Makefile src/engines/gig/Makefile src/engines/common/Makefile src/common/Makefile src/lib/Makefile src/lib/fileloader/Makefile src/lib/fileloader/libgig/Makefile src/testcases/Makefile src/drivers/Makefile src/drivers/audio/Makefile src/drivers/midi/Makefile)
+AC_OUTPUT( \
+    Makefile \
+    man/Makefile \
+    man/linuxsampler.1 \
+    src/Makefile \
+    src/network/Makefile \
+    src/engines/Makefile \
+    src/engines/gig/Makefile \
+    src/engines/common/Makefile \
+    src/common/Makefile src/lib/Makefile \
+    src/lib/fileloader/Makefile \
+    src/lib/fileloader/libgig/Makefile \
+    src/testcases/Makefile \
+    src/drivers/Makefile \
+    src/drivers/audio/Makefile \
+    src/drivers/midi/Makefile \
+    linuxsampler.spec \
+    debian/Makefile \
+    Artwork/Makefile \
+    scripts/Makefile \
+    osx/Makefile \
+    osx/LinuxSampler.xcode/Makefile \
+    Documentation/Makefile \
+    Documentation/Engines/Makefile \
+    Documentation/Engines/gig/Makefile \
+)
 
 
 ###########################################################################
@@ -527,6 +602,7 @@
 echo "#####################################################################"
 echo "# LinuxSampler Configuration                                        #"
 echo "#-------------------------------------------------------------------#"
+echo "# Assembly Optimizations: ${config_asm}"
 echo "# Development Mode: ${config_dev_mode}"
 echo "# Debug Level: ${config_debug_level}"
 echo "# Use Exceptions in RT Context: ${config_rt_exceptions}"