From: Anatoliy Belsky Date: Sun, 29 Sep 2013 21:30:37 +0000 (+0000) Subject: fixed config.w32 X-Git-Tag: RELEASE_2_1_0_RC3~10^2^2~20 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=76f74c9bfd2e97c89e7184d85ea7a0c5322a5219;p=m6w6%2Fext-http fixed config.w32 --- diff --git a/config.w32 b/config.w32 index 48b7b3a..e951f3b 100644 --- a/config.w32 +++ b/config.w32 @@ -46,14 +46,14 @@ function check_for_pecl_ext(ext, header) if (PHP_HTTP != "no") { EXTENSION("http", - "php_http.c php_http_buffer.c php_http_client.c php_http_client_datashare.c php_http_client_factory.c " + - "php_http_client_interface.c php_http_client_pool.c php_http_client_request.c php_http_client_response.c " + - "php_http_cookie.c php_http_curl.c php_http_curl_client.c php_http_curl_client_datashare.c " + - "php_http_curl_client_pool.c php_http_encoding.c php_http_env.c php_http_env_request.c " + + "php_http.c php_http_buffer.c php_http_client.c " + + "php_http_client_request.c php_http_client_response.c " + + "php_http_cookie.c php_http_curl.c php_http_client_curl.c " + + "php_http_encoding.c php_http_env.c php_http_env_request.c " + "php_http_env_response.c php_http_etag.c php_http_exception.c php_http_filter.c php_http_header_parser.c " + "php_http_headers.c php_http_info.c php_http_message.c php_http_message_body.c php_http_message_parser.c " + "php_http_misc.c php_http_negotiate.c php_http_object.c php_http_options.c php_http_params.c " + - "php_http_persistent_handle.c php_http_property_proxy.c php_http_querystring.c php_http_resource_factory.c " + + "php_http_querystring.c " + "php_http_strlist.c php_http_url.c php_http_version.c", null, null); @@ -95,6 +95,7 @@ if (PHP_HTTP != "no") { if (PHP_CURL != "no") { ADD_EXTENSION_DEP("http", "curl", true); } + CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib"); if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") && @@ -104,6 +105,8 @@ if (PHP_HTTP != "no") { CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) && CHECK_LIB("libcurl_a.lib", "http", PHP_HTTP) && + ADD_EXTENSION_DEP("http", "propro", true) && + ADD_EXTENSION_DEP("http", "raphf", true) && CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { AC_DEFINE("PHP_HTTP_HAVE_CURL", 1, "Have CURL library"); AC_DEFINE("PHP_HTTP_HAVE_SSL", 1, "Have SSL");