Skip to content

Commit c83c36e

Browse files
authored
Merge pull request #6 from cmb69/config.w32
Fix configure for recent cURL versions
2 parents bd2f814 + 0ed7d0c commit c83c36e

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

config.w32

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ ARG_WITH("oauth", "oAuth support", "no");
55
if (PHP_OAUTH != "no") {
66
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "oauth", PHP_OAUTH) &&
77
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_OAUTH") &&
8-
CHECK_LIB("ssleay32.lib", "oauth", PHP_OAUTH) &&
9-
CHECK_LIB("libeay32.lib", "oauth", PHP_OAUTH)
8+
(CHECK_LIB("libcrypto.lib", "oauth", PHP_OAUTH) &&
9+
CHECK_LIB("libssl.lib", "oauth", PHP_OAUTH) ||
10+
CHECK_LIB("ssleay32.lib", "oauth", PHP_OAUTH) &&
11+
CHECK_LIB("libeay32.lib", "oauth", PHP_OAUTH)) &&
12+
CHECK_LIB("libssh2.lib", "oauth", PHP_OAUTH) &&
13+
CHECK_LIB("nghttp2.lib", "oauth", PHP_OAUTH)
1014
&& CHECK_LIB("winmm.lib", "oauth", PHP_OAUTH)
1115
&& CHECK_LIB("wldap32.lib", "oauth", PHP_OAUTH)
16+
&& CHECK_LIB("Normaliz.lib", "oauth", PHP_OAUTH)
1217
&& (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "oauth", PHP_OAUTH) || CHECK_LIB("zlib.lib", "oauth", PHP_OAUTH))) ||
1318
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "oauth", PHP_OAUTH)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
1419
) {

0 commit comments

Comments
 (0)