[Libreoffice-commits] .: 4 commits - autogen.sh configure.in connectivity/source

[Tor Lillqvist]

 autogen.sh                                              |    2 
 configure.in                                            |    7 ++
 connectivity/source/drivers/mozab/pre_include_mozilla.h |   46 ++++++++--------
 connectivity/source/manager/mdrivermanager.cxx          |    5 +
 4 files changed, 38 insertions(+), 22 deletions(-)

New commits:
commit a02a4272e05d863061ea7c2ac142420d1f51b7ca
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 17:59:32 2011 +0300

    Don't do the undef-redef dance for "MINIMAL_PROFILEDISCOVER"

diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index e5e3dac..7e2c5fe 100755
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -26,30 +26,32 @@
  *
  ************************************************************************/
 
-// Turn off DEBUG Assertions
-#ifdef _DEBUG
-    #define _DEBUG_WAS_DEFINED _DEBUG
-    #ifndef MOZILLA_ENABLE_DEBUG
-        #undef _DEBUG
+#ifndef MINIMAL_PROFILEDISCOVER
+    // Turn off DEBUG Assertions
+    #ifdef _DEBUG
+        #define _DEBUG_WAS_DEFINED _DEBUG
+        #ifndef MOZILLA_ENABLE_DEBUG
+            #undef _DEBUG
+        #endif
+    #else
+        #undef _DEBUG_WAS_DEFINED
+        #ifdef MOZILLA_ENABLE_DEBUG
+            #define _DEBUG 1
+        #endif
     #endif
-#else
-    #undef _DEBUG_WAS_DEFINED
-    #ifdef MOZILLA_ENABLE_DEBUG
-        #define _DEBUG 1
-    #endif
-#endif
 
-// and turn off the additional virtual methods which are part of some interfaces when compiled
-// with debug
-#ifdef DEBUG
-    #define DEBUG_WAS_DEFINED DEBUG
-    #ifndef MOZILLA_ENABLE_DEBUG
-        #undef DEBUG
-    #endif
-#else
-    #undef DEBUG_WAS_DEFINED
-    #ifdef MOZILLA_ENABLE_DEBUG
-        #define DEBUG 1
+    // and turn off the additional virtual methods which are part of some interfaces when compiled
+    // with debug
+    #ifdef DEBUG
+        #define DEBUG_WAS_DEFINED DEBUG
+        #ifndef MOZILLA_ENABLE_DEBUG
+            #undef DEBUG
+        #endif
+    #else
+        #undef DEBUG_WAS_DEFINED
+        #ifdef MOZILLA_ENABLE_DEBUG
+            #define DEBUG 1
+        #endif
     #endif
 #endif
 
commit f25034d53994c6947971cf7c4dd6de0d47d646ce
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 17:53:56 2011 +0300

    Disable Mozilla stuff in an --enable-dbgutil build on Windows
    
    The mozab code plays games with _DEBUG (undefining and re-defining it
    around Mozilla headers), which causes linking error when part of the
    code has been compiled with _DEBUG and part hasn't. See
    connectivity/source/drivers/mozab/pre_include_mozilla.h. Just disable
    Mozilla stuff for now when using --enable-dbgutil.

diff --git a/configure.in b/configure.in
index 77e7bc4..4f949a5 100755
--- a/configure.in
+++ b/configure.in
@@ -2226,6 +2226,13 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
     PRODUCT=""
     PROFULLSWITCH=""
     AC_MSG_RESULT([yes])
+    if test $_os = WINNT -a \( "$enable_mozilla" = yes -o "$enable_build_mozilla" = yes \); then
+        # We can't build against the Mozilla stuff if using _DEBUG, will get linking errors
+        # See connectivity/drivers/mozab
+        AC_MSG_WARN([Also disabling Mozilla then])
+        enable_mozilla=no
+        enable_build_mozilla=no
+    fi
 else
     PRODUCT="full"
     PROFULLSWITCH="product=full"
commit e058530153a55ccf83d1f2a4d1ca32b94d83508c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 17:49:28 2011 +0300

    Allow comments in the autogen.lastrun file

diff --git a/autogen.sh b/autogen.sh
index 7df437b..bdb9aa9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,6 +61,8 @@ sub read_args($)
                     print "  $opt\n";
                 }
             }
+        } elsif ( substr($_, 0, 1) eq "#" ) {
+            # comment
         } else {
             push @lst, $_;
         }
commit 785d8c762c93a7d063bb737f29b3eb7603630e78
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 24 17:27:59 2011 +0300

    Again, avoid debugging MSVC std::equal_range issue

diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index be2df41..812abd6 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -26,6 +26,11 @@
  *
  ************************************************************************/
 
+// Avoid problem due to dubious std::equal_range usage when building
+// with MSVC in --enable-dbgutil mode (i.e. _DEBUG defined, using the
+// debugging C/C++ runtime)
+#define _HAS_ITERATOR_DEBUGGING 0
+
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"