diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
| commit | ae83b2466043967a2f32f81ddf73b1ecb401ef18 (patch) | |
| tree | 5120dbd146af6041ae8de04db301a19ebdd7cfcc /configure.in | |
| parent | 2819345ceec204d0c3091d085ffd69d41683f078 (diff) | |
| parent | fb98a77bace12ef2b436a8acb358559f3307999e (diff) | |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'configure.in')
| -rwxr-xr-x | configure.in | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/configure.in b/configure.in index 1afc0459d64c..c97ebff6a15f 100755 --- a/configure.in +++ b/configure.in @@ -1880,16 +1880,13 @@ dnl =================================================================== AC_MSG_CHECKING([whether to do a debug build]) if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" - ENABLE_DEBUG_STL="TRUE" enable_symbols="yes" AC_MSG_RESULT([yes]) else ENABLE_DEBUG="FALSE" - ENABLE_DEBUG_STL="FALSE" AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DEBUG) -AC_SUBST(ENABLE_DEBUG_STL) dnl Set the ENABLE_DBGUTIL variable dnl =================================================================== @@ -4141,17 +4138,7 @@ dnl =================================================================== dnl Check for system cppunit dnl =================================================================== AC_MSG_CHECKING([which cppunit to use]) -if test -z "$ENABLE_DEBUG_STL"; then - AC_MSG_ERROR([Internal error, debug build check needs to precede cppunit check]) -fi -if test "$ENABLE_DEBUG_STL" = "TRUE"; then - if test "$with_system_cppunit" = "yes"; then - AC_MSG_ERROR([--with-system-cppunit conflicts with debug build]) - fi - AC_MSG_RESULT([internal, needed by debug build]) - SYSTEM_CPPUNIT=NO - BUILD_TYPE="$BUILD_TYPE CPPUNIT" -elif test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ +if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ test "$with_system_cppunit" != "no"; then AC_MSG_RESULT([external]) SYSTEM_CPPUNIT=YES |