- fixed a gotcha in http_chunked_decode (-size_t is always > 0)

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index a537fb95f45c00431e4900d67694772abd3e2ee1..23a2dd1ec3e78600fde5ac81d9533f2a770a5467 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -18,31 +18,38 @@ if (PHP_HTTP != "no") {
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
 
+       MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
        if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
-                       CHECK_LIB('libmhash.lib', 'http', PHP_HTTP)) {
+                       (CHECK_LIB(MHASH_LIB, 'http', PHP_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");
        }
 
+       CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
     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_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") &&
+                       CHECK_LIB(CURL_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("HTTP_HAVE_SSL", 1, "Have SSL");
+               AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, "");
+               AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
+               AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
+               AC_DEFINE("CURL_STATICLIB", 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");
+               AC_DEFINE("USE_MAGIC_STATIC", "", "");
        } else {
                WARNING("content type guessing not enabled; libraries and headers not found");
        }