X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=11824384a2d02098dae4a5e8634bde6f00fef6a1;hp=303af9f3833379871af90bdacd2398cd52bc7d1b;hb=61ced187b8a3a3c21578d253e37d1a076aa0aed4;hpb=f4b831c61cac25db5250db4b5421a5cdf3933ef0 diff --git a/config.w32 b/config.w32 index 303af9f..1182438 100644 --- a/config.w32 +++ b/config.w32 @@ -29,20 +29,22 @@ if (PHP_HTTP != "no") { CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib"; if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") && + CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") && CHECK_LIB(CURL_LIB, "http", PHP_HTTP) && - CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) && - CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && - CHECK_LIB("zlib.lib", "http", PHP_HTTP) && - CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { - AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library"); - AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, ""); - AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "") - } else { - WARNING("curl convenience functions not enabled; libraries and headers not found"); - } - - MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib"; - if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") && + CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) && + CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && + CHECK_LIB("zlib.lib", "http", PHP_HTTP) && + CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { + AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library"); + AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL"); + AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, ""); + AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "") + } else { + WARNING("curl convenience functions not enabled; libraries and headers not found"); + } + + MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib"; + if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") && CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) { AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library"); AC_DEFINE("USE_MAGIC_STATIC", "", "");