[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1b2965833c97da449f5d38c9e683c14507a97462
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Sep 21 17:54:23 2011 +0300

    Disable also the nss module when using --enable-dbgutil in a Windows build

diff --git a/configure.in b/configure.in
index a78b06a..0be1d0e 100755
--- a/configure.in
+++ b/configure.in
@@ -2293,11 +2293,15 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
     PROEXT=""
     PRODUCT=""
     AC_MSG_RESULT([yes])
-    if test $_os = WINNT -a \( "$enable_mozilla" = yes -o "$enable_build_mozilla" = yes \); then
+    if test $_os = WINNT -a \
+            \( "$enable_mozilla" = yes -o \
+               "$enable_nss_module" = 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])
+        AC_MSG_WARN([Also disabling Mozilla stuff then])
         enable_mozilla=no
+        enable_nss_module=no
         enable_build_mozilla=no
     fi
 else