external/curl/ExternalProject_curl.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7edb1f5f32b21a934e3ed4999482ceb07568dfd0
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jan 17 15:54:59 2014 +0100
curl: we really want --with-darwinssl on Mac for libcmis
(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7)
Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 208a556..42cb4e8 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -35,14 +35,16 @@ ifeq ($(SYSTEM_NSS),NO)
curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
endif
+# use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
- $(if $(filter
IOS,$(OS)),--with-darwinssl,--without-ssl) \
- $(if $(filter MACOSX,$(OS)),,\
+ $(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 \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
