MFB: Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs

diff --git a/sapi/apache2filter/config.w32 b/sapi/apache2filter/config.w32
index 9eeccbb1d947510197aed876ae73c58858b5f144..9b26f9ef3f0577c9da5ff433c2bf866fb482ba67 100755 (executable)
--- a/sapi/apache2filter/config.w32
+++ b/sapi/apache2filter/config.w32
@@ -4,10 +4,10 @@
 ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no');
 
 if (PHP_APACHE2FILTER != "no") {
-       if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\apache2\\include") &&
-                       CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib") &&
-                       CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib") &&
-                       CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib")
+       if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") &&
+                       CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") &&
+                       CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") &&
+                       CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2")
                        ) {
                SAPI('apache2filter', 'sapi_apache2.c apache_config.c php_functions.c',
                                'php' + PHP_VERSION + 'apache2_filter.dll',

diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32
index 84cf73e971f42ba482e96cd2256145963a82e800..486af80d8db712e34ffb05d96abedcbcb018d402 100644 (file)
--- a/sapi/apache2handler/config.w32
+++ b/sapi/apache2handler/config.w32
@@ -4,10 +4,10 @@
 ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
 
 if (PHP_APACHE2HANDLER != "no") {
-       if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\apache2\\include") &&
-                       CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") &&
-                       CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") &&
-                       CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib")
+       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") &&
+                       CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2")
                        ) {
                SAPI('apache2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
                                'php' + PHP_VERSION + 'apache2.dll',