- add HttpResponse::guessContentType() through libmagic

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 1a73d7450f32c1ed6a0cf25e619389ff1310cb23..f6cf48977166f059ce230a7266604830472120cb 100644 (file)
--- 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,23 @@ 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");
     }
+    
+    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");
+       }
 }