--- a/src/wscript	Thu Jul 12 12:41:37 2007 +0100
+++ b/src/wscript	Sun Jul 15 13:04:47 2007 +0100
@@ -29,9 +29,11 @@
 
     blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
     for module in all_modules:
-        conf.sub_config(module)
         conf.env.append_value('NS3_MODULE_PATH', os.path.join(blddir, 'src', module))
 
+    ## Used to link the 'run-tests' program with all of ns-3 code
+    conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]
+
 
 def build(bld):
     Object.register('ns3header', Ns3Header)