summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-12-03 14:29:45 +0000
committerWez Furlong <wez@php.net>2003-12-03 14:29:45 +0000
commitad84dfa9375a64d8521484600ffe7df15e58a083 (patch)
tree375b15b20d86c13e5046d2b16e457589b15cd408 /sapi
parentf7a86e5b5e73753b43804947108f9a1677f74e00 (diff)
downloadphp-git-ad84dfa9375a64d8521484600ffe7df15e58a083.tar.gz
Build adjustments.
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache/config.w329
1 files changed, 5 insertions, 4 deletions
diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32
index d9a69bfc12..93b70948db 100644
--- a/sapi/apache/config.w32
+++ b/sapi/apache/config.w32
@@ -9,18 +9,19 @@ ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
if (PHP_APACHE == "yes") {
if (!CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE", php_usual_include_suspects +
- ";C:\\Program Files\\Apache Group\\Apache\\include" +
+ ";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
";..\\php_build\\apache\\src\\include")) {
ERROR("Could not find apache headers");
}
if (!CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
- ';C:\\Program Files\\Apache Group\\Apache\\libexec' +
+ ';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
';..\\php_build\\apache\\src\\corer')) {
ERROR("Could not find apache libraries");
}
-
+ // 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',
'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H');
+ '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
}