From: Anatol Belski <ab@php.net>
Date: Sat, 7 Jan 2017 23:17:31 +0000 (+0100)
Subject: move various places to the centralized OpenSSL setup routine
X-Git-Tag: php-7.1.2RC1~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b92ed5a8d87d964acb4704ca683f241e645922;p=php

move various places to the centralized OpenSSL setup routine
---

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");
diff --git a/ext/ftp/config.w32 b/ext/ftp/config.w32
index b09d688180..767c320efd 100644
--- a/ext/ftp/config.w32
+++ b/ext/ftp/config.w32
@@ -7,9 +7,9 @@ if (PHP_FTP != "no") {
 
 	EXTENSION("ftp", "php_ftp.c ftp.c");
 
-	if (CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_FTP") &&
-		CHECK_LIB("ssleay32.lib", "ftp", PHP_FTP) &&
-		CHECK_LIB("libeay32.lib", "ftp", PHP_FTP)) {
+	var ret = SETUP_OPENSSL("ftp", PHP_FTP);
+
+	if (ret > 0) {
 		MESSAGE("Enabling SSL support for ext\\ftp");
 		AC_DEFINE('HAVE_FTP_SSL', 1, 'Have FTP over SSL support');
 	}
diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32
index 9102c6c952..11aa5cb452 100644
--- a/ext/ldap/config.w32
+++ b/ext/ldap/config.w32
@@ -6,10 +6,8 @@ ARG_WITH("ldap", "LDAP support", "no");
 if (PHP_LDAP != "no") {
 
 	if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
-			CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP)
-			&&
-			CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) &&
-			CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) &&
+			CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
+			SETUP_OPENSSL("ldap", PHP_LDAP) > 0 &&
 			CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) &&
 			CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)&&
 			CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) {
diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32
index 24622434c9..0848d5701e 100644
--- a/ext/snmp/config.w32
+++ b/ext/snmp/config.w32
@@ -4,10 +4,10 @@
 ARG_WITH("snmp", "SNMP support", "no");
 
 if (PHP_SNMP != "no") {
-	if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP)) {
+	if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
+		SETUP_OPENSSL("snmp", PHP_SNMP) > 0) {
 		if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
 			EXTENSION('snmp', 'snmp.c');
-			CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
 			AC_DEFINE('HAVE_SNMP', 1);
 			AC_DEFINE("HAVE_NET_SNMP", 1);
 		} else {