[Mplayer-cvslog] CVS: main configure,1.733,1.734

Richard Felker CVS rfelker at mplayerhq.hu
Thu Jul 3 19:37:16 CEST 2003


Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv10387

Modified Files:
	configure 
Log Message:
reverse this nonsense that breaks configure! (ppl, please don't commit
"cosmetic" fixes like this to configure script unless you have a VERY
good understanding of shell scripting and know you won't break anything!)


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.733
retrieving revision 1.734
diff -u -r1.733 -r1.734
--- configure	1 Jul 2003 15:33:07 -0000	1.733
+++ configure	3 Jul 2003 17:36:52 -0000	1.734
@@ -473,7 +473,7 @@
 if test "$_skip_cc_check" != yes ; then
  for _cc in "$_cc" gcc-3.1 gcc3 gcc-3.0 cc ; do
   echocheck "$_cc version"
-  cc_name=`( $_cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+  cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
   cc_version=`( $_cc -dumpversion ) 2>&1`
   if test "$?" -gt 0; then
     cc_version="not found"
@@ -573,15 +573,15 @@
     _cpuinfo="TOOLS/cpuinfo"
   fi
 
-  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1`
-  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1`
-  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
-  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
-  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
+  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
+  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
+  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
 
-  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n 1`
+  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
   if test -z "$pparam" ; then
-    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1`
+    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
   fi
 
   _mmx=no



More information about the MPlayer-cvslog mailing list