[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk Repository.mk xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/Module_xmlsecurity.mk

[David Tardon]

 Repository.mk                      |    3 ---
 RepositoryExternal.mk              |   29 +++++++++++++++++++++++++++++
 xmlsecurity/Library_xsec_xmlsec.mk |    2 +-
 xmlsecurity/Module_xmlsecurity.mk  |    7 +------
 4 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit b6aa48432d322e13e9facaf3c889d77657aaa14e
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 11 13:10:14 2011 +0200

    fix build of xmlsecurity with system mozilla

diff --git a/Repository.mk b/Repository.mk
index 6cbdc2f..87253d0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -153,9 +153,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	fileacc \
 	mcnttype \
 	neon \
-	nspr4 \
-	nss3 \
-	plc4 \
 	test \
 	xmlsecurity \
 	xsec_fw \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c0c9705..ed87327 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -658,4 +658,33 @@ $(call gb_LinkTarget_add_libs,$(1), \
 
 endef
 
+ifeq ($(SYSTEM_MOZILLA),YES)
+
+define gb_LinkTarget__use_plc4
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    $(MOZ_NSS_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+    $(MOZ_NSS_LIBS) \
+)
+endef
+
+else
+
+define gb_LinkTarget__use_plc4
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+    nspr4 \
+    nss3 \
+    plc4 \
+))
+
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    plc4 \
+)
+endef
+
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 770122e..15a2216 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -124,7 +124,7 @@ $(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
 	xmlsec1-nss \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
 	plc4 \
 ))
 
commit 590e2e2f9b65c42321c1ee35a02a2e6f677b4959
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 11 13:09:27 2011 +0200

    fix condition for building libxsec_xmlsec

diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 59a00ac..6fd29cc 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -34,14 +34,9 @@ $(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) \
 ))
 
-ifeq ($(or $(ENABLE_NSS_MODULE),$(SYSTEM_MOZILLA)),YES)
-$(eval $(call gb_Module_add_targets,xmlsecurity,\
-	Library_xsec_xmlsec \
-))
-endif
-
 # failing
 #$(eval $(call gb_Module_add_check_targets,xmlsecurity,\
 	CppunitTest_qa_certext \