More things for the new build system.

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

5 files changed, 74 insertions, 30 deletions

diff --git a/sapi/aolserver/config.w32 b/sapi/aolserver/config.w32
new file mode 100644
index 0000000000..75b4361efc
--- /dev/null
+++ b/sapi/aolserver/config.w32
@@ -0,0 +1,16 @@
+// vim:ft=javascript
+// $Id$
+
+ARG_WITH('aolserver', 'Build AOLserver support', 'no');
+
+if (PHP_AOLSERVER != "no") {
+	if (PHP_ZTS == "no") {
+		WARNING("AOLSERVER module requires an --enable-zts build of PHP");
+	} else {
+		if (CHECK_HEADER_ADD_INCLUDE("ns.h", "CFLAGS_AOLSERVER", PHP_AOLSERVER) && CHECK_LIB("nsd.lib", "aolserver", PHP_AOLSERVER)) {
+			SAPI('aolserver', 'aolserver.c', 'php' + PHP_VERSION + 'aolserver.so', '/D XP_WIN32 ');
+		} else {
+			WARNING("sapi/aolserver not enabled: Could not find libraries/headers");
+		}
+	}
+}
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');
 }
diff --git a/sapi/apache_hooks/config.w32 b/sapi/apache_hooks/config.w32
new file mode 100644
index 0000000000..66a5535271
--- /dev/null
+++ b/sapi/apache_hooks/config.w32
@@ -0,0 +1,21 @@
+// vim:ft=javascript
+// $Id$
+
+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") &&
+			CHECK_LIB("ApacheCore.lib", "apache_hooks", 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_hooks', 'mod_php4.c sapi_apache.c php_apache.c',
+				'php' + PHP_VERSION + 'apache_hooks.dll',
+				'/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+	} else {
+		WARNING("Could not find apache libraries/headers");
+	}
+}
diff --git a/sapi/nsapi/config.w32 b/sapi/nsapi/config.w32
index cb5357513c..0a04c4fef5 100644
--- a/sapi/nsapi/config.w32
+++ b/sapi/nsapi/config.w32
@@ -7,20 +7,14 @@ ARG_WITH('nsapi-includes', 'Where to find NSAPI headers', null);
 ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null);
 
 if (PHP_NSAPI != "no") {
-
 	if (PHP_ZTS == "no") {
-		ERROR("NSAPI module requires an --enable-zts build of PHP");
-	}
-
-	if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
-		   	PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES)) {
-		ERROR("Could not find NSAPI headers");
-	}
-
-	if (!CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
+		WARNING("NSAPI module requires an --enable-zts build of PHP");
+	} else if (CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI",
+			PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES) &&
+			CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib",
 			"nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) {
-		ERROR("Could not find NSAPI libraries");
+		SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 ');
+	} else {
+		WARNING("Could not find NSAPI headers/libraries");
 	}
-	
-	SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 ');
 }
diff --git a/sapi/pi3web/config.w32 b/sapi/pi3web/config.w32
new file mode 100644
index 0000000000..3e4fe16245
--- /dev/null
+++ b/sapi/pi3web/config.w32
@@ -0,0 +1,16 @@
+// vim:ft=javascript
+// $Id$
+
+ARG_WITH('pi3web', 'Pi3Web', 'no');
+
+if (PHP_PI3WEB != "no") {
+	if (CHECK_HEADER_ADD_INCLUDE('PiAPI/PiAPI.h', 'CFLAGS_PI3WEB', PHP_PI3WEB) &&
+		   CHECK_LIB('piapi.lib', 'pi3web') &&
+		   CHECK_LIB('pi2api.lib', 'pi3web') &&
+		   CHECK_LIB('pi3api.lib', 'pi3web')) {
+		SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll', '/D PHP4PI3WEB_EXPORTS');
+		AC_DEFINE('WITH_PI3WEB', 1);
+	} else {
+		WARNING('Pi3Web not enabled; headers/libraries not found');
+	}
+}