edink Sun May 7 00:09:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2handler config.w32
Log:
Enable parallel build against Apache 2.2 libs and headers
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.1
php-src/sapi/apache2handler/config.w32:1.1.6.1
--- php-src/sapi/apache2handler/config.w32:1.1 Fri Dec 19 18:28:56 2003
+++ php-src/sapi/apache2handler/config.w32 Sun May 7 00:09:20 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/19 18:28:56 wez Exp $
+// $Id: config.w32,v 1.1.6.1 2006/05/07 00:09:20 edink Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
@@ -16,3 +16,20 @@
WARNING("Could not find apache2 libraries/headers");
}
}
+
+ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no');
+
+if (PHP_APACHE2_2HANDLER != "no") {
+ 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") &&
+ CHECK_LIB("libaprutil-1.lib", "apache2_2handler",
PHP_PHP_BUILD + "\\lib\\apache2_2")
+ ) {
+ SAPI('apache2_2handler', 'mod_php5.c sapi_apache2.c
apache_config.c php_functions.c',
+ 'php' + PHP_VERSION + 'apache2_2.dll',
+ '/D PHP_APACHE2_EXPORTS /I win32',
+ 'sapi\\apache2_2handler');
+ } else {
+ WARNING("Could not find apache2.2 libraries/headers");
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
