use /Ox flag for release build (all optimizations on).

If no php_build dir is specified, then look for either of the two
"standard" things in reasonable locations.
Allow CHECK_LIB to search for the "same" library using a ; separated
list of alternatives.
Tweak nsapi config and remove redundant or unused flags.
Add ZTS checks for both isapi and nsapi configs.

1 files changed, 29 insertions, 18 deletions

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index bca6fc5082..a126817b26 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.16 2003-12-04 17:03:20 fmk Exp $
+// $Id: confutils.js,v 1.17 2003-12-05 02:41:00 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -362,33 +362,44 @@ function PATH_PROG(progname, def, additional_paths)
 	return place;
 }
 
-function CHECK_LIB(libname, target, path_to_check)
+function CHECK_LIB(libnames, target, path_to_check)
 {
 	if (path_to_check == null) {
 		path_to_check = php_usual_lib_suspects;
 	} else {
 		path_to_check += ";" + php_usual_lib_suspects;
 	}
-	
-	var p = search_paths(libname, path_to_check, "LIB");
 	var have = 0;
+	var p;
+	var i;
+	var libname;
 
-	if (typeof(p) == "string") {
-		ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p + '" ');
-		ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
-		have = 1;
-	} else if (p == true) {
-		ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
-		have = 1;
-	} else {
-		/* not found in the defaults or the explicit paths,
-		 * so check the general extra libs; if we find
-		 * it here, no need to add another /libpath: for it as we
-		 * already have it covered, but we need to add the lib
-		 * to LIBS_XXX */
-		if (false != search_paths(libname, PHP_EXTRA_LIBS, null)) {
+	libnames = libnames.split(';');
+	for (i = 0; i < libnames.length; i++) {
+		libname = libnames[i];
+		p = search_paths(libname, path_to_check, "LIB");
+
+		if (typeof(p) == "string") {
+			ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p + '" ');
 			ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
 			have = 1;
+		} else if (p == true) {
+			ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+			have = 1;
+		} else {
+			/* not found in the defaults or the explicit paths,
+			 * so check the general extra libs; if we find
+			 * it here, no need to add another /libpath: for it as we
+			 * already have it covered, but we need to add the lib
+			 * to LIBS_XXX */
+			if (false != search_paths(libname, PHP_EXTRA_LIBS, null)) {
+				ADD_FLAG("LIBS_" + target.toUpperCase(), libname);
+				have = 1;
+			}
+		}
+
+		if (have) {
+			break;
 		}
 	}