diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-13 06:57:51 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-13 07:03:16 +0200 |
| commit | 2b9dbc8ad1640a62f71d75aede0250dc34d96224 (patch) | |
| tree | dc2e1d6eaf97ed250fad7c3a9509eea488dc3690 /RepositoryExternal.mk | |
| parent | b4079b0065767a0717a7f279511c0527fc8b994f (diff) | |
move selection of nss libs into RepositoryExternal
This should also unbreak Windows tinderboxes, because the internal nss
libs are now registered.
Change-Id: I801d7ebebf36eb1460fa4d626a893b5016115a79
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 342f5fb0698d..478bf255a8a5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1884,7 +1884,11 @@ endef ifeq ($(SYSTEM_NSS),YES) -define gb_LinkTarget__use_plc4 +define gb_LinkTarget__use_nss3 +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_MOZILLA \ +) + $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(NSS_CFLAGS) \ @@ -1896,6 +1900,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_LinkTarget__use_plc4 +$(call gb_LinkTarget__use_nss3,$(1)) + +endef + else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ @@ -1905,6 +1914,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ plc4 \ )) +define gb_LinkTarget__use_nss3 +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/mozilla/nspr \ + -I$(OUTDIR)/inc/mozilla/nss \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + nspr4 \ + nss3 \ + smime3 \ +) + +endef + define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_use_libraries,$(1),\ plc4 \ |