summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2013-12-24 12:36:59 -0500
committerCaolán McNamara <caolanm@redhat.com>2014-01-17 11:55:32 +0000
commit2fd70b6bf799843d2d9987cc90a5b373f31039f7 (patch)
treef2ab0503f1adf1d908821d74788525d0e21fcc7e /external
parent40a8b1f92c8befa39fc42e845994a00a70edab9f (diff)
Get bundled curl to be used on OS X too
Don't force "yes" on Darwin. Change-Id: I3a6a2ecdf15325d07fb22b9a6bb0da7b313036cb Reviewed-on: https://gerrit.libreoffice.org/7197 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalPackage_curl.mk2
-rw-r--r--external/curl/ExternalProject_curl.mk5
2 files changed, 4 insertions, 3 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 6e3c7fd83c8a..62669122a800 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -17,6 +17,8 @@ ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
else ifeq ($(OS),AIX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
else
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 81d46f63901e..208a556173f7 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -40,10 +40,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
- $(if $(filter MACOSX IOS,$(OS)),\
- --with-darwinssl, \
+ $(if $(filter IOS,$(OS)),--with-darwinssl,--without-ssl) \
+ $(if $(filter MACOSX,$(OS)),,\
--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)) \