- MFH: the config summary is a must, do not allow to disable it

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 970ebcaaae6f30424ed6f7564a5588d366f3b10d..f3b9e57fb9870ba7a63f2d388d9cf849042864b7 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -174,8 +174,8 @@ if (PHP_DEBUG == "yes") {
                ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf");
        }
        // Equivalent to Release_TSInline build -> best optimization
-       ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \
-/D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0");
+       ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG /D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0");
+
        // if you have VS.Net /GS hardens the binary against buffer overruns
        // ADD_FLAG("CFLAGS", "/GS");
 }
@@ -370,8 +370,6 @@ if (PHP_SNAPSHOT_TEMPLATE == "no") {
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
-
 if (PHP_DSP != "no") {
        if (FSO.FolderExists("tmp")) {
                FSO.DeleteFolder("tmp");

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index b782751d784e60f111b6e05da521f359d22892c9..a97b1b9de3e6c36490a1493784436dc524b91e43 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.31 2008-11-21 14:17:33 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.32 2008-12-25 00:08:51 pajoye Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1467,9 +1467,6 @@ function output_as_table(header, ar_out)
 function write_summary()
 {
        var ar = new Array();
-       if (PHP_SUMMARY == "no") {
-               return;
-       }
 
        STDOUT.WriteBlankLines(2);