--- configure.orig	2010-11-28 22:45:04.000000000 +0100
+++ configure	2010-11-29 22:51:09.651506774 +0100
@@ -350,12 +350,16 @@
         ARCH="X86"
         AS="yasm"
         ASFLAGS="$ASFLAGS -O2"
-        if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
-            CFLAGS="$CFLAGS -march=i686"
-        fi
-        if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-            CFLAGS="$CFLAGS -mfpmath=sse -msse"
-        fi
+	if [ "$asm" = yes ]; then
+	    case "$CFLAGS" in
+	    *-march*) ;;
+	    *) CFLAGS="$CFLAGS -march=i686" ;;
+	    esac
+	    case "$CFLAGS" in
+	    *-mfpmath*) ;;
+	    *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
+	    esac
+	fi
         if [ "$SYS" = MACOSX ]; then
             ASFLAGS="$ASFLAGS -f macho -DPREFIX"
         elif [ "$SYS" = MINGW ]; then
