From f6f5c89259867b5aeb86d5509f826da949d122c4 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 2 Nov 2011 17:36:27 +0100 Subject: Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec. This also finishes the uncoupling of NSS from the --with-system-mozilla. --- xmlsecurity/Library_xsec_xmlsec.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'xmlsecurity/Library_xsec_xmlsec.mk') diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index f51fd9d9143c..90dcad0ee939 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -148,12 +148,11 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif # ifeq ($(GUI),WNT) -ifeq ($(SYSTEM_MOZILLA),YES) +ifeq ($(SYSTEM_NSS),YES) $(eval $(call gb_Library_set_include,xsec_xmlsec,\ $$(INCLUDE) \ - $(MOZ_NSPR_CFLAGS) \ - $(MOZ_NSS_CFLAGS) \ + $(NSS_CFLAGS) \ )) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ @@ -161,9 +160,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ )) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(NSPR_LIB) \ - $(NSS_LIB) \ - $(MOZ_NSS_LIBS) \ + $(NSS_LIBS) \ )) else @@ -179,7 +176,7 @@ $(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ nss3 \ )) -endif # ifeq ($(SYSTEM_MOZILLA),YES) +endif # ifeq ($(SYSTEM_NSS),YES) ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ -- cgit