X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.w32;h=f6cf48977166f059ce230a7266604830472120cb;hp=79817229b68541307b3df838eb8cd370bda38dca;hb=a673ef718611fe1a7c8a4c61b2f4c97fc06efc2d;hpb=a52c5612eddc62880c3ff4b8b43f991f8d1e2523

diff --git a/config.w32 b/config.w32
index 7981722..f6cf489 100644
--- a/config.w32
+++ b/config.w32
@@ -5,13 +5,6 @@ ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
 
 if (PHP_HTTP != "no") {
 
-	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");
-	}
-
 	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 "+
@@ -19,19 +12,36 @@ 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_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") &&
+
+	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");
+        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");
     }
+    
+    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");
+	}
 }