Handle extra relative paths for ns3tcp and ns3wifi modules

src/test/ns3tcp/wscript

@@ -7,11 +7,8 @@ def configure(conf):
     # should not be built if this is a static build on Darwin.  They
     # don't work there for the ns3tcp module, and this is probably
     # because the ns3tcp module has no source files.
-    #
-    # Note that because this module is in a subdirectory of test, its
-    # name in the modules list is "test/ns3tcp".
     if conf.env['ENABLE_STATIC_NS3'] and sys.platform == 'darwin':
-        conf.env['MODULES_NOT_BUILT'].append('test/ns3tcp')
+        conf.env['MODULES_NOT_BUILT'].append('ns3tcp')
 
 def build(bld):
     # Don't do anything for this module if it should not be built.

src/test/ns3wifi/wscript

@@ -7,11 +7,8 @@ def configure(conf):
     # should not be built if this is a static build on Darwin.  They
     # don't work there for the ns3wifi module, and this is probably
     # because the ns3wifi module has no source files.
-    #
-    # Note that because this module is in a subdirectory of test, its
-    # name in the modules list is "test/ns3wifi".
     if conf.env['ENABLE_STATIC_NS3'] and sys.platform == 'darwin':
-        conf.env['MODULES_NOT_BUILT'].append('test/ns3wifi')
+        conf.env['MODULES_NOT_BUILT'].append('ns3wifi')
 
 def build(bld):
     # Don't do anything for this module if it should not be built.

src/wscript

@@ -286,6 +286,14 @@ def build(bld):
     
     # Remove these modules from the list of all modules.
     for not_built in bld.env['MODULES_NOT_BUILT']:
+
+        # XXX Becaue these modules are located in subdirectories of
+        # test, their names in the all_modules list include the extra
+        # relative path "test/".  If these modules are moved into the
+        # src directory, then this if block should be removed.
+        if not_built == 'ns3tcp' or not_built == 'ns3wifi':
+            not_built = 'test/' + not_built
+
         if not_built in all_modules:
             all_modules.remove(not_built)