Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3331
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/3331/1
ucb: honor --disable-openssl
On --disable-openssl, the bundled neon library
will link against GNUTLS + gcrypt instead of
OpenSSL. Hence, we don't need to add OpenSSL as
external library for ucb either.
Change-Id: I76b728ef4f9113e805ede0f50113169f5e89bb0a
---
M ucb/Library_ucpdav1.mk
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index e909447..1f1f51f 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -45,9 +45,12 @@
boost_headers \
libxml2 \
neon \
- openssl \
))
+ifneq ($(DISABLE_OPENSSL),YES)
+$(eval $(call gb_Library_use_externals,ucpdav1,openssl))
+endif # DISABLE_OPENSSL
+
$(eval $(call gb_Library_add_exception_objects,ucpdav1,\
ucb/source/ucp/webdav-neon/ContentProperties \
ucb/source/ucp/webdav-neon/DateTimeHelper \
--
To view, visit https://gerrit.libreoffice.org/3331
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b728ef4f9113e805ede0f50113169f5e89bb0a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andres Gomez <ago...@igalia.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
