branch off v1 as R_1_7

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index 2519240e104e8d29a4864fb0113cf05ec983e282..680d7fa24eb745306c41ced159e5cfdb68df95c0 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -56,7 +56,7 @@ if (PHP_HTTP != "no") {
                "http_filter_api.c http_request_body_api.c http_querystring_object.c "+
                "http_deflatestream_object.c http_inflatestream_object.c "+
                "http_cookie_api.c http_querystring_api.c http_request_datashare_api.c "+
-               "http_requestdatashare_object.c http_request_info.c",
+               "http_requestdatashare_object.c http_request_info.c http_persistent_handle_api.c",
                null,
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
@@ -95,13 +95,13 @@ if (PHP_HTTP != "no") {
                ADD_EXTENSION_DEP("http", "iconv", true);
        }
        
-       CURL_LIB = PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib";
+       CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib");
        if (CHECK_HEADER_ADD_INCLUDE("curl/curl.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("zlib.lib;zlib_a.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");
@@ -116,13 +116,14 @@ if (PHP_HTTP != "no") {
        } 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");
-       }
+/*
+//     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");
+//     }
+*/
 }