diff --git a/configure.in b/configure.in index 14e34c85717..74127047173 100644 --- a/configure.in +++ b/configure.in @@ -495,7 +495,7 @@ case "$target" in AC_LANG_RESTORE 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([,]) # Determine compiler version @@ -571,7 +571,7 @@ case "$target" in fi changequote(,) - _MSMT_VER_FILTER='s|.* \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' + _MSMT_VER_FILTER='s|.*[^!-~]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' changequote([,]) MSMANIFEST_TOOL_VERSION=`echo ${MSMT_TOOL}|sed -ne "$_MSMT_VER_FILTER"` if test -z "$MSMANIFEST_TOOL_VERSION"; then diff --git a/js/src/configure.in b/js/src/configure.in index d6d867c35eb..59f4985b69c 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -468,7 +468,7 @@ case "$target" in AC_LANG_RESTORE 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([,]) # Determine compiler version @@ -521,7 +521,7 @@ case "$target" in fi changequote(,) - _MSMT_VER_FILTER='s|.* \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' + _MSMT_VER_FILTER='s|.*[^!-~]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' changequote([,]) MSMANIFEST_TOOL_VERSION=`echo ${MSMT_TOOL}|sed -ne "$_MSMT_VER_FILTER"` if test -z "$MSMANIFEST_TOOL_VERSION"; then diff --git a/nsprpub/configure.in b/nsprpub/configure.in index da7961c9a72..a6a67ba5a33 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -1877,7 +1877,7 @@ tools are selected during the Xcode/Developer Tools installation.]) # Determine compiler version changequote(,) - _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' + _MSMT_VER_FILTER='s|.*[^!-~]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*|\1|p' changequote([,]) CC_VERSION=`"${CC}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $1 }'`