--- a/wscript	Thu Sep 06 15:18:14 2007 +0100
+++ b/wscript	Tue Sep 11 14:52:15 2007 +0100
@@ -37,7 +37,7 @@
 
     opt.add_option('-d', '--debug-level',
                    action='callback',
-                   type="string", dest='debug_level', default='debug',
+                   type="string", dest='debug_level', default='ultradebug',
                    help=('Specify the debug level, does nothing if CFLAGS is set'
                          ' in the environment. [Allowed Values: debug, optimized].'
                          ' WARNING: this option only has effect '
@@ -114,7 +114,7 @@
     
     if (os.path.basename(conf.env['CXX']).startswith("g++")
         and 'CXXFLAGS' not in os.environ):
-        variant_env.append_value('CXXFLAGS', ['-Wall', '-Werror'])
+        variant_env.append_value('CXXFLAGS', ['-Werror'])
 
     if 'debug' in Params.g_options.debug_level.lower():
         variant_env.append_value('CXXDEFINES', 'NS3_DEBUG_ENABLE')
@@ -129,6 +129,13 @@
             if flag.startswith('-g'):
                 variant_env.append_value('CXXFLAGS', flag)
 
+    ## in optimized builds, replace -O2 with -O3
+    if 'optimized' in Params.g_options.debug_level.lower():
+        lst = variant_env['CXXFLAGS']
+        for i, flag in enumerate(lst):
+            if flag == '-O2':
+                lst[i] = '-O3'
+
     if sys.platform == 'win32':
         if os.path.basename(conf.env['CXX']).startswith("g++"):
             variant_env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")