--- a/src/contrib/wscript	Sun May 11 21:43:55 2008 -0700
+++ b/src/contrib/wscript	Tue May 13 17:02:52 2008 -0700
@@ -1,11 +1,20 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
+def configure(conf):
+    check = conf.create_pkgconfig_configurator()
+    check.name = 'gtk+-2.0'
+    check.uselib = 'GTK_CONFIG_STORE'
+    check.mandatory = False
+    conf.env['ENABLE_GTK_CONFIG_STORE'] = check.run()
+
+
 def build(bld):
     module = bld.create_ns3_module('contrib', ['simulator'])
     module.source = [
         'event-garbage-collector.cc',
         'gnuplot.cc',
         'delay-jitter-estimation.cc',
+        'attribute-iterator.cc',
         'config-store.cc',
         ]
 
@@ -17,3 +26,8 @@
         'delay-jitter-estimation.h',
         'config-store.h',
         ]
+
+    if bld.env()['ENABLE_GTK_CONFIG_STORE']:
+        headers.source.append ('gtk-config-store.h')
+        module.source.append ('gtk-config-store.cc')
+        module.uselib = 'GTK_CONFIG_STORE'