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

[Caolán McNamara]

 external/curl/ExternalProject_curl.mk |    4 ++--
 vcl/Library_vcl.mk                    |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ea992517bf8b1d48c2e02717f5bc9efc3ebb1c2e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 09:30:03 2016 +0000

    with missing nss build curl and vcl appropiately
    
    Change-Id: Iaef197e9ab736c219897933a76f4c75a3e3acaa6

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 76b4a45..1f70972 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
-	nss3 \
+	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,nss3) \
 	zlib \
 ))
 
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 		./configure \
 			$(if $(filter IOS MACOSX,$(OS)),\
 				--with-darwinssl,\
-				--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+				$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--without-nss,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \
 			--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 \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7a76868..050ee31 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -60,11 +60,16 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	$(if $(filter LINUX MACOSX %BSD SOLARIS,$(OS)), \
 		curl) \
 	jpeg \
+	libeot \
+))
+
+ifeq ($(TLS),NSS)
+$(eval $(call gb_Library_use_externals,vcl,\
 	$(if $(filter-out IOS WNT,$(OS)), \
 		nss3 \
 		plc4) \
-	libeot \
 ))
+endif
 
 $(eval $(call gb_Library_use_libraries,vcl,\
     $(call gb_Helper_optional,BREAKPAD, \