diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-11-13 19:40:22 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-11-13 19:40:22 +0100 |
| commit | 117d2dd6882b906ecc92fffe0b627535a48cd0c6 (patch) | |
| tree | 1aecac34f2a59c6da05d25a13fb065d3692eae57 | |
| parent | 4f36aeb1209d1521bcba912bdeb0d67a69df3af8 (diff) | |
| parent | 019bdff3951f415e2d5c44933da30a4669c628e8 (diff) | |
| download | php-git-117d2dd6882b906ecc92fffe0b627535a48cd0c6.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Enabled apache 2.4 handler build option
Conflicts:
sapi/apache2handler/config.w32
| -rw-r--r-- | sapi/apache2handler/config.w32 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 8d8a6c4b69..a7547514d8 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -38,21 +38,21 @@ if (PHP_APACHE2_2HANDLER != "no") { } } -ARG_ENABLE('apache2-3handler', 'Build Apache 2.3.x handler', 'no'); -if (PHP_APACHE2_3HANDLER != "no") { +ARG_ENABLE('apache2-4handler', 'Build Apache 2.4.x handler', 'no'); +if (PHP_APACHE2_4HANDLER != "no") { if (PHP_ZTS == "no") { - WARNING("Apache 2.3 module requires an --enable-zts build of PHP on windows"); - } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_3HANDLER", PHP_PHP_BUILD + "\\include\\apache2_3") && - CHECK_LIB("libhttpd.lib", "apache2_3handler", PHP_PHP_BUILD + "\\lib\\apache2_3") && - CHECK_LIB("libapr-1.lib", "apache2_3handler", PHP_PHP_BUILD + "\\lib\\apache2_3") && - CHECK_LIB("libaprutil-1.lib", "apache2_3handler", PHP_PHP_BUILD + "\\lib\\apache2_3") + 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_3handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c', - 'php' + PHP_VERSION + 'apache2_3.dll', + 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 apache2.3 libraries/headers"); + WARNING("Could not find apache 2.4 libraries/headers"); } } |