Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 12:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dougt@meer.net 2008-02-22 17:13:20 -08:00
parent 83cb8eacc7
commit 314cb3356b
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/library/libxul-config.mk
View File

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

5
toolkit/library/libxul-rules.mk
View File

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

13
toolkit/library/nsStaticXULComponents.cpp
View File

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