[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32 confutils.js

[Pierre-Alain Joye]

pajoye          Mon Jul  7 13:51:35 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/win32/build        config.w32 confutils.js 
  Log:
  - MFH: 
   - use ARG_ENABLE for the summary option
   - move test if summary function
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.22&r2=1.40.2.8.2.10.2.23&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.22 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.23
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.22   Mon Jul  7 13:32:55 2008
+++ php-src/win32/build/config.w32      Mon Jul  7 13:51:35 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.22 2008/07/07 13:32:55 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.23 2008/07/07 13:51:35 pajoye Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -363,4 +363,4 @@
 
 DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
 
-ARG_WITH('summary', 'Enable configuration summary', 'yes');
+ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.21&r2=1.60.2.1.2.8.2.22&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.21 
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.21  Mon Jul  7 13:32:55 2008
+++ php-src/win32/build/confutils.js    Mon Jul  7 13:51:35 2008
@@ -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 write_summary()
 {
        var ar = new Array();
+       if (PHP_SUMMARY == "no") {
+               return;
+       }
 
        STDOUT.WriteBlankLines(2);
 
@@ -1452,10 +1455,7 @@
        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");



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php