aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-02-25 20:36:23 +0000
committerMax Horn2006-02-25 20:36:23 +0000
commit4c5d1a6b0e06709f7e5b6af63b2fc95d6078db7b (patch)
tree2c562e724c04653501a1b42d1b11b0208c8ad28b
parent1d09fb169b45671e47586e9d0ed811212dd9ba74 (diff)
downloadscummvm-rg350-4c5d1a6b0e06709f7e5b6af63b2fc95d6078db7b.tar.gz
scummvm-rg350-4c5d1a6b0e06709f7e5b6af63b2fc95d6078db7b.tar.bz2
scummvm-rg350-4c5d1a6b0e06709f7e5b6af63b2fc95d6078db7b.zip
Improved patch for bug #1436165 (no more warnings from GNU tail about outdated parameters)
svn-id: r20888
-rwxr-xr-xconfigure15
1 files changed, 14 insertions, 1 deletions
diff --git a/configure b/configure
index a6f135fecd..32a0c2075a 100755
--- a/configure
+++ b/configure
@@ -561,7 +561,20 @@ fi
echocheck "compiler version"
-cxx_name=`( $cc -v ) 2>&1 | tail -1l | cut -d ' ' -f 1`
+case $_host_os in
+ # On Solaris, use Unix-compliant tail
+ solaris*)
+ tail=/usr/xpg4/bin/tail
+ ;;
+
+ # All other OSes: use the tail in PATH
+ *)
+ tail=tail
+ ;;
+esac
+
+
+cxx_name=`( $cc -v ) 2>&1 | $tail -n 1 | cut -d ' ' -f 1`
cxx_version=`( $CXX -dumpversion ) 2>&1`
if test "$?" -gt 0; then
cxx_version="not found"