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

diff --git a/config.w32 b/config.w32
index 1a73d74..a537fb9 100644
--- a/config.w32
+++ b/config.w32
@@ -12,7 +12,7 @@ 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");
@@ -25,14 +25,25 @@ if (PHP_HTTP != "no") {
 		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") &&
+    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");
     }
+    
+    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");
+	}
 }