- drop mhash support

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 8822ef4fac041c9ce6126f7ce871fadfdb49f8db..a53455ee5ca019956006f8aa3f3655db6c64eaf8 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -12,7 +12,8 @@ if (PHP_HTTP != "no") {
                "http_api.c http_cache_api.c http_request_pool_api.c "+
                "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_info_api.c http_request_method_api.c http_encoding_api.c "+
+               "http_filter_api.c",
                null,
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
@@ -21,14 +22,26 @@ if (PHP_HTTP != "no") {
        if (PHP_DEBUG != "no") {
                ADD_FLAG("CFLAGS_HTTP", "/W3");
        }
-
-       MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
-       if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
-                       (CHECK_LIB(MHASH_LIB, 'http', PHP_HTTP) ||
-                               CHECK_LIB('libmhash.lib', 'http', PHP_HTTP))) {
-               AC_DEFINE('HTTP_HAVE_MHASH', 1 , "Have mhash library");
+       
+       if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP')) {
+               AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library");
+               ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE");
        } else {
-               WARNING("mhash etag generator not enabled; libraries and headers not found");
+               WARNING("zlib encoding functions not enabled; libraries and headers not found");
+       }
+       
+       if (PHP_HASH != "no") {
+               var f;
+               STDOUT.Write("Checking for ext/hash ...  ");
+               if (glob((f = configure_module_dirname +"\\..\\hash") +"\\php_hash.h").length ||
+                       glob((f = configure_module_dirname +"\\..\\..\\..\\pecl\\hash") +"\\php_hash.h").length) {
+                       ADD_FLAG("CFLAGS_HTTP", "/I"+ f);
+                       AC_DEFINE("HTTP_HAVE_EXT_HASH", 1, "");
+                       ADD_EXTENSION_DEP("http", "hash", true);
+                       STDOUT.WriteLine(condense_path(f));
+               } else {
+                       STDOUT.WriteLine("<not found>");
+               }
        }
 
        CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";