diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-28 12:05:07 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-28 12:59:51 +0000 |
| commit | b440cfcc548f3e9c74001c1e692b35ff272c409a (patch) | |
| tree | 980e0149f46c58cbedc82896a7ecfbf1c6d2a459 | |
| parent | bfdcde7c2eb44b7c342ba1d048384eb7776808ae (diff) | |
add missing openssl & nss3 dependencies to libxmlsec
These are required at configure time.
| -rw-r--r-- | RepositoryExternal.mk | 12 | ||||
| -rw-r--r-- | libxmlsec/ExternalProject_xmlsec.mk | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0298234d1759..af9698080a55 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 14ce4ae6ba5f..70b5083e00b3 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 \ )) |