diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-03-20 13:18:29 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-03-20 13:18:29 +0200 |
| commit | b71a73c7e2836eed770e82a19629b3322c3eb40b (patch) | |
| tree | 6b0e725752b846fed1956180832736373cdb632b /configure.in | |
| parent | 0c1630540987d4a4e34b34fb06f11f00d41c6905 (diff) | |
| download | mariadb-git-b71a73c7e2836eed770e82a19629b3322c3eb40b.tar.gz | |
reverting a bogus fix into 5.1-bugteam
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 7c7b7eddf0a..d86218bd782 100644 --- a/configure.in +++ b/configure.in @@ -1678,17 +1678,14 @@ if test "$with_debug" = "yes" then # Medium debug. AC_DEFINE([DBUG_ON], [1], [Use libdbug]) - AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes]) - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS" + CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases AC_DEFINE([DBUG_ON], [1], [Use libdbug]) - AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes]) - AC_DEFINE([SAFEMALLOC], [1], [Use safe malloc]) - CFLAGS="$DEBUG_CFLAGS $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS" + CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" else # Optimized version. No debug AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) @@ -2815,7 +2812,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) -AC_CONFIG_COMMANDS([my_config.h], cp include/config.h include/my_config.h) # Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'") |