[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/curl

[Michael Stahl]

 external/curl/ExternalProject_curl.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f4207428ea76157219a20a2d27ae5f52c713f199
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 2 15:30:28 2015 +0200

    curl: disable rtmp support
    
    configure will add a dependency on librtmp.so.0 if the development
    package happens to be installed.
    
    (cherry picked from commit f4844a9abebcb0451161625c42a1e2b48796102d)
    
    curl: sigh... *actually* disable rtmp support
    
    (cherry picked from commit 805f12dd51ea72deda8f5be5839a205640ba968d)
    
    curl: disable loads more random stuff we don't need
    
    (cherry picked from commit 0b8b96ed515eec0a560812be73d4c9742f26e23b)
    Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5
    (cherry picked from commit df2e19ffa8840bc2fef5d56de5d6058f2b3c5ffb)
    Reviewed-on: https://gerrit.libreoffice.org/16036
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 1a0a0a3..9a4a045 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,9 +46,12 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			$(if $(filter IOS,$(OS)),--with-darwinssl) \
 			$(if $(filter MACOSX,$(OS)),\
 				--with-darwinssl) \
-			--without-ssl \
+			--without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls \
 			--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
+			--without-librtmp --disable-ldaps --disable-tftp --disable-pop3 \
+			--disable-imap --disable-smtp --disable-manual --without-metalink \
+			--without-nghttp2 \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 			$(if $(ENABLE_DEBUG),--enable-debug) \