X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=c82eca464f9848b4825a7273e072141e41c1b186;hp=e18d586466cd7538e851bd76d0c1130ab9c5f59c;hb=5773d11d8c9c28fb8b0e3389258f548fc4717892;hpb=7fef44c902c86eebce30f36003a27905fbaeba65

diff --git a/config.w32 b/config.w32
index e18d586..c82eca4 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 http_querystring_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,22 +82,28 @@ 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) &&
 			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_CURL_ZLIB", 1, "");
 		AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL");
 		AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-		AC_DEFINE("CURL_STATICLIB", 1, "");
 	} else {
 		WARNING("curl convenience functions not enabled; libraries and headers not found");
 	}