[Libreoffice-commits] .: configure.in

[Lubos Lunak]

 configure.in |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 070e53d4fd77262413434a77430a5e12cadcff50
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jul 18 14:31:00 2011 +0200

    use internal cppunit with STL debug enabled
    
    http://lists.freedesktop.org/archives/libreoffice/2011-July/014970.html

diff --git a/configure.in b/configure.in
index 88f09bb..fa6ef65 100755
--- a/configure.in
+++ b/configure.in
@@ -4238,7 +4238,17 @@ dnl ===================================================================
 dnl Check for system cppunit
 dnl ===================================================================
 AC_MSG_CHECKING([which cppunit to use])
-if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
+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" && \
         test "$with_system_cppunit" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_CPPUNIT=YES