diff options
| author | Pierre Joye <pajoye@php.net> | 2011-07-06 11:13:38 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-07-06 11:13:38 +0000 |
| commit | fdd4aa70730b999ccb7f481bce9df3a1c3666839 (patch) | |
| tree | 1ec9b600344ccaeeb69f020413bb45640df06c47 /sapi/apache2handler/config.w32 | |
| parent | 93776977d8a5531eca45823176d0315cb8ca830b (diff) | |
| download | php-git-fdd4aa70730b999ccb7f481bce9df3a1c3666839.tar.gz | |
- add apache 2.3 (upcoming 2.4) handler
Diffstat (limited to 'sapi/apache2handler/config.w32')
| -rw-r--r-- | sapi/apache2handler/config.w32 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 2f2084cb14..8d8a6c4b69 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -5,7 +5,7 @@ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); if (PHP_APACHE2HANDLER != "no") { if (PHP_ZTS == "no") { - WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + WARNING("Apache 2.0 module requires an --enable-zts build of PHP on windows"); } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && @@ -23,7 +23,7 @@ ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no'); if (PHP_APACHE2_2HANDLER != "no") { if (PHP_ZTS == "no") { - WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + WARNING("Apache 2.2 module requires an --enable-zts build of PHP on windows"); } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && @@ -37,3 +37,22 @@ if (PHP_APACHE2_2HANDLER != "no") { WARNING("Could not find apache2.2 libraries/headers"); } } + +ARG_ENABLE('apache2-3handler', 'Build Apache 2.3.x handler', 'no'); +if (PHP_APACHE2_3HANDLER != "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") + ) { + SAPI('apache2_3handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c', + 'php' + PHP_VERSION + 'apache2_3.dll', + '/D PHP_APACHE2_EXPORTS /I win32', + 'sapi\\apache2handler'); + } else { + WARNING("Could not find apache2.3 libraries/headers"); + } +} + |