From fc5526f925e1a01302ca02ab8d305086ad03c82f Mon Sep 17 00:00:00 2001 From: rfelker Date: Thu, 3 Jul 2003 17:36:52 +0000 Subject: [PATCH] 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!) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10366 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index d3663a8abe..15944992af 100755 --- a/configure +++ b/configure @@ -473,7 +473,7 @@ fi 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 @@ if x86 || ppc; then _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