diff options
| author | Wez Furlong <wez@php.net> | 2003-12-03 02:47:45 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-03 02:47:45 +0000 |
| commit | 34df2ae23953e21e777e8aa224b2568a1c7ad340 (patch) | |
| tree | 8f13ff54340a11bbbd5f08352ed4f7f0742e8be6 /sapi/apache | |
| parent | 4dce55f28bfc86787e79a8cb07a8480ba5c9e75c (diff) | |
| download | php-git-34df2ae23953e21e777e8aa224b2568a1c7ad340.tar.gz | |
some tweaks for Frank
Diffstat (limited to 'sapi/apache')
| -rw-r--r-- | sapi/apache/config.w32 | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32 index 391d5a2192..d9a69bfc12 100644 --- a/sapi/apache/config.w32 +++ b/sapi/apache/config.w32 @@ -8,33 +8,19 @@ ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null); 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")) { + if (!CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE", php_usual_include_suspects + + ";C:\\Program Files\\Apache Group\\Apache\\include" + + ";..\\php_build\\apache\\src\\include")) { 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 (!FSO.FileExists(PHP_APACHE_LIBS + "\\ApacheCore.lib")) { + if (!CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects + + ';C:\\Program Files\\Apache Group\\Apache\\libexec' + + ';..\\php_build\\apache\\src\\corer')) { ERROR("Could not find apache libraries"); } - 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 + '"'); - ADD_FLAG('LIBS_APACHE', '/libpath:"' + PHP_APACHE_LIBS + '" ApacheCore.lib'); + '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H'); } |