- finish work on encoding api

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index cc7a938d3d6b38559f4d8ffa069347cd877d1fed..af583c2c91e7ff9d91cf1a5dfac7aec635bbd527 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -54,7 +54,8 @@ 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_deflatestream_object.c http_inflatestream_object.c",
                null,
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
@@ -64,7 +65,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,6 +81,10 @@ if (PHP_HTTP != "no") {
                        ADD_EXTENSION_DEP("http", "hash", true);
                }
        }
+       
+       if (PHP_SESSION != "no") {
+               ADD_EXTENSION_DEP("http", "session", true);
+       }
 
        CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
     if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
@@ -90,7 +95,6 @@ if (PHP_HTTP != "no") {
                        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, "");