[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild solenv/inc

[Caolán McNamara]

 configure.in                     |   15 +--------------
 set_soenv.in                     |    1 -
 solenv/gbuild/platform/unxgcc.mk |    4 ----
 solenv/inc/unxgcc.mk             |    3 ---
 4 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 9754f9570abb3c07db22177d4336b80417476c86
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 22 11:27:13 2011 +0100

    ENABLE_DEBUG_STL isn't working out for us, too easy to mix with and without

diff --git a/configure.in b/configure.in
index fa6ef65..0258e63 100755
--- a/configure.in
+++ b/configure.in
@@ -1876,16 +1876,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 ===================================================================
@@ -4238,17 +4235,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
diff --git a/set_soenv.in b/set_soenv.in
index ee92252..2cdf7f9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1516,7 +1516,6 @@ ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
-ToFile( "ENABLE_DEBUG_STL",  "@ENABLE_DEBUG_STL@", "e" );
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 19fbb67..5b8157f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,10 +120,6 @@ ifeq ($(HAVE_CXX0X),TRUE)
 gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
 endif
 
-ifeq ($(ENABLE_DEBUG_STL),TRUE)
-gb_CXXFLAGS += -D_GLIBCXX_DEBUG
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 79d10d2..752de80 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,9 +90,6 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
 .IF "$(HAVE_CXX0X)" == "TRUE"
 CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
 .ENDIF # "$(HAVE_CXX0X)" == "TRUE"
-.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
-CFLAGSCXX += -D_GLIBCXX_DEBUG
-.ENDIF
 
 CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
 CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch