auroraeosrose Tue Apr 15 16:55:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache config.w32
/php-src/sapi/apache_hooks config.w32
Log:
These are really old config.w32 files - now they use PHP_PHP_BUILD correctly
instead of hard coding the path to the libraries
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/config.w32?r1=1.7&r2=1.7.8.1&diff_format=u
Index: php-src/sapi/apache/config.w32
diff -u php-src/sapi/apache/config.w32:1.7
php-src/sapi/apache/config.w32:1.7.8.1
--- php-src/sapi/apache/config.w32:1.7 Sat Jan 17 13:00:04 2004
+++ php-src/sapi/apache/config.w32 Tue Apr 15 16:55:53 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.7 2004/01/17 13:00:04 sniper Exp $
+// $Id: config.w32,v 1.7.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
@@ -9,10 +9,10 @@
if (PHP_APACHE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache
Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include") &&
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\include")
&&
CHECK_LIB("ApacheCore.lib", "apache",
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/config.w32?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/sapi/apache_hooks/config.w32
diff -u php-src/sapi/apache_hooks/config.w32:1.2
php-src/sapi/apache_hooks/config.w32:1.2.8.1
--- php-src/sapi/apache_hooks/config.w32:1.2 Sat Jan 17 13:00:08 2004
+++ php-src/sapi/apache_hooks/config.w32 Tue Apr 15 16:55:53 2008
@@ -1,15 +1,15 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2004/01/17 13:00:08 sniper Exp $
+// $Id: config.w32,v 1.2.8.1 2008/04/15 16:55:53 auroraeosrose Exp $
ARG_WITH('apache-hooks', 'Build Apache 1.3.x (hooks) version of PHP', 'no');
if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache
Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include") &&
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\include")
&&
CHECK_LIB("ApacheCore.lib", "apache_hooks",
php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache
Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
