[Libreoffice-commits] core.git: libxmlsec/ExternalProject_xmlsec.mk RepositoryExternal.mk

[Michael Meeks]

 RepositoryExternal.mk               |   12 ++++++++++++
 libxmlsec/ExternalProject_xmlsec.mk |    4 ++++
 2 files changed, 16 insertions(+)

New commits:
commit b440cfcc548f3e9c74001c1e692b35ff272c409a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Feb 28 12:05:07 2013 +0000

    add missing openssl & nss3 dependencies to libxmlsec
    
    These are required at configure time.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0298234..af96980 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2283,6 +2283,8 @@ endef
 endif # GUIBASE=unx
 
 
+gb_ExternalProject__use_nss3:=
+
 ifeq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 gb_LinkTarget__use_nss3:=
@@ -2359,6 +2361,16 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 endef
 
+define gb_ExternalProject__use_nss3
+$(call gb_ExternalProject_use_package,$(1),nss)
+$(call gb_ExternalProject_use_libraries,$(1),\
+	nspr4 \
+	nss3 \
+	smime3 \
+)
+
+endef
+
 endif
 endif # DESKTOP
 
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 14ce4ae..70b5083 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 
+$(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
+
+$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
+
 $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
 	build \
 ))