[Libreoffice-commits] core.git: external/curl

[Douglas Mencken]

 external/curl/ExternalProject_curl.mk |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 92ca6ef11daa892cffaff136b9a4380665f0ecc2
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Mar 2 06:41:51 2014 -0500

    curl (bundled): fix logic breakout
    
    use --with-nss only on platforms other than Mac OS X and iOS
    
    (see commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e)
    
    Change-Id: Ie6cb35ea5f5db2d08f303f70d1559188912ba8e5
    Reviewed-on: https://gerrit.libreoffice.org/8418
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index e1d8c07..5e36ec8 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -35,20 +35,17 @@ ifeq ($(SYSTEM_NSS),)
 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
-# (note that --with-darwinssl option is not very compatible)
+# use --with-darwinssl on Mac OS X >10.5 and iOS to get a native UI for SSL certs for CMIS usage
+# use --with-nss only on platforms other than Mac OS X and iOS
 $(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 \
-				--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+			$(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+			$(if $(filter IOS,$(OS)),--with-darwinssl) \
 			$(if $(filter MACOSX,$(OS)),\
-				$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--without-nss,\
-					--with-darwinssl \
-					--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \
+				$(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,--with-darwinssl)) \
 			--without-ssl \
 			--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \