diff options
| author | unknown <joreland@mysql.com> | 2004-11-16 07:22:30 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-11-16 07:22:30 +0100 |
| commit | fdc46c0b7002685379936ee51a5a19242829efae (patch) | |
| tree | 39dc847742b930a3c542d1b3020b1463a0392371 /configure.in | |
| parent | b97d4bc4e68f0ae8f92cb991fc740dc2f89c86a6 (diff) | |
| parent | 8fbe68ad38bc2c1e62ff636b47aaeaefff7b8481 (diff) | |
| download | mariadb-git-fdc46c0b7002685379936ee51a5a19242829efae.tar.gz | |
merge
configure.in:
Auto merged
ndb/src/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/portlib/Makefile.am:
Auto merged
ndb/src/common/portlib/NdbConfig.c:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Makefile.am:
Auto merged
ndb/src/mgmapi/Makefile.am:
Auto merged
ndb/src/mgmclient/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index d771ebb0771..d2e34a2ca25 100644 --- a/configure.in +++ b/configure.in @@ -399,6 +399,7 @@ then then if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1 then + CFLAGS="$CFLAGS -DDEFINE_CXA_PURE_VIRTUAL" CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL" fi fi @@ -3114,7 +3115,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl ndb/src/kernel/blocks/qmgr/Makefile dnl ndb/src/kernel/blocks/trix/Makefile dnl ndb/src/kernel/blocks/backup/Makefile dnl - ndb/src/kernel/blocks/backup/restore/Makefile dnl ndb/src/kernel/blocks/dbutil/Makefile dnl ndb/src/kernel/blocks/suma/Makefile dnl ndb/src/kernel/blocks/grep/Makefile dnl |