diff options
| author | unknown <autotest@mc01.ndb.mysql.com> | 2004-06-03 13:15:54 +0200 |
|---|---|---|
| committer | unknown <autotest@mc01.ndb.mysql.com> | 2004-06-03 13:15:54 +0200 |
| commit | 13047f4521ee1152cb2785291e17b51b1b92a2c1 (patch) | |
| tree | 9ba0e38f11145ccb9a700c819fcb6eb07511602e /configure.in | |
| parent | 34e5cca1b7e32edf12b985bebe4a6228b524292b (diff) | |
| download | mariadb-git-13047f4521ee1152cb2785291e17b51b1b92a2c1.tar.gz | |
Makefile.am:
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
NDB_DEBUG -> VM_TRACE
configure.in:
cleaned up ndb CXX flags and added optional flag possibility
configure.in:
cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
local flag in ndbapi to set -O2 since problems occur with -O3
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/configure.in b/configure.in index b8ce18d71fe..453ffaf67e8 100644 --- a/configure.in +++ b/configure.in @@ -1614,19 +1614,15 @@ then # Medium debug. CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" - #NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" - NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" - NDB_DEFS="-DNDB_DEBUG -DUSE_EMULATED_JAM -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" else # Optimized version. No debug CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS" - NDB_DEFS="-DNDB_RELEASE -DUSE_EMULATED_JAM -DNDEBUG" fi # Force static compilation to avoid linking problems/get more speed @@ -2863,7 +2859,19 @@ if test X"$have_ndbcluster" = Xyes then MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" - CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" + if test "$with_debug" = "yes" + then + # Medium debug. + NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" + CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_DEBUG_LOC)" + elif test "$with_debug" = "full" + then + NDB_DEFS="-DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" + CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_DEBUG_LOC)" + else + NDB_DEFS="-DNDEBUG" + CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_RELEASE_LOC)" + fi fi AC_SUBST([NDB_DEFS]) |