diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 711c318c072f6d5fd5c2877ccc736c7673d1711d (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /config | |
| parent | 00538253b592522babe3609af29cb3eb87218b64 (diff) | |
| parent | fd64a0db45705ca5eb2ad34ffc2ed1d9ef961017 (diff) | |
| download | mariadb-git-711c318c072f6d5fd5c2877ccc736c7673d1711d.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/misc.m4 | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 996ac62e025..89de1e5f8fa 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -617,25 +617,19 @@ fi AC_DEFUN([MYSQL_CHECK_CXX_VERSION], [ -case $SYSTEM_TYPE in - *netware*) - CXX_VERSION=`$CXX -version | grep -i version` - ;; - *) - CXX_VERSION=`$CXX --version | sed 1q` - if test $? -ne "0" -o -z "$CXX_VERSION" - then - CXX_VERSION=`$CXX -V 2>&1|sed 1q` # trying harder for Sun and SGI - fi - if test $? -ne "0" -o -z "$CXX_VERSION" - then - CXX_VERSION=`$CXX -v 2>&1|sed 1q` # even harder for Alpha - fi - if test $? -ne "0" -o -z "$CXX_VERSION" - then - CXX_VERSION="" - fi -esac +CXX_VERSION=`$CXX --version | sed 1q` +if test $? -ne "0" -o -z "$CXX_VERSION" +then + CXX_VERSION=`$CXX -V 2>&1|sed 1q` # trying harder for Sun and SGI +fi +if test $? -ne "0" -o -z "$CXX_VERSION" +then + CXX_VERSION=`$CXX -v 2>&1|sed 1q` # even harder for Alpha +fi +if test $? -ne "0" -o -z "$CXX_VERSION" +then + CXX_VERSION="" +fi if test "$CXX_VERSION" then AC_MSG_CHECKING("C++ compiler version") |