support MOZ_PSM build flag in toolkit/library. b=418652, r=bsmedberg, a=damons

toolkit/library/libxul-config.mk

@@ -122,9 +122,14 @@ COMPONENT_LIBS += \
 	chrome \
 	commandlines \
 	toolkitcomps \
+	$(NULL)
+
+ifdef MOZ_PSM_
+COMPONENT_LIBS += \
 	pipboot \
 	pipnss \
 	$(NULL)
+endif
 
 ifdef MOZ_XMLEXTRAS
 COMPONENT_LIBS += \
@@ -255,10 +260,16 @@ ifdef MOZ_XUL
 COMPONENT_LIBS += \
 	tkautocomplete \
 	satchel \
+	$(NULL)
+
+ifdef MOZ_PSM_
+COMPONENT_LIBS += \
 	pippki \
 	$(NULL)
 endif
 
+endif
+
 ifdef MOZ_MATHML
 COMPONENT_LIBS += ucvmath
 endif

toolkit/library/libxul-rules.mk

@@ -42,9 +42,12 @@ EXTRA_DSO_LDOPTS += \
 	$(PNG_LIBS) \
 	$(LCMS_LIBS) \
 	$(MOZ_JS_LIBS) \
-	$(NSS_LIBS) \
 	$(NULL)
 
+ifdef MOZ_PSM
+EXTRA_DSO_LDOPTS += $(NSS_LIBS)
+endif
+
 ifdef MOZ_NATIVE_ZLIB
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 else

toolkit/library/nsStaticXULComponents.cpp

@@ -229,7 +229,6 @@
 #define XULENABLED_MODULES                   \
     MODULE(tkAutoCompleteModule)             \
     MODULE(satchel)                          \
-    MODULE(PKI)
 #else
 #define XULENABLED_MODULES
 #endif
@@ -246,6 +245,15 @@
 #define XMLEXTRAS_MODULE
 #endif
 
+#ifdef MOZ_PSM
+#define PSM_MODULES \
+    MODULE(BOOT)    \
+    MODULE(NSS)     \
+    MODULE(PKI)
+#else
+#define PSM_MODULES
+#endif
+
 #ifdef MOZ_XUL
 #ifdef MOZ_ENABLE_GTK2
 #define UNIXPROXY_MODULE MODULE(nsUnixProxyModule)
@@ -300,8 +308,7 @@
     XREMOTE_MODULES                          \
     XPINSTALL_MODULES                        \
     JSDEBUGGER_MODULES                       \
-    MODULE(BOOT)                             \
-    MODULE(NSS)                              \
+    PSM_MODULES                              \
     SYSTEMPREF_MODULES                       \
     SPELLCHECK_MODULE                        \
     XMLEXTRAS_MODULE                         \