From 7bf9648ebc7a8988f414ad284dab16ac9f55bfac Mon Sep 17 00:00:00 2001
From: Jacob Meuser <jakemsr@jakemsr.com>
Date: Tue, 10 May 2005 08:30:36 +0000
Subject: [PATCH] amd64 as canonical system type patch by (Jacob Meuser
 <jakemsr jakemsr com )

Originally committed as revision 4209 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 configure | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 1318b11023..8d6705bb2b 100755
--- a/configure
+++ b/configure
@@ -115,12 +115,13 @@ case "$cpu" in
   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