[Ffmpeg-cvslog] CVS: ffmpeg configure,1.177,1.178

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv16533

Modified Files:
	configure 
Log Message:
amd64 as canonical system type patch by (Jacob Meuser <jakemsr jakemsr com )


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- configure	9 May 2005 13:24:22 -0000	1.177
+++ configure	10 May 2005 08:30:36 -0000	1.178
@@ -115,12 +115,13 @@
   i386|i486|i586|i686|i86pc|BePC)
     cpu="x86"
   ;;
-  x86_64)
-    if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
-         -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-      cpu="x86_64"
-    else
-      cpu="x86"
+  x86_64|amd64)
+    cpu="x86"
+    canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+    if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+      if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+        cpu="x86_64"
+      fi
     fi
   ;;
   # armv4l is a subset of armv5tel