diff options
| author | nelson%bolyard.com <devnull@localhost> | 2010-06-18 06:19:10 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2010-06-18 06:19:10 +0000 |
| commit | 353c30d49d2677f1dcb4d6760915915787c8fb79 (patch) | |
| tree | 99cef054b3e3ae60f44d64b6e772c4563ae93b58 | |
| parent | 759d36eb9563a95996168aad0d17dba51d92e933 (diff) | |
| download | nspr-hg-NSPR_4_8_5_BETA1.tar.gz | |
Bug 559133: Don't require sed -r r=<ted.mielczarek@gmail.com>NSPR_4_8_5_BETA1
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 4 insertions, 5 deletions
@@ -4214,10 +4214,10 @@ EOF # Determine compiler version - _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p' + _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' - CC_VERSION=`"${CC}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + CC_VERSION=`"${CC}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $1 }'` _CC_MINOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $2 }'` _CC_RELEASE=`echo ${CC_VERSION} | awk -F\. '{ print $3 }'` diff --git a/configure.in b/configure.in index 42dbbbd0..b8995a93 100644 --- a/configure.in +++ b/configure.in @@ -1678,10 +1678,9 @@ arm-android-eabi) # Determine compiler version changequote(,) - _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p' + _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' changequote([,]) - - CC_VERSION=`"${CC}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` + CC_VERSION=`"${CC}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $1 }'` _CC_MINOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $2 }'` _CC_RELEASE=`echo ${CC_VERSION} | awk -F\. '{ print $3 }'` |