diff options
| author | Chad MILLER <chad@mysql.com> | 2009-03-19 09:53:54 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-03-19 09:53:54 -0400 |
| commit | b4656bd71492f7849d38aa20bdca3a85a60a4982 (patch) | |
| tree | 7277fb2ed51a9cc01e4a0aa01eb251bbd7a0020e /configure.in | |
| parent | efbaf949f630446a780fdf20f98c9cd82ce97b0d (diff) | |
| parent | f30dda6ff1b14f8e342870bc336d0cf97f6832d7 (diff) | |
| download | mariadb-git-b4656bd71492f7849d38aa20bdca3a85a60a4982.tar.gz | |
Merge bugteam and contributed two patches from
Antony Dovgal <tony @ daylessday.org> . SCA signed and faxed to
tel:+1-408-715-2540. Patches tweaked by Chad.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.in b/configure.in index d86218bd782..7c7b7eddf0a 100644 --- a/configure.in +++ b/configure.in @@ -1678,14 +1678,17 @@ if test "$with_debug" = "yes" then # Medium debug. AC_DEFINE([DBUG_ON], [1], [Use libdbug]) - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" + AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes]) + CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases AC_DEFINE([DBUG_ON], [1], [Use libdbug]) - CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes]) + AC_DEFINE([SAFEMALLOC], [1], [Use safe malloc]) + CFLAGS="$DEBUG_CFLAGS $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS" else # Optimized version. No debug AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) @@ -2812,6 +2815,7 @@ 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'") |