X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.w32;h=a53455ee5ca019956006f8aa3f3655db6c64eaf8;hb=cc9f67a6e5d50fc0c870a19d98e35e05f03d9b68;hp=1cc13f5ec622804a9b51215adfa4d7b49fa8577f;hpb=5f7061a515a21abec1cf742f25a68967516e21cb;p=m6w6%2Fext-http diff --git a/config.w32 b/config.w32 index 1cc13f5..a53455e 100644 --- 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_encoding_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"); @@ -28,14 +29,19 @@ if (PHP_HTTP != "no") { } else { WARNING("zlib encoding functions not enabled; libraries and headers not found"); } - - 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"); - } else { - WARNING("mhash etag generator 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(""); + } } CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";