diff options
| author | unknown <lenz@mysql.com> | 2005-07-04 12:59:20 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-07-04 12:59:20 +0200 |
| commit | df846c4ae508455ef9cc5e32311ad730d8020df6 (patch) | |
| tree | 380762df171d32e4a397adbdd0da65e5084076ce | |
| parent | 9d5a45c2f3e9f784ef94e9b3a9a5e6611043d908 (diff) | |
| parent | ece95b3d4b5c283d60f6d18cb7ef91841b78eb69 (diff) | |
| download | mariadb-git-df846c4ae508455ef9cc5e32311ad730d8020df6.tar.gz | |
Merge mysql.com:/space/my/mysql-4.0.25-clone
into mysql.com:/space/my/mysql-4.0-build
| -rw-r--r-- | configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b291200c114..83685009ee6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 4.0.25) +AM_INIT_AUTOMAKE(mysql, 4.0.26) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -370,9 +370,14 @@ then if echo $CXX | grep gcc > /dev/null 2>&1 then - if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1 + AC_MSG_CHECKING([if CXX is gcc 3 or 4]) + if $CXX -v 2>&1 | grep 'version [[34]]' > /dev/null 2>&1 then + AC_MSG_RESULT([yes]) + AC_MSG_NOTICE([using MySQL tricks to avoid linking C++ code with C++ libraries]) CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL" + else + AC_MSG_RESULT([no]) fi fi fi |