Merge branch 'v2.6.x'

[m6w6/ext-http] / config.w32

diff --git a/config.w32 b/config.w32
index fb5c7f71f2df1b77c6ece03f014e62804da966a9..7b6366499d94b49b833061a719d7fe9a70f55c25 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -45,20 +45,15 @@ function check_for_pecl_ext(ext, header)
 
 if (PHP_HTTP != "no") {
 
-       var PHP_HTTP_HEADERS=glob(configure_module_dirname + "/src/*.h");
-       for (var i=0; i<PHP_HTTP_HEADERS.length; ++i) {
-               var basename = FSO.GetFileName(PHP_HTTP_HEADERS[i]);
-               copy_and_subst("src/" + basename, basename, []);
-       }
        var PHP_HTTP_SRC_ARRAY = glob(configure_module_dirname + "/src/*.c");
        var PHP_HTTP_SOURCES="";
        for (var i=0; i<PHP_HTTP_SRC_ARRAY.length; ++i) {
                var basename = FSO.GetFileName(PHP_HTTP_SRC_ARRAY[i]);
-               copy_and_subst("src/" + basename, basename, []);
                PHP_HTTP_SOURCES = PHP_HTTP_SOURCES + " " + basename;
        }
-       EXTENSION("http", PHP_HTTP_SOURCES);
-
+       //EXTENSION("http");
+       ADD_SOURCES(configure_module_dirname + "/src", PHP_HTTP_SOURCES, "http");
+       EXTENSION("http", "src/php_http.c");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
        AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions");
 
@@ -119,6 +114,8 @@ if (PHP_HTTP != "no") {
                AC_DEFINE("PHP_HAVE_CURL_MULTI_SETOPT", 1, "");
                AC_DEFINE("PHP_HAVE_CURL_MULTI_TIMEOUT", 1, "");
                AC_DEFINE("PHP_HTTP_HAVE_CLIENT", 1, "Have HTTP client support");
+               ADD_FLAG("CFLAGS_HTTP", "/I" + configure_module_dirname + " ");
+
                if (CHECK_HEADER_ADD_INCLUDE("event2/event.h", "CFLAGS_HTTP") &&
                        CHECK_LIB("libevent.lib", "http", PHP_HTTP) &&
                        CHECK_LIB("libevent_core.lib", "http", PHP_HTTP) &&