X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=e0a8af83f8b8efe250e9d75c0566fe450c78ec68;hp=10bb19626e6a5f4bfbb063f1a9b1f937e3593947;hb=e2d31d8ae762ed3acb0ef5ec21edfcc94293dfaf;hpb=a759e1fae5a4d0e989b9735adf8f3224ed9419d7 diff --git a/config.w32 b/config.w32 index 10bb196..e0a8af8 100644 --- a/config.w32 +++ b/config.w32 @@ -54,7 +54,9 @@ if (PHP_HTTP != "no") { "http_request_api.c http_date_api.c http_headers_api.c "+ "http_message_api.c http_send_api.c http_url_api.c "+ "http_info_api.c http_request_method_api.c http_encoding_api.c "+ - "http_filter_api.c http_request_body_api.c", + "http_filter_api.c http_request_body_api.c http_querystring_object.c "+ + "http_deflatestream_object.c http_inflatestream_object.c "+ + "http_cookie_api.c", null, "/I\"" + configure_module_dirname + "/phpstr\""); ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http"); @@ -64,7 +66,7 @@ if (PHP_HTTP != "no") { ADD_FLAG("CFLAGS_HTTP", "/W3"); } - if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) { + if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) { AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library"); ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE"); } else { @@ -80,10 +82,18 @@ if (PHP_HTTP != "no") { ADD_EXTENSION_DEP("http", "hash", true); } } - + + if (PHP_SESSION != "no") { + ADD_EXTENSION_DEP("http", "session", true); + } + + if (PHP_ICONV != "no") { + ADD_EXTENSION_DEP("http", "iconv", true); + } + 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") && + 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) &&