diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-06 08:54:53 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-12-06 08:54:53 +0000 |
| commit | 878a155e50f396069ff0f2cb9a66e5f3e042ddb4 (patch) | |
| tree | e3b2a03246ee409037986a7bd13a24af93979cf8 /configure.in | |
| parent | 77a9eede5d2c4dca4973afd266b0b1218b196d4e (diff) | |
| parent | ca2e6e8192e082dc16dad8a88d98476f1281383d (diff) | |
| download | mariadb-git-878a155e50f396069ff0f2cb9a66e5f3e042ddb4.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/configure.in b/configure.in index aa3a9d74271..4131db9c66d 100644 --- a/configure.in +++ b/configure.in @@ -3039,15 +3039,26 @@ then MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" - if test "$with_debug" = "yes" + if test "$have_ndb_debug" = "default" + then + have_ndb_debug=$with_debug + fi + + if test "$have_ndb_debug" = "yes" then # Medium debug. NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" - elif test "$with_debug" = "full" + elif test "$have_ndb_debug" = "full" then NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" else - NDB_DEFS="-DNDEBUG" + # no extra ndb debug but still do asserts if debug version + if test "$with_debug" = "yes" -o "$with_debug" = "full" + then + NDB_DEFS="" + else + NDB_DEFS="-DNDEBUG" + fi fi AC_SUBST([NDB_DEFS]) |