Skip to content

Commit 43b92ed

Browse files
committed
move various places to the centralized OpenSSL setup routine
1 parent bf14ecc commit 43b92ed

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

ext/curl/config.w32

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ ARG_WITH("curl", "cURL support", "no");
55

66
if (PHP_CURL != "no") {
77
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) &&
8-
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
9-
CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) &&
10-
CHECK_LIB("libeay32.lib", "curl", PHP_CURL)
11-
&& CHECK_LIB("winmm.lib", "curl", PHP_CURL)
12-
&& CHECK_LIB("wldap32.lib", "curl", PHP_CURL)
13-
&& (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
8+
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
9+
SETUP_OPENSSL("curl", PHP_CURL) > 0 &&
10+
CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
11+
CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
12+
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
1413
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
1514
) {
1615
EXTENSION("curl", "interface.c multi.c share.c curl_file.c");

ext/ftp/config.w32

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ if (PHP_FTP != "no") {
77

88
EXTENSION("ftp", "php_ftp.c ftp.c");
99

10-
if (CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_FTP") &&
11-
CHECK_LIB("ssleay32.lib", "ftp", PHP_FTP) &&
12-
CHECK_LIB("libeay32.lib", "ftp", PHP_FTP)) {
10+
var ret = SETUP_OPENSSL("ftp", PHP_FTP);
11+
12+
if (ret > 0) {
1313
MESSAGE("Enabling SSL support for ext\\ftp");
1414
AC_DEFINE('HAVE_FTP_SSL', 1, 'Have FTP over SSL support');
1515
}

ext/ldap/config.w32

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ ARG_WITH("ldap", "LDAP support", "no");
66
if (PHP_LDAP != "no") {
77

88
if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
9-
CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP)
10-
&&
11-
CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) &&
12-
CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) &&
9+
CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
10+
SETUP_OPENSSL("ldap", PHP_LDAP) > 0 &&
1311
CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) &&
1412
CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)&&
1513
CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) {

ext/snmp/config.w32

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
ARG_WITH("snmp", "SNMP support", "no");
55

66
if (PHP_SNMP != "no") {
7-
if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP)) {
7+
if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
8+
SETUP_OPENSSL("snmp", PHP_SNMP) > 0) {
89
if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
910
EXTENSION('snmp', 'snmp.c');
10-
CHECK_LIB("libeay32.lib", "snmp", PHP_SNMP)
1111
AC_DEFINE('HAVE_SNMP', 1);
1212
AC_DEFINE("HAVE_NET_SNMP", 1);
1313
} else {

0 commit comments

Comments
 (0)