[x264-devel] commit: Make i686 the default arch on x86_32 (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sat May 16 12:16:34 2009 -0700| [aa674d3a8fd4ed468f8744c1421869d7d1cb156a] | committer: Jason Garrett-Glaser 

Make i686 the default arch on x86_32
Disabling asm will default to a generic arch.
Also fix configure for gcc 4.4.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=aa674d3a8fd4ed468f8744c1421869d7d1cb156a
---

 configure |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index f4b5344..ccc5df5 100755
--- a/configure
+++ b/configure
@@ -31,15 +31,11 @@ cc_check() {
 int main () { $3 return 0; }
 EOF
     $CC conftest.c $CFLAGS $LDFLAGS $2 -o conftest 2>$DEVNULL
-    TMP="$?"
-    return $TMP
 }
 
 as_check() {
     echo "$1" > conftest.asm
     $AS conftest.asm $ASFLAGS $2 -o conftest.o 2>$DEVNULL
-    TMP="$?"
-    return $TMP
 }
 
 rm -f config.h config.mak x264.pc conftest*
@@ -236,6 +232,9 @@ case $host_cpu in
     ARCH="X86"
     AS="yasm"
     ASFLAGS="$ASFLAGS -O2"
+    if [[ "$asm" == yes && ! "$CFLAGS" =~ "-march" ]]; then
+      CFLAGS="$CFLAGS -march=i686"
+    fi
     if [ "$SYS" = MACOSX ]; then
       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
     elif [ "$SYS" = MINGW ]; then