From: Pierre Joye <pajoye@php.net>
Date: Thu, 25 Dec 2008 00:08:51 +0000 (+0000)
Subject:  - MFH: the config summary is a must, do not allow to disable it
X-Git-Tag: php-5.3.0beta1~382
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15fa3c1d93d74ab5e9358a15d5f057ecf5cee300;p=php

 - 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 970ebcaaae..f3b9e57fb9 100644
--- 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 b782751d78..a97b1b9de3 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.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);