diff options
| author | Anatol Belski <ab@php.net> | 2017-01-08 00:39:53 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-01-08 00:39:53 +0100 |
| commit | 97ac819c2b73ae57a971b6d0f719cd8b349ec098 (patch) | |
| tree | 2332fcc7c9f47d450b7252373dfee8940e529170 /ext/curl | |
| parent | 72038b6c381aa17c525fcb551b7c53f6a9d7b55e (diff) | |
| parent | 43b92ed5a8d87d964acb4704ca683f241e645922 (diff) | |
| download | php-git-97ac819c2b73ae57a971b6d0f719cd8b349ec098.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
move various places to the centralized OpenSSL setup routine
use the new API for opaque symbol in OpenSSL 1.1.x
implement basic config support for OpenSSL 1.1.x
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/config.w32 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32 index 8ea5f6524c..d900d48c41 100644 --- a/ext/curl/config.w32 +++ b/ext/curl/config.w32 @@ -5,12 +5,11 @@ ARG_WITH("curl", "cURL support", "no"); if (PHP_CURL != "no") { if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) && - CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") && - CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) && - CHECK_LIB("libeay32.lib", "curl", PHP_CURL) - && CHECK_LIB("winmm.lib", "curl", PHP_CURL) - && CHECK_LIB("wldap32.lib", "curl", PHP_CURL) - && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || + CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") && + SETUP_OPENSSL("curl", PHP_CURL) > 0 && + CHECK_LIB("winmm.lib", "curl", PHP_CURL) && + CHECK_LIB("wldap32.lib", "curl", PHP_CURL) && + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) ) { EXTENSION("curl", "interface.c multi.c share.c curl_file.c"); |