wez Wed Apr 28 20:17:10 2004 EDT Modified files: /php-src/win32/build config.w32.h.in confutils.js Log: Add "--disable-all" switch, which will force all arguments to "no" if they are not specified explicitly. (like the snapshot build, but in reverse). http://cvs.php.net/diff.php/php-src/win32/build/config.w32.h.in?r1=1.4&r2=1.5&ty=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.4 php-src/win32/build/config.w32.h.in:1.5 --- php-src/win32/build/config.w32.h.in:1.4 Mon Mar 29 13:58:28 2004 +++ php-src/win32/build/config.w32.h.in Wed Apr 28 20:17:09 2004 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.4 2004/03/29 18:58:28 helly Exp $ + $Id: config.w32.h.in,v 1.5 2004/04/29 00:17:09 wez Exp $ */ /* Default PHP / PEAR directories */ @@ -29,7 +29,6 @@ #define MAGIC_QUOTES 0 #define USE_CONFIG_FILE 1 #define DEFAULT_SHORT_OPEN_TAG "1" -#define ENABLE_PATHINFO_CHECK 1 /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.39&r2=1.40&ty=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.39 php-src/win32/build/confutils.js:1.40 --- php-src/win32/build/confutils.js:1.39 Thu Apr 15 12:09:36 2004 +++ php-src/win32/build/confutils.js Wed Apr 28 20:17:09 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.39 2004/04/15 16:09:36 wez Exp $ +// $Id: confutils.js,v 1.40 2004/04/29 00:17:09 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -251,6 +251,7 @@ var configure_help_mode = false; var analyzed = false; var nice = "cscript /nologo configure.js "; + var disable_all = false; args = WScript.Arguments; for (i = 0; i < args.length; i++) { @@ -260,6 +261,11 @@ configure_help_mode = true; break; } + if (arg == "--disable-all") { + disable_all = true; + continue; + } + // If it is --foo=bar, split on the equals sign arg = arg.split("=", 2); argname = arg[0]; @@ -345,6 +351,7 @@ 'pcre-regex', 'fastcgi', 'force-cgi-redirect', 'path-info-check', 'zts', 'ipv6' ); + var force; // Now set any defaults we might have missed out earlier for (i = 0; i < configure_args.length; i++) { @@ -358,7 +365,6 @@ // Don't trust a default "yes" answer for a non-core module // in a snapshot build if (PHP_SNAPSHOT_BUILD != "no" && argval == "yes" && !shared) { - var force; force = true; for (j = 0; j < snapshot_build_exclusions.length; j++) { @@ -386,8 +392,6 @@ } if (PHP_SNAPSHOT_BUILD != "no" && argval == "no") { - var force; - force = true; for (j = 0; j < snapshot_build_exclusions.length; j++) { if (snapshot_build_exclusions[j] == arg.optname) { @@ -401,6 +405,21 @@ shared = true; } } + + if (disable_all) { + force = true; + for (j = 0; j < snapshot_build_exclusions.length; j++) { + if (snapshot_build_exclusions[j] == arg.optname) { + force = false; + break; + } + } + if (force) { + argval = "no"; + shared = false; + } + } + eval("PHP_" + arg.symval + " = argval;"); eval("PHP_" + arg.symval + "_SHARED = shared;"); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php