configure.ac | 9 +--------
external/curl/ExternalPackage_curl.mk | 2 ++
external/curl/ExternalProject_curl.mk | 5 ++---
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 2fd70b6bf799843d2d9987cc90a5b373f31039f7
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Tue Dec 24 12:36:59 2013 -0500
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 24d7ce7..9e5f7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8654,14 +8654,7 @@ dnl Check for system curl
dnl ===================================================================
AC_MSG_CHECKING([which libcurl to use])
if test "$with_system_curl" = "auto"; then
- case "$_os" in
- Darwin)
- with_system_curl=yes
- ;;
- *)
- with_system_curl="$with_system_libs"
- ;;
- esac
+ with_system_curl="$with_system_libs"
fi
if test "$with_system_curl" = "yes"; then
diff --git a/external/curl/ExternalPackage_curl.mk
b/external/curl/ExternalPackage_curl.mk
index 6e3c7fd..6266912 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 81d46f6..208a556 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)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
