external/curl/ExternalProject_curl.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 461bdf0b4f863a5ba39dd76b6baf416fbb64b5e8
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Nov 18 23:20:45 2013 +0100
curl: try to use Mac OS X native SSL/TLS implementation
This should give better OS integration for things like adding CAs.
Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 932c08b..6f024bf 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -40,7 +40,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
- --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call
gb_UnpackedTarball_get_dir,nss)/dist/out") \
+ $(if $(filter MACOSX IOS,$(OS)),\
+ --with-darwinssl, \
+ --with-nss$(if $(filter
NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl \
--without-libidn --enable-ftp --enable-ipv6
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet
--disable-dict --without-libssh2 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
