diff options
| author | svoj@mysql.com <> | 2005-06-22 14:08:28 +0500 |
|---|---|---|
| committer | svoj@mysql.com <> | 2005-06-22 14:08:28 +0500 |
| commit | 74373e7d54c37cf0af379a1f05c0d3be17e32a21 (patch) | |
| tree | 1e95fc4eade286d02290940b7d365b5c00888209 /config | |
| parent | c45df76029ea647c39ab44aab5abb0b72a8c2a70 (diff) | |
| download | mariadb-git-74373e7d54c37cf0af379a1f05c0d3be17e32a21.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/misc.m4 | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index e2564c2b80a..e3413048cf7 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -710,3 +710,30 @@ 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 +if test "$CXX_VERSION" +then + AC_MSG_CHECKING("C++ compiler version"); + AC_MSG_RESULT("$CXX $CXX_VERSION") +fi +AC_SUBST(CXX_VERSION) +]) |