From ba02e9ae6441a78287db6c0896bf81e572b97f0b Mon Sep 17 00:00:00 2001 From: Elizabeth Marie Smith Date: Tue, 15 Apr 2008 16:55:53 +0000 Subject: [PATCH] These are really old config.w32 files - now they use PHP_PHP_BUILD correctly instead of hard coding the path to the libraries --- sapi/apache/config.w32 | 4 ++-- sapi/apache_hooks/config.w32 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32 index 83ceb1a4db..e876d7500e 100644 --- a/sapi/apache/config.w32 +++ b/sapi/apache/config.w32 @@ -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_php5.c sapi_apache.c php_apache.c', diff --git a/sapi/apache_hooks/config.w32 b/sapi/apache_hooks/config.w32 index 9a4d12508c..85dc624d60 100644 --- a/sapi/apache_hooks/config.w32 +++ b/sapi/apache_hooks/config.w32 @@ -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', -- 2.40.0