diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 31 |
2 files changed, 2 insertions, 31 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d6c6fca46c07..ad12be06f12e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2153,7 +2153,7 @@ ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_MOZILLA \ + -DSYSTEM_NSS \ ) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 6808cbc21f1a..29010b709071 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ + nss3 \ )) $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ @@ -148,36 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,xsec_xmlsec,\ - -DSYSTEM_NSS \ -)) - -$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - nspr4 \ - nss3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ -ldl \ |