com php-src: prefer OpenSSL 1.1 with 7.2 as that's what is default: win32/build/confutils.js
[email protected] (Anatol Belski)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: dca2a855c84b89b4f1fce5586662ff465598ab45 Author: Anatol Belski <[email protected]> Mon, 24 Apr 2017 18:39:04 +0200 Parents: e9dd511ec60127be41573eac8db7d6459b1df0ec Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dca2a855c84b89b4f1fce5586662ff465598ab45 Log: prefer OpenSSL 1.1 with 7.2 as that's what is default Changed paths: M win32/build/confutils.js Diff: diff --git a/win32/build/confutils.js b/win32/build/confutils.js index d0c71fb..7b3cbb5 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3356,18 +3356,18 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part var ret = 0; var cflags_var = "CFLAGS_" + target.toUpperCase(); - if (CHECK_LIB("ssleay32.lib", target, path_to_check, common_name) && - CHECK_LIB("libeay32.lib", target, path_to_check, common_name) && - CHECK_LIB("crypt32.lib", target, path_to_check, common_name) && - CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) { - /* Openssl 1.0.x and lower */ - return 1; - } else if (CHECK_LIB("libcrypto.lib", target, path_to_check) && + if (CHECK_LIB("libcrypto.lib", target, path_to_check) && CHECK_LIB("libssl.lib", target, path_to_check) && CHECK_LIB("crypt32.lib", target, path_to_check, common_name) && CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) { /* Openssl 1.1.x */ return 2; + } else if (CHECK_LIB("ssleay32.lib", target, path_to_check, common_name) && + CHECK_LIB("libeay32.lib", target, path_to_check, common_name) && + CHECK_LIB("crypt32.lib", target, path_to_check, common_name) && + CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) { + /* Openssl 1.0.x and lower */ + return 1; } return ret;