[ooo-build-commit] .: configure.in

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jul 2 03:54:20 PDT 2010


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

New commits:
commit 37591e8a5bc4bf2450009cad28cf3d07fedd3d3b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 2 13:49:12 2010 +0300

    Don't use --disable-nss-module on Windows
    
    Thus, produce nss DLLs built with MSVC2008 that override the ones in
    the prebuilt Mozilla runtime zipfile, like upstream does.
    
    Note that this means one has to pass a --with-mozilla-build option to
    configure (or autogen.sh), pointing to where one has installed the
    prepackaged Mozilla build toolset.

diff --git a/configure.in b/configure.in
index 72328b8..0f1b1f5 100644
--- a/configure.in
+++ b/configure.in
@@ -522,10 +522,10 @@ PKG_CHECK_MODULES( FOO_COMMON,
 # it's a really bad idea to do conditional tests for things.
 #
 if test "z`uname -s`" != "zSunOS" -a "z$with_win32" = "z" -a \( "z`uname -o 2>/dev/null`" = "zCygwin" -o "z`uname -s`" = "zInterix" \) ; then
-    AC_MSG_WARN([Automatically using --with-win32 --enable-binfilter --disable-build-mozilla --disable-nss-module])
+    AC_MSG_WARN([Automatically using --with-win32 --enable-binfilter --disable-build-mozilla])
     with_win32="yes"
     enable_binfilter="yes"
-    PROPAGATED_ARGS="$PROPAGATED_ARGS --enable-binfilter=yes --disable-build-mozilla --disable-nss-module"
+    PROPAGATED_ARGS="$PROPAGATED_ARGS --enable-binfilter=yes --disable-build-mozilla"
 fi
 if test "z$with_win32" = "z"; then
     if test ! $have_common; then


More information about the ooo-build-commit mailing list