From 9be71ee276ed534ca3e4bbb5b393aab7e832faa3 Mon Sep 17 00:00:00 2001 From: "daniel%glazman.org" Date: Thu, 31 Jul 2003 20:04:25 +0000 Subject: [PATCH] bustage fix backing out 214597 fix git-svn-id: svn://10.0.0.236/trunk@145432 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure | 4 ++-- mozilla/configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/configure b/mozilla/configure index faffd6fd121..1ba11e70848 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -2622,10 +2622,10 @@ cross_compiling=$ac_cv_prog_cc_cross # Determine compiler version - CC_VERSION=`"${CC}" -v 2>&1 | grep -i version | sed -e 's|.* vVersion ||' | sed -e 's| *$||'` + CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's| *$||'` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'` - CXX_VERSION=`"${CXX}" -v 2>&1 | grep -i version | sed -e 's|.* vVersion ||' | sed -e 's| *$||'` + CXX_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's| *$||'` _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'` if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then diff --git a/mozilla/configure.in b/mozilla/configure.in index 4379bed0fe5..82ffab17814 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -327,10 +327,10 @@ case "$target" in AC_LANG_RESTORE # Determine compiler version - CC_VERSION=`"${CC}" -v 2>&1 | grep -i version | sed -e 's|.* [vV]ersion ||' | sed -e 's|[ ]*$||'` + CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $ 1 }'` - CXX_VERSION=`"${CXX}" -v 2>&1 | grep -i version | sed -e 's|.* [vV]ersion ||' | sed -e 's|[ ]*$||'` + CXX_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'` _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | awk -F\. '{ print $ 1 }'` if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then