More things for the new build system.

Pi3Web and aolserver build untested (no headers and libs for those here)

1 files changed, 14 insertions, 17 deletions

diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32
index 32ccb92381..1dde452f7d 100644
--- a/sapi/apache/config.w32
+++ b/sapi/apache/config.w32
@@ -6,22 +6,19 @@ ARG_ENABLE('apache', 'Build Apache 1.3.x version of PHP', 'no');
 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 == "yes") {
-
-	if (!CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE", php_usual_include_suspects +
-			";" + 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 +
-			';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
-			';..\\php_build\\apache\\src\\corer')) {
-		ERROR("Could not find apache libraries");
+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") &&
+			CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
+				';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
+				';..\\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',
+				'php' + PHP_VERSION + 'apache.dll',
+				'/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+	} else {
+		WARNING("Could not find apache libraries/headers");
 	}
-	// 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 /I win32');
 }