wez Tue Dec 2 19:27:45 2003 EDT Modified files: /php-src/sapi/apache config.w32 Log: Fix build if you don't have apache headers and want to disable apache... Index: php-src/sapi/apache/config.w32 diff -u php-src/sapi/apache/config.w32:1.1 php-src/sapi/apache/config.w32:1.2 --- php-src/sapi/apache/config.w32:1.1 Tue Dec 2 18:17:02 2003 +++ php-src/sapi/apache/config.w32 Tue Dec 2 19:27:44 2003 @@ -1,39 +1,40 @@ // vim:ft=javascript -// $Id: config.w32,v 1.1 2003/12/02 23:17:02 wez Exp $ +// $Id: config.w32,v 1.2 2003/12/03 00:27:44 wez Exp $ ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'yes'); ARG_WITH('apache-includes', 'Where to find Apache 1.3 headers', null); ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null); -if (PHP_APACHE_INCLUDES == null) { - if (FSO.FileExists('C:\\Program Files\\Apache Group\\Apache\\include\\httpd.h')) { - PHP_APACHE_INCLUDES = "C:\\Program Files\\Apache Group\\Apache\\include"; - } else if (FSO.FileExists(PHP_PHP_BUILD + "\\apache\\src\\include\\httpd.h")) { - PHP_APACHE_INCLUDES = PHP_PHP_BUILD + "\\apache\\src\\include"; +if (PHP_APACHE == "yes") { + + if (PHP_APACHE_INCLUDES == null) { + if (FSO.FileExists('C:\\Program Files\\Apache Group\\Apache\\include\\httpd.h')) { + PHP_APACHE_INCLUDES = "C:\\Program Files\\Apache Group\\Apache\\include"; + } else if (FSO.FileExists(PHP_PHP_BUILD + "\\apache\\src\\include\\httpd.h")) { + PHP_APACHE_INCLUDES = PHP_PHP_BUILD + "\\apache\\src\\include"; + } } -} -if (!FSO.FileExists(PHP_APACHE_INCLUDES + "\\httpd.h")) { - ERROR("Could not find apache headers"); -} + if (!FSO.FileExists(PHP_APACHE_INCLUDES + "\\httpd.h")) { + ERROR("Could not find apache headers"); + } -if (PHP_APACHE_LIBS == null) { - if (FSO.FileExists('C:\\Program Files\\Apache Group\\Apache\\libexec\\ApacheCore.lib')) { - PHP_APACHE_LIBS = "C:\\Program Files\\Apache Group\\Apache\\libexec"; - } else if (FSO.FileExists(PHP_PHP_BUILD + "\\apache\\src\\corer\\ApacheCore.lib")) { - PHP_APACHE_LIBS = PHP_PHP_BUILD + "\\apache\\src\\corer"; + if (PHP_APACHE_LIBS == null) { + if (FSO.FileExists('C:\\Program Files\\Apache Group\\Apache\\libexec\\ApacheCore.lib')) { + PHP_APACHE_LIBS = "C:\\Program Files\\Apache Group\\Apache\\libexec"; + } else if (FSO.FileExists(PHP_PHP_BUILD + "\\apache\\src\\corer\\ApacheCore.lib")) { + PHP_APACHE_LIBS = PHP_PHP_BUILD + "\\apache\\src\\corer"; + } } -} -if (!FSO.FileExists(PHP_APACHE_LIBS + "\\ApacheCore.lib")) { - ERROR("Could not find apache libraries"); -} + if (!FSO.FileExists(PHP_APACHE_LIBS + "\\ApacheCore.lib")) { + ERROR("Could not find apache libraries"); + } -if (PHP_APACHE == "yes") { SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c', - 'php' + PHP_VERSION + 'apache.dll', - '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I "' + PHP_APACHE_INCLUDES + '"'); + 'php' + PHP_VERSION + 'apache.dll', + '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I "' + PHP_APACHE_INCLUDES + '"'); ADD_FLAG('LIBS_APACHE', '/libpath:"' + PHP_APACHE_LIBS + '" ApacheCore.lib'); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php