summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2012-11-13 19:34:00 +0100
committerAnatoliy Belsky <ab@php.net>2012-11-13 19:34:00 +0100
commit019bdff3951f415e2d5c44933da30a4669c628e8 (patch)
treefea364819de2f351ad4755f57cb81aa562d44949
parent00ad4c0e6ad6431337037b817074a7853dc0d638 (diff)
downloadphp-git-019bdff3951f415e2d5c44933da30a4669c628e8.tar.gz
Enabled apache 2.4 handler build option
-rw-r--r--sapi/apache2handler/config.w3219
1 files changed, 19 insertions, 0 deletions
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 2f2084cb14..d09e1653f3 100644
--- a/sapi/apache2handler/config.w32
+++ b/sapi/apache2handler/config.w32
@@ -37,3 +37,22 @@ if (PHP_APACHE2_2HANDLER != "no") {
WARNING("Could not find apache2.2 libraries/headers");
}
}
+
+ARG_ENABLE('apache2-4handler', 'Build Apache 2.4.x handler', 'no');
+if (PHP_APACHE2_4HANDLER != "no") {
+ if (PHP_ZTS == "no") {
+ WARNING("Apache 2.4 module requires an --enable-zts build of PHP on windows");
+ } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_4HANDLER", PHP_PHP_BUILD + "\\include\\apache2_4") &&
+ CHECK_LIB("libhttpd.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") &&
+ CHECK_LIB("libapr-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") &&
+ CHECK_LIB("libaprutil-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4")
+ ) {
+ SAPI('apache2_4handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_4.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2handler');
+ } else {
+ WARNING("Could not find apache 2.4 libraries/headers");
+ }
+}
+