[MPlayer-cvslog] CVS: main configure,1.1095,1.1096

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv2947

Modified Files:
	configure 
Log Message:
gcc -dumpmachine outputs x86_64-something on some machines and
amd64-something on others.  Handle both cases.  Fixes bug #325.
patch by Pawel Sakowski < pawel __ dot __ sakowski __ dot __ pl >


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1095
retrieving revision 1.1096
diff -u -r1.1095 -r1.1096
--- configure	25 Oct 2005 13:28:07 -0000	1.1095
+++ configure	26 Oct 2005 20:40:19 -0000	1.1096
@@ -516,7 +516,7 @@
       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
       x86_64|amd64)
-        if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
+        if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
              -z "`echo $CFLAGS | grep -- -m32`"  ]; then
           host_arch=x86_64
         else