X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=a537fb95f45c00431e4900d67694772abd3e2ee1;hp=142983669f3089ac8f1385b1d4be34f1aa2c5f41;hb=c71fd3a3bcc7231f2efc4c7520888880f42a6b3c;hpb=e9de3fba9942aa70d85fa148fb57caca3222603c

diff --git a/config.w32 b/config.w32
index 1429836..a537fb9 100644
--- a/config.w32
+++ b/config.w32
@@ -2,31 +2,48 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
-ARG_WITH("http-curl-zend-mm", "whether ext/http's curl should use zend mm");
 
 if (PHP_HTTP != "no") {
+
 	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_message_api.c http_send_api.c http_url_api.c "+
+		"http_info_api.c http_request_method_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")
-    if (CHECK_LIB("libcurl.lib", "http", PHP_HTTP) &&
-            CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_HTTP") &&
+	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_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&
+			CHECK_LIB("libcurl.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");
-		if (PHP_HTTP_CURL_ZEND_MM == "yes") {
-			AC_DEFINE("HTTP_CURL_USE_ZEND_MM", 1, "CURL library shall use Zend MM");
-		}
+        AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
+        AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "")
     } else {
         WARNING("curl convenience functions not enabled; libraries and headers not found");
     }
+    
+    MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
+    
+    if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
+			CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
+		AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
+	} else {
+		WARNING("content type guessing not enabled; libraries and headers not found");
+	}
 }