diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-07 13:51:35 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-07 13:51:35 +0000 |
| commit | 09e0bc6c9074b9e528362cc13caa6e97b3cc8c32 (patch) | |
| tree | 1472fa33ea61bc509b5451903de80a2780644c6b /win32 | |
| parent | 5d04f639deb37a6b7c36b15f2f51df5054c09380 (diff) | |
| download | php-git-09e0bc6c9074b9e528362cc13caa6e97b3cc8c32.tar.gz | |
- MFH:
- use ARG_ENABLE for the summary option
- move test if summary function
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 65a732337f..d57ef2d522 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -363,4 +363,4 @@ if (PHP_SNAPSHOT_TEMPLATE == "no") { DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE); -ARG_WITH('summary', 'Enable configuration summary', 'yes'); +ARG_ENABLE('summary', 'Enable configuration summary', 'yes'); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 707e8d52e6..0b515ddaa9 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.21 2008-07-07 13:32:55 pajoye Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.22 2008-07-07 13:51:35 pajoye Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -1402,6 +1402,9 @@ function output_as_table(header, ar_out) function write_summary() { var ar = new Array(); + if (PHP_SUMMARY == "no") { + return; + } STDOUT.WriteBlankLines(2); @@ -1452,10 +1455,7 @@ function generate_files() generate_config_h(); STDOUT.WriteLine("Done."); STDOUT.WriteBlankLines(1); - - if (PHP_SUMMARY != "no") { - write_summary(); - } + write_summary(); if (PHP_SNAPSHOT_BUILD != "no") { STDOUT.WriteLine("Type 'nmake snap' to build a PHP snapshot"); |