--- a/src/core/wscript	Wed Sep 07 12:18:37 2011 -0700
+++ b/src/core/wscript	Thu Sep 08 16:13:40 2011 +0100
@@ -15,9 +15,8 @@
 
 
 def configure(conf):
-    a = conf.check(type_name='uint128_t', define_name='HAVE_UINT128_T')
-    b = conf.check(type_name='__uint128_t', define_name='HAVE___UINT128_T')
-
+    a = conf.check_nonfatal(type_name='uint128_t', define_name='HAVE_UINT128_T')
+    b = conf.check_nonfatal(type_name='__uint128_t', define_name='HAVE___UINT128_T')
 
     if Options.options.int64x64_as_double:
         conf.define('INT64X64_USE_DOUBLE', 1)
@@ -32,20 +31,20 @@
         conf.env['INT64X64_USE_CAIRO'] = 1
         highprec = 'cairo 128-bit integer'
 
-    conf.check_message_custom('high precision time', 'implementation', highprec)
+    conf.msg('Checking high precision time implementation', highprec)
 
-    conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H')
-    conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H')
-    conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
-    conf.check(header_name='sys/types.h', define_name='HAVE_SYS_TYPES_H')
-    conf.check(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H')
-    conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H')
+    conf.check_nonfatal(header_name='stdint.h', define_name='HAVE_STDINT_H')
+    conf.check_nonfatal(header_name='inttypes.h', define_name='HAVE_INTTYPES_H')
+    conf.check_nonfatal(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
+    conf.check_nonfatal(header_name='sys/types.h', define_name='HAVE_SYS_TYPES_H')
+    conf.check_nonfatal(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H')
+    conf.check_nonfatal(header_name='dirent.h', define_name='HAVE_DIRENT_H')
 
-    if conf.check(header_name='stdlib.h'):
+    if conf.check_nonfatal(header_name='stdlib.h'):
         conf.define('HAVE_STDLIB_H', 1)
         conf.define('HAVE_GETENV', 1)
 
-    conf.check(header_name='signal.h', define_name='HAVE_SIGNAL_H')
+    conf.check_nonfatal(header_name='signal.h', define_name='HAVE_SIGNAL_H')
 
     # Check for POSIX threads
     test_env = conf.env.copy()
@@ -62,10 +61,9 @@
    return 0;
 }
 """
-    have_pthread = conf.check(header_name='pthread.h', define_name='HAVE_PTHREAD_H',
-                              env=test_env, fragment=fragment,
-                              errmsg='Could not find pthread support (build/config.log for details)',
-                              mandatory=False)
+    have_pthread = conf.check_nonfatal(header_name='pthread.h', define_name='HAVE_PTHREAD_H',
+                                       env=test_env, fragment=fragment,
+                                       errmsg='Could not find pthread support (build/config.log for details)')
     if have_pthread:
         # darwin accepts -pthread but prints a warning saying it is ignored
         if Options.platform != 'darwin' and Options.platform != 'cygwin':
@@ -79,12 +77,12 @@
                                  conf.env['ENABLE_THREADING'],
                                  "<pthread.h> include not detected")
 
-    conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H')
-    conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H')
+    conf.check_nonfatal(header_name='stdint.h', define_name='HAVE_STDINT_H')
+    conf.check_nonfatal(header_name='inttypes.h', define_name='HAVE_INTTYPES_H')
 
-    conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
+    conf.check_nonfatal(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
 
-    if not conf.check(lib='rt', uselib='RT', define_name='HAVE_RT'):
+    if not conf.check_nonfatal(lib='rt', uselib='RT', define_name='HAVE_RT'):
         conf.report_optional_feature("RealTime", "Real Time Simulator",
                                      False, "librt is not available")
     else:
@@ -170,7 +168,7 @@
         'test/watchdog-test-suite.cc',
         ]
 
-    headers = bld.new_task_gen('ns3header')
+    headers = bld.new_task_gen(features=['ns3header'])
     headers.module = 'core'
     headers.source = [
         'model/nstime.h',
@@ -252,7 +250,7 @@
             ])
 
 
-    env = bld.env_of_name('default')
+    env = bld.env
     if env['INT64X64_USE_DOUBLE']:
         headers.source.extend(['model/int64x64-double.h'])
     elif env['INT64X64_USE_128']: