- improve config.m4

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 39a642766701fba1cff8ae5cf6a4f78ef57fb393..1a73d7450f32c1ed6a0cf25e619389ff1310cb23 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -2,31 +2,29 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
-ARG_WITH("mhash", "mhash support", "no");
 
 if (PHP_HTTP != "no") {
 
-       if (PHP_MHASH != "no") {
-               if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
-                               CHECK_LIB('libmhash.lib', 'mhash')) {
-                       AC_DEFINE('HAVE_LIBMHASH', 1 , "Have mhash library");
-               } else {
-                       WARNING("mhash not enabled; libraries and headers not found");
-               }
-       }
-
        EXTENSION("http",
                "missing.c http.c http_functions.c http_exception_object.c "+
                "http_util_object.c http_message_object.c http_requestpool_object.c "+
                "http_request_object.c http_response_object.c "+
-               "http_api.c http_auth_api.c http_cache_api.c http_request_pool_api.c "+
+               "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",
                null,
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
-       AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support")
+       AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
+
+       if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_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 (CHECK_LIB("libcurl.lib", "http", PHP_HTTP) &&
             CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_HTTP") &&
             CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&