Kaydet (Commit) ea992517 authored tarafından Caolán McNamara's avatar Caolán McNamara

with missing nss build curl and vcl appropiately

Change-Id: Iaef197e9ab736c219897933a76f4c75a3e3acaa6
üst 6cb661fb
......@@ -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 \
......
......@@ -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, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment