diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2011-11-02 17:36:27 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-02 17:37:53 +0100 |
| commit | f6f5c89259867b5aeb86d5509f826da949d122c4 (patch) | |
| tree | 89fd68e2d15904c775be50d163b9826ba7aee345 /xmlsecurity | |
| parent | b5ec39a65e8b5d78f9f58bc179e9130c81ec347a (diff) | |
Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 11 | ||||
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 2 |
2 files changed, 5 insertions, 8 deletions
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,\ diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index b32ff3b8fbbe..2e6e8d9bb571 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ AllLangResTarget_xsec \ Library_xmlsecurity \ Library_xsec_fw \ - $(if $(filter YES,$(ENABLE_NSS_MODULE) $(SYSTEM_MOZILLA)),Library_xsec_xmlsec) \ + Library_xsec_xmlsec \ )) # failing |