Commit: 019bdff3951f415e2d5c44933da30a4669c628e8 Author: Pierre Joye <pierre....@gmail.com> Tue, 13 Nov 2012 19:34:00 +0100 Committer: Anatoliy Belsky <a...@php.net> Tue, 13 Nov 2012 19:34:00 +0100 Parents: 00ad4c0e6ad6431337037b817074a7853dc0d638 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=019bdff3951f415e2d5c44933da30a4669c628e8 Log: Enabled apache 2.4 handler build option Changed paths: M sapi/apache2handler/config.w32 Diff: diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 2f2084c..d09e165 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"); + } +} + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
