Fix for bug 60909. r=javi@netscape.com, bryner@netscape.com. sr=brendan@mozilla.org, leaf@mozilla.org.

client.mak

@@ -117,14 +117,22 @@ NSPR_CO_FLAGS=-r NSPRPUB_CLIENT_BRANCH
 CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS) -P
 
 #//------------------------------------------------------------------------
-#// Figure out how to pull PSM client libs.
-#// If no PSM_CO_TAG is specified, use the default static tag
+#// Figure out how to pull NSS and PSM libs.
+#// If no NSS_CO_TAG or PSM_CO_TAG is specified, use the default static tag
 #//------------------------------------------------------------------------
 
+!if "$(NSS_CO_TAG)" != ""
+NSS_CO_FLAGS=-r $(NSS_CO_TAG)
+!else
+NSS_CO_FLAGS= -r NSS_CLIENT_TAG
+!endif
+
+CVSCO_NSS = cvs -q $(CVS_FLAGS) co $(NSS_CO_FLAGS) -P
+
 !if "$(PSM_CO_TAG)" != ""
 PSM_CO_FLAGS=-r $(PSM_CO_TAG)
 !else
-PSM_CO_FLAGS=-r SECURITY_CLIENT_BRANCH
+PSM_CO_FLAGS=
 !endif
 
 CVSCO_PSM = cvs -q $(CVS_FLAGS) co $(PSM_CO_FLAGS) -P
@@ -159,9 +167,14 @@ pull_nspr: pull_clientmak
       cd $(MOZ_SRC)\.
       $(CVSCO_NSPR) mozilla/nsprpub
 
-pull_psm:
+pull_nss:
 	cd $(MOZ_SRC)\.
-	$(CVSCO_PSM) mozilla/security
+	$(CVSCO_NSS) mozilla/security/coreconf
+	$(CVSCO_NSS) mozilla/security/nss
+
+pull_psm: pull_nss
+	cd $(MOZ_SRC)\.
+	$(CVSCO_PSM) mozilla/security/psm
 
 pull_ldapcsdk:
 	cd $(MOZ_SRC)\.

extensions/makefile.win

@@ -22,6 +22,15 @@
 DEPTH=..
 include <$(DEPTH)/config/config.mak>
 
-DIRS = wallet cookie irc psm-glue xml-rpc xmlextras
+DIRS = wallet \
+	cookie \
+	irc \
+!if defined(BUILD_PSM)
+	psm-glue \
+!endif 
+	xml-rpc \
+	xmlextras \
+	$(NULL)
+
 
 include <$(DEPTH)\config\rules.mak>

extensions/psm-glue/src/makefile.win

@@ -37,7 +37,7 @@ include <$(DEPTH)/config/config.mak>
 
 LINCS = $(LINCS)     \
     -I$(PUBLIC)      \
-    -I$(PUBLIC)/security \
+    -I$(XPDIST)/public/security \
     $(NULL)
 
 LLIBS   = \

makefile.win

@@ -58,7 +58,9 @@ DIRS =                         \
   modules\mpfilelocprovider    \
   modules\zlib                 \
   netwerk                      \
+!if defined(BUILD_PSM)
   security                     \
+!endif
   widget\timer                 \
   js                           \
   modules\libjar               \

security/makefile.win

@@ -22,6 +22,6 @@
 DEPTH=..
 include <$(DEPTH)/config/config.mak>
 
-DIRS = psm
+DIRS = nss psm\lib\nlslayer psm
 
 include <$(DEPTH)\config\rules.mak>

security/psm/lib/nlslayer/nlslayer.cpp

@@ -77,13 +77,6 @@ extern "C" PRBool nlsInit()
 #if !defined(XP_MAC)
 	res = NS_InitXPCOM(NULL, NULL);
 	NS_ASSERTION( NS_SUCCEEDED(res), "NS_InitXPCOM failed" );
-
-	// Register components
-	res = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
-                                                 NULL /* default */);
-	if(NS_FAILED(res)) {
-		goto loser;
-	}
 #endif
 
 	// Create the bundles