--- linuxsampler/trunk/configure.in	2005/06/04 17:49:12	609
+++ linuxsampler/trunk/configure.in	2005/07/19 15:43:40	697
@@ -1,4 +1,39 @@
 AC_INIT(configure.in)
+
+#------------------------------------------------------------------------------------
+# LinuxSampler's / liblinuxsampler's "official" release version:
+
+LINUXSAMPLER_RELEASE_MAJOR=0
+LINUXSAMPLER_RELEASE_MINOR=3
+LINUXSAMPLER_RELEASE_BUILD=3
+
+#------------------------------------------------------------------------------------
+# The following is the libtool / shared library version. This doesn't have to
+# do anything with the release version. It MUST conform to the following rules:
+#
+#  1. Start with version information of `0:0:0' for each libtool library.
+#  2. Update the version information only immediately before a public release of
+#     your software. More frequent updates are unnecessary, and only guarantee
+#     that the current interface number gets larger faster.
+#  3. If the library source code has changed at all since the last update, then
+#     increment revision (`c:r:a' becomes `c:r+1:a').
+#  4. If any interfaces have been added, removed, or changed since the last update,
+#     increment current, and set revision to 0.
+#  5. If any interfaces have been added since the last public release, then increment
+#     age.
+#  6. If any interfaces have been removed since the last public release, then set age
+#     to 0.
+
+LIBLINUXSAMPLER_LT_CURRENT=0
+LIBLINUXSAMPLER_LT_REVISION=0
+LIBLINUXSAMPLER_LT_AGE=0
+SHARED_VERSION_INFO="$LIBLINUXSAMPLER_LT_CURRENT:$LIBLINUXSAMPLER_LT_REVISION:$LIBLINUXSAMPLER_LT_AGE"
+
+AM_PROG_LIBTOOL
+
+AC_SUBST(SHLIB_VERSION_ARG)
+AC_SUBST(SHARED_VERSION_INFO)
+
 AC_C_BIGENDIAN
 AC_CANONICAL_SYSTEM
 
@@ -177,7 +212,7 @@
 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!"
@@ -219,6 +254,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
@@ -535,18 +584,50 @@
 # Create Build Files
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(linuxsampler, 0.3.1)
+AM_INIT_AUTOMAKE(linuxsampler, "$LINUXSAMPLER_RELEASE_MAJOR.$LINUXSAMPLER_RELEASE_MINOR.$LINUXSAMPLER_RELEASE_BUILD")
 
 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 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)
+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 \
+    linuxsampler.pc \
+    Doxyfile \
+)
 
 
 ###########################################################################
@@ -556,6 +637,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}"