summaryrefslogtreecommitdiff
path: root/config/ac-macros/misc.m4
diff options
context:
space:
mode:
Diffstat (limited to 'config/ac-macros/misc.m4')
-rw-r--r--config/ac-macros/misc.m432
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")