[cig-commits] commit: merge in changes from 1.4.x

[Mercurial]

changeset:   234:ea6dd609b696
parent:      232:7293b35b7ee2
parent:      233:f430825e613d
user:        John Mansour <john.mansour at maths.monash.edu.au>
date:        Fri Jan 08 08:31:19 2010 +1100
files:       updateRepos.py
description:
merge in changes from 1.4.x


diff -r 7293b35b7ee2 -r ea6dd609b696 SConfigure
--- a/SConfigure	Wed Jan 06 15:13:51 2010 +1100
+++ b/SConfigure	Fri Jan 08 08:31:19 2010 +1100
@@ -9,6 +9,7 @@ options = [
     ('--prefix', 'prefix', 'Installation prefix.', None),
     ('--build-dir', 'build_dir', 'Sandbox location.', 'build'),
     ('--with-debugging', 'with_debugging', 'Build with debugging', 1, 'int'),
+    ('--with-warnings', 'with_warnings', 'Print all warnings at compile time', 1, 'int'),
     ('--lib-type', 'lib_type', 'Library type (shared or static)', 'shared'),
     ('--cc', 'CC', 'C compiler', None),
     ('--cflags', 'CFLAGS', 'Flags for the C compiler', None),
@@ -165,7 +166,8 @@ if not (GetOption('help') or GetOption('
     env.ConfigurePackage(packages.PETScExt, required=False)
 
     # enable all warnings.
-    env.MergeFlags('-Wall')
+    if env.get('with_warnings', None):    
+	env.MergeFlags('-Wall')
     if env.get('CC', None) == 'icc':
         env.MergeFlags('-wd869 -wd1419')