fixed config.w32 for build with curl enabled

diff --git a/config.w32 b/config.w32
index 8e2c1ac2321e32c0fbc47681f4a10dcc3cae50d4..48b7b3a39c69b1bda545920bc31834dcfd833edb 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -46,17 +46,17 @@ function check_for_pecl_ext(ext, header)
 if (PHP_HTTP != "no") {\r
 \r
        EXTENSION("http",\r
-               "php_http_buffer.c php_http.c php_http_client.c php_http_curl_client.c php_http_client_datashare.c " +\r
-               "php_http_curl_client_datashare.c php_http_client_factory.c php_http_client_interface.c " +\r
-               "php_http_client_pool.c php_http_curl_client_pool.c php_http_client_request.c " +\r
-               "php_http_client_response.c php_http_cookie.c php_http_curl.c php_http_encoding.c " +\r
-               "php_http_env.c php_http_env_request.c php_http_env_response.c php_http_etag.c " +\r
-               "php_http_exception.c php_http_filter.c php_http_header_parser.c php_http_headers.c " +\r
-               "php_http_info.c php_http_message_body.c php_http_message.c php_http_message_parser.c " +\r
-               "php_http_misc.c php_http_negotiate.c php_http_object.c php_http_params.c " +\r
-               "php_http_persistent_handle.c php_http_property_proxy.c php_http_querystring.c " +\r
-               "php_http_resource_factory.c php_http_strlist.c php_http_url.c php_http_version.c");\r
-\r
+               "php_http.c php_http_buffer.c php_http_client.c php_http_client_datashare.c php_http_client_factory.c " +\r
+               "php_http_client_interface.c php_http_client_pool.c php_http_client_request.c php_http_client_response.c " +\r
+               "php_http_cookie.c php_http_curl.c php_http_curl_client.c php_http_curl_client_datashare.c " +\r
+               "php_http_curl_client_pool.c php_http_encoding.c php_http_env.c php_http_env_request.c " +\r
+               "php_http_env_response.c php_http_etag.c php_http_exception.c php_http_filter.c php_http_header_parser.c " +\r
+               "php_http_headers.c php_http_info.c php_http_message.c php_http_message_body.c php_http_message_parser.c " +\r
+               "php_http_misc.c php_http_negotiate.c php_http_object.c php_http_options.c php_http_params.c " +\r
+               "php_http_persistent_handle.c php_http_property_proxy.c php_http_querystring.c php_http_resource_factory.c " +\r
+               "php_http_strlist.c php_http_url.c php_http_version.c",\r
+               null,\r
+               null);\r
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");\r
        AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions");\r
        \r
@@ -92,6 +92,10 @@ if (PHP_HTTP != "no") {
                ADD_EXTENSION_DEP("http", "iconv", true);\r
        }\r
        \r
+       if (PHP_CURL != "no") {\r
+               ADD_EXTENSION_DEP("http", "curl", true);\r
+       }\r
+       \r
        CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib");\r
        if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") &&\r
                        CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") &&\r
@@ -99,6 +103,7 @@ if (PHP_HTTP != "no") {
                        CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&\r
                        CHECK_LIB("libeay32.lib", "http", PHP_HTTP) &&\r
                        CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) &&\r
+                       CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) &&\r
                        CHECK_LIB("winmm.lib", "http", PHP_HTTP)) {\r
                AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library");\r
                AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");\r