--- configure.ac.orig	2006-03-27 07:00:27.000000000 -0800
+++ configure.ac	2006-10-31 16:43:35.000000000 -0800
@@ -208,6 +208,18 @@
 
 elif echo $target_cpu | grep "i.86" >/dev/null; then
 
+dnl Check for dynamic SIMD -- implies --enable-mmx and --enable-sse!
+
+AC_ARG_ENABLE(dynsimd,
+    [  --enable-dynsimd        enable dynamic SIMD selection (default=no)],,
+    enable_dynsimd=no)
+
+if test "x$enable_dynsimd" = xyes; then
+	AC_DEFINE(USE_DYNSIMD, 1, [Define to 1 to use dynamic SIMD selection.])
+	enable_mmx=yes
+	enable_sse=yes
+fi
+
 dnl Check for MMX assembly
 
 AC_ARG_ENABLE(mmx,
@@ -264,20 +276,12 @@
       :
   fi
 
-  JACK_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $JACK_OPT_CFLAGS $MMX_FLAGS $SSE_FLAGS"
+  JACK_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $JACK_OPT_CFLAGS"
 
 elif test "$target_cpu" = "x86_64"; then
       JACK_OPT_CFLAGS="-DREENTRANT -O3 -march=k8 -fomit-frame-pointer -ffast-math -funroll-loops"
 fi
 
-AC_ARG_ENABLE(dynsimd,
-    [  --enable-dynsimd        enable dynamic SIMD selection (default=no)],,
-    enable_dynsimd=no)
-
-if test "x$enable_dynsimd" = xyes; then
-	AC_DEFINE(USE_DYNSIMD, 1, [Define to 1 to use dynamic SIMD selection.])
-fi
-
 AC_ARG_ENABLE(optimize,
     AC_HELP_STRING([--enable-optimize],
 		   [ask the compiler for its best optimizations]),
@@ -287,6 +291,9 @@
     ]
 )
 
+dnl Now add the MMX and SSE flags as appropriate; these are not optimizations
+JACK_CFLAGS="$JACK_CFLAGS $MMX_FLAGS $SSE_FLAGS"
+
 AC_SUBST(JACK_CFLAGS)
 
 dnl