--- a/src/contrib/brite/brite-topology-helper.cc	Thu Nov 04 12:13:37 2010 -0400
+++ b/src/contrib/brite/brite-topology-helper.cc	Wed Nov 10 15:10:52 2010 -0500
@@ -32,11 +32,15 @@
 void
 BriteTopologyHelper::TestMethod (void)
 {
-  Topology* topology;
-  Model* model;
+  Topology *topology;
+  Model *model;
 
   topology = 0;
   model = 0;
+
+  std::string filename = "test.txt";
+  Parse p (filename);
+  
 }
 
 } // namespace ns3

--- a/src/contrib/brite/wscript	Thu Nov 04 12:13:37 2010 -0400
+++ b/src/contrib/brite/wscript	Wed Nov 10 15:10:52 2010 -0500
@@ -28,27 +28,33 @@
                                      "BRITE not found (see option --with-brite)")
         return
 
-    conf.env.append_value('CXXDEFINES', 'BRITE_INTEGRATION')
-    conf.check(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
-
-    lib_to_check = 'libbrite.so'
-
-    if not os.path.exists(os.path.join(conf.env['WITH_BRITE'], lib_to_check)):
-        conf.env['BRITE_ENABLED'] = False
-        conf.report_optional_feature("brite", "BRITE Integration", False,
-              "BRITE library %s is missing: BRITE has not been built?" % lib_to_check)
-        return
+    test_code = '''
+#include "Brite.h"
+int main ()
+{
+  return 0;
+}
+'''
+    conf.env['DL'] = conf.check(mandatory=True, lib='dl', define_name='DL', uselib='DL')
 
     for brite_module in ['.']:
         conf.env.append_value('NS3_MODULE_PATH',
                               os.path.abspath(os.path.join(conf.env['WITH_BRITE'], brite_module)))
 
-    conf.env['CPPPATH_BRITE'] = os.path.abspath(os.path.join(conf.env['WITH_BRITE'],'.'))
-    conf.env.append_value('CPPPATH', conf.env['CPPPATH_BRITE'])
+    conf.env['CPPPATH_BRITE'] = [
+            os.path.abspath(os.path.join(conf.env['WITH_BRITE'],'.')),
+            os.path.abspath(os.path.join(conf.env['WITH_BRITE'],'Models'))
+            ]
+    conf.env['LIBPATH_BRITE'] = [os.path.abspath(os.path.join(conf.env['WITH_BRITE'], '.'))]
 
-    conf.env['BRITE_ENABLED'] = True
-    conf.report_optional_feature("brite", "BRITE Integration", True, "")
+    conf.env['BRITE'] = conf.check(fragment=test_code, lib='brite', uselib='BRITE DL')
+    conf.report_optional_feature("brite", "BRITE Integration",
+                                          conf.env['BRITE'], "BRITE library not found")
 
+    if conf.env['BRITE']:
+        conf.env['BRITE_ENABLED'] = True
+        conf.env.append_value('CXXDEFINES', 'NS3_BRITE')
+        conf.env.append_value('CPPPATH', conf.env['CPPPATH_BRITE'])
 
 def build(bld):
 
@@ -56,6 +62,8 @@
     module.source = [
         ]
 
+    if bld.env['BRITE'] and bld.env['DL']:
+        module.uselib = 'BRITE DL'
 
     headers = bld.new_task_gen('ns3header')
     headers.module = 'brite'
@@ -65,4 +73,3 @@
     if bld.env['BRITE_ENABLED']:
         module.source.append ('brite-topology-helper.cc')
         headers.source.append ('brite-topology-helper.h')
-        module.uselib = 'DL'