]> granicus.if.org Git - php/commitdiff
move various places to the centralized OpenSSL setup routine
authorAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 23:17:31 +0000 (00:17 +0100)
committerAnatol Belski <ab@php.net>
Sat, 7 Jan 2017 23:25:47 +0000 (00:25 +0100)
ext/curl/config.w32
ext/ftp/config.w32
ext/ldap/config.w32
ext/snmp/config.w32

index 8ea5f6524cd87d678e5dcc371b586f2efcbec410..d900d48c410e62080282f7497fb4b15314d465b8 100644 (file)
@@ -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");
index b09d688180f7bce9a1afb79f5e5c2a948cecc1e2..767c320efd30a537d5fac25aeb9d1f125f19ff6a 100644 (file)
@@ -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');
        }
index 9102c6c952b7f0ac9d5ee3be0d6ac830c3025cf8..11aa5cb4524985a7091d1cd2f86c827663f4e9b6 100644 (file)
@@ -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)) {
index 24622434c95eb298b4e0a451483e005bcdfbed3a..0848d5701ec128793ad64fea1032a49d7d127461 100644 (file)
@@ -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 {