#i122365# RmMoz 2/9: make the Mozilla->NSS replacement work

12 files changed, 52 insertions, 50 deletions

diff --git a/configure.in b/configure.in
index 0d069fb3a33a..2fa7da9c1542 100644
--- a/configure.in
+++ b/configure.in
@@ -325,7 +325,7 @@ AC_ARG_ENABLE(layout,
 [  --enable-layout         Enable the compilation and use of layout dialogs
 ],,)
 AC_ARG_ENABLE(nss_module,
-[  --disable-nss-module    Whether to use provided NSS module     
+[  --disable-nss-module    Whether to use the system provided NSS module     
 ],,enable_nss_module=yes)
 AC_ARG_ENABLE(kde,
 [  --enable-kde            Determines whether to use Qt/KDE vclplug on platforms
@@ -403,7 +403,7 @@ AC_ARG_WITH(external-thes-dir,
 
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
-                          --with-system-* flags except mozilla and
+                          --with-system-* flags except 
                           odbc/sane/xrender-header(s)
 ],,)
 AC_ARG_WITH(system-headers,
@@ -4785,7 +4785,7 @@ if test "$enable_nss_module" != "no"; then
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for Mozilla build tooling])
       if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found.
+AC_MSG_ERROR([Mozilla build tooling not found. It is needed for NSS.
 Use the --with-mozilla-build option after installling the tools obtained
 from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
       else
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index 968dbfa9e57a..b9ff93228e12 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,7 @@
+<<<<<<< Updated upstream
 ls  libxmlsec   : stlport soltools LIBXML2:libxml2 NSS:nss SO:moz_prebuilt NULL
+=======
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 NSS:nss NULL
+>>>>>>> Stashed changes
 ls	libxmlsec			    usr1	-	all	ls_mkout NULL
 ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index cd9d428a5521..6c4f2ae42e6f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -301,7 +301,7 @@ my_components += ScriptProviderForJavaScript
 my_components += ldapbe2
 .END
 
-.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(ENABLE_NSS_MODULE)" != "NO"
 my_components += \
     xmlsecurity \
     xsec_fw \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e7f3122729b8..881dbf01d974 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1695,7 +1695,30 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
 
-#ifndef WITHOUT_MOZILLA
+
+#ifdef BUNDLE_NSS_LIBS
+
+STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
+STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
+STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
+STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
+STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
+STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
+STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
+STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
+
+#ifndef MACOSX // #i108575# use system sqlite3 on MacOSX
+STD_LIB_FILE( gid_File_Lib_Sqlite3, sqlite3)
+#endif
+
+#endif // BUNDLE_NSS_LIBS
+
+
+#ifdef ENABLE_XMLSEC
+
 File gid_File_Lib_XSec_Framework
     TXT_FILE_BODY;
 	#ifdef UNX
@@ -1730,6 +1753,7 @@ File gid_File_Lib_XSec_XMLSecurity
 End
 
 #ifdef WNT
+
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;
     #ifdef _gcc3
@@ -1751,10 +1775,11 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
-#endif
 
-//i20156 - end
-#endif
+#endif // WNT 
+
+#endif // ENABLE_XMLSEC
+
 
 File gid_File_Lib_Migrationoo2
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d67588c15139..a8a7cbc50421 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1091,17 +1091,6 @@ File gid_File_Mod_Text
     Name = "text.mod";
 End
 
-/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) 
-
-File gid_File_Mozilla_Runtime
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "mozruntime.zip";
-End
-
-#endif*/
-
 File gid_File_Share_Registry_Main_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 317f2fb3fb37..f062a0fba119 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -111,7 +111,7 @@ STD_RES_FILE( gid_File_Res_Xsltdlg, xsltdlg )
 
 STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
 
-#ifndef WITHOUT_MOZILLA
+#ifdef ENABLE_XMLSEC
 STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
 #endif
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index ee76b9bd20f9..dc076f1068eb 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -120,17 +120,16 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 SCPDEFS+=-DUSE_SYSTEM_STL
 .ENDIF
 
-#.IF "$(WITH_MOZILLA)" == "NO"
-#SCPDEFS+=-DWITHOUT_MOZILLA
-#.ENDIF
-
 .IF "$(WITH_MYSPELL_DICTS)" == "NO"
 SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
 .ENDIF
 
-#.IF "$(SYSTEM_MOZILLA)" == "YES"
-#SCPDEFS+=-DSYSTEM_MOZILLA
-#.ENDIF
+.IF "$(ENABLE_NSS_MODULE)" == "YES"
+SCPDEFS+=-DENABLE_XMLSEC
+    .IF "$(SYSTEM_NSS)" != "YES"
+    SCPDEFS+=-DBUNDLE_NSS_LIBS
+    .ENDIF
+.ENDIF
 
 .IF "$(WITH_LDAP)" == "YES"
 SCPDEFS+=-DWITH_LDAP
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 18efeb5807ea..08bb5ea93a95 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -714,10 +714,7 @@ Module gid_Module_Root_Files_7
 	Sortkey = "1900";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Help_Help_Zip,
-             gid_File_Moz_Msvcp71,
-             gid_File_Moz_Msvcr71,
-             gid_File_Mozilla_Runtime);
+	Files = (gid_File_Help_Help_Zip);
 End
 
 Module gid_Module_Root_Files_Images
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index 31b17eee486f..cb7197e4085e 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
+xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL
diff --git a/xmlsecurity/source/xmlsec/makefile.mk b/xmlsecurity/source/xmlsec/makefile.mk
index 2b243e42904a..34088dc26979 100644
--- a/xmlsecurity/source/xmlsec/makefile.mk
+++ b/xmlsecurity/source/xmlsec/makefile.mk
@@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE
 CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 .ENDIF
 
-.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(ENABLE_NSS_MODULE)"!="YES"
 @all:
-    @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.."
-.ENDIF
+    @echo "No nss -> no libxmlsec -> no xmlsecurity.."
 .ENDIF
 
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk
index 18b07ce4707f..c267e1151b40 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE
 CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 .ENDIF
 
-.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(ENABLE_NSS_MODULE)"!="YES"
 @all:
-    @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
-.ENDIF
+    @echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
 .ENDIF
 
 .IF "$(SYSTEM_MOZILLA)" != "YES"
@@ -118,11 +116,7 @@ SOLARINC += \
 -I$(NSPR_INC) \
 -I$(PRJ)$/source$/xmlsec
 
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC)
-.ELSE
 SOLARINC += -I$(NSS_INC)
-.ENDIF
 
 SLOFILES = \
     $(SLO)$/nssinitializer.obj \
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index e065fc0d894a..d14bf2766157 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -35,9 +35,9 @@ USE_DEFFILE=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :	$(PRJ)$/util$/target.pmk
 
-.IF "$(WITH_MOZILLA)" == "NO"
+.IF "$(ENABLE_NSS_MODULE)" != "YES"
 @all:
-    @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity..."
+    @echo "No nss -> no libxmlsec -> no xmlsecurity..."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -71,8 +71,6 @@ SHL2NAME=xsec_xmlsec
 SHL2TARGET= $(SHL2NAME)
 
 
-.IF "$(ENABLE_NSS_MODULE)"=="YES" || "$(SYSTEM_MOZILLA)" == "YES"
-
 SHL2LIBS= \
     $(SLB)$/xs_comm.lib
 
@@ -84,8 +82,6 @@ SHL2LIBS += \
 SHL2LIBS += \
     $(SLB)$/xs_nss.lib
 
-.ENDIF
-
 
 SHL2STDLIBS +=			\
     $(SALLIB)			\