edink Fri May 4 18:17:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache2filter config.w32
/php-src/sapi/apache2handler config.w32
Log:
Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.w32?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/sapi/apache2filter/config.w32
diff -u php-src/sapi/apache2filter/config.w32:1.1
php-src/sapi/apache2filter/config.w32:1.1.2.1
--- php-src/sapi/apache2filter/config.w32:1.1 Wed Jul 5 10:12:42 2006
+++ php-src/sapi/apache2filter/config.w32 Fri May 4 18:17:55 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2006/07/05 10:12:42 edink Exp $
+// $Id: config.w32,v 1.1.2.1 2007/05/04 18:17:55 edink Exp $
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',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.1.6.1&r2=1.1.6.2&diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.1.6.1
php-src/sapi/apache2handler/config.w32:1.1.6.2
--- php-src/sapi/apache2handler/config.w32:1.1.6.1 Sun May 7 00:09:20 2006
+++ php-src/sapi/apache2handler/config.w32 Fri May 4 18:17:55 2007
@@ -1,13 +1,13 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1.6.1 2006/05/07 00:09:20 edink Exp $
+// $Id: config.w32,v 1.1.6.2 2007/05/04 18:17:55 edink Exp $
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_php5.c sapi_apache2.c
apache_config.c php_functions.c',
'php' + PHP_VERSION + 'apache2.dll',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
