← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2008-07-18 20:10:26 UTC
  • mfrom: (51.3.29 remove-dbug)
  • Revision ID: brian@tangent.org-20080718201026-tto5golt0xhwqe4a
Merging in Jay's final patch on dbug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
732
732
CFLAGS="${SYMBOLS_CFLAGS} ${CFLAGS}"
733
733
CXXFLAGS="${SYMBOLS_CXXFLAGS} ${CXXFLAGS}"
734
734
 
735
 
AC_ARG_WITH([debug],
736
 
    [AS_HELP_STRING([--with-debug],
737
 
            [Add debug code (yes|no|full) @<:@default=no@:>@ 
738
 
            Full adds memory checked, very slow.])],
739
 
    [with_debug=$withval],
740
 
    [with_debug=no])
741
 
AM_CONDITIONAL(BUILD_DBUG, test "$with_debug" != "no")
742
 
if test "$with_debug" = "yes"
743
 
then
744
 
  # Medium debug.
745
 
  AC_DEFINE([DBUG_ON], [1], [Use libdbug])
746
 
  CFLAGS="$DEBUG_OPTIMIZE_CC $CFLAGS"
747
 
  CXXFLAGS="$DEBUG_OPTIMIZE_CXX $CXXFLAGS"
748
 
else
749
 
  # Optimized version. No debug
750
 
  AC_DEFINE([DBUG_OFF], [1], [Dont use libdbug])
751
 
  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
752
 
  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
753
 
fi
754
 
 
755
 
# If we should allow error injection tests
756
 
AC_ARG_WITH([error-inject],
757
 
    [AS_HELP_STRING([--with-error-inject],
758
 
            [Enable error injection in Drizzle Server @<:@default=off@:>@])],
759
 
    [ with_error_inject=$withval ],
760
 
    [ with_error_inject=no ])
761
 
 
762
 
if test $with_debug != "no"
763
 
then
764
 
  if test "$with_error_inject" = "yes"
765
 
  then
766
 
    AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
767
 
              [Enable error injection in Drizzle Server])
768
 
  fi
769
 
fi
770
 
 
771
735
AC_ARG_WITH([fast-mutexes],
772
736
    [AS_HELP_STRING([--with-fast-mutexes],
773
737
            [Compile with fast mutexes  @<:@default=off@:>@])],
776
740
 
777
741
if test "$with_fast_mutexes" != "no"
778
742
then
779
 
  if test "$with_debug" != "no"
780
 
  then
781
 
    AC_MSG_WARN(['--with-fast-mutexes' ignored when '--with-debug' is given])
782
 
  else
783
 
    AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1], 
784
 
              [Define to 1 if you want to use fast mutexes])
785
 
  fi
 
743
        AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1], 
 
744
                        [Define to 1 if you want to use fast mutexes])
786
745
fi
787
746
 
788
747
AC_ARG_WITH([comment],
1285
1244
 libdrizzle/Makefile client/Makefile dnl
1286
1245
 server/Makefile server/share/Makefile dnl
1287
1246
 server/sql_builtin.cc dnl
1288
 
 dbug/Makefile include/Makefile dnl
 
1247
 include/Makefile dnl
1289
1248
 support-files/Makefile dnl
1290
1249
 tests/Makefile tests/install_test_db dnl
1291
1250
 include/drizzle_version.h plugin/Makefile dnl