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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ebd1f56696ee..e6abe34112e6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -67,6 +67,10 @@ $(eval $(call gb_Library_add_defs,vcl,\ $(eval $(call gb_Library_use_sdk_api,vcl)) +$(eval $(call gb_Library_use_externals,vcl,\ + nss3 \ +)) + $(eval $(call gb_Library_use_libraries,vcl,\ svl \ tl \ @@ -83,38 +87,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,vcl,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,vcl,\ - -DSYSTEM_MOZILLA \ -)) - -$(eval $(call gb_Library_add_libs,vcl,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,vcl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,vcl,\ - nspr4 \ - nss3 \ - smime3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - - ifneq ($(OS),IOS) $(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ |