- MFH:

 - use ARG_ENABLE for the summary option
 - move test if summary function

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 65a732337fa65eeddc7f7e4ece655b137307c159..d57ef2d522661bf236586d879133cec52d9ef53f 100644 (file)
--- 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 707e8d52e64c2728b537772cef337b9fea458eeb..0b515ddaa9c1167657bd382b4708b5cd143e4cbf 100644 (file)
--- 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");