]> granicus.if.org Git - php/commitdiff
MFB
authorElizabeth Marie Smith <auroraeosrose@php.net>
Tue, 15 Apr 2008 16:59:40 +0000 (16:59 +0000)
committerElizabeth Marie Smith <auroraeosrose@php.net>
Tue, 15 Apr 2008 16:59:40 +0000 (16:59 +0000)
sapi/apache/config.w32
sapi/apache_hooks/config.w32

index 4403c2b15e4ed5ffbb60326f693e3a120feff8f4..fcb94b0cdbbc49f25f3be4edda463a1cef41a460 100644 (file)
@@ -9,10 +9,10 @@ ARG_WITH('apache-libs', 'Where to find Apache 1.3 libraries', null);
 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_php.c sapi_apache.c php_apache.c',
index 9a4d12508c0b743a15949c8b2102765ef20fd5e0..85dc624d60b37455ecf1d953b01be8127296a947 100644 (file)
@@ -6,10 +6,10 @@ 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',