Enabled apache 2.4 handler build option

diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 2f2084cb1425d85c81086a24a116b6ef4f4c6b64..d09e1653f32b4c0587eb8d18e5f7dc1275119843 100644 (file)
--- 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");
+       }
+}
+