diff -r a6d8bf62a61d -r 8e69ebf086f1 bindings/python/ns3modulegen.py
--- a/bindings/python/ns3modulegen.py	Sat Sep 06 14:46:01 2008 +0100
+++ b/bindings/python/ns3modulegen.py	Sat Sep 06 19:24:32 2008 +0100
@@ -110,16 +110,17 @@
         mod = __import__(local_module)
         mod.register_functions(root_module)
 
+    enabled_features = os.environ['NS3_ENABLED_FEATURES'].split(',')
 
     # if GtkConfigStore support is disabled, disable the class wrapper
-    if 'DISABLE_GTK_CONFIG_STORE' in os.environ:
+    if 'GtkConfigStore' not in enabled_features:
         try:
             root_module.classes.remove(root_module['ns3::GtkConfigStore'])
         except KeyError:
             pass
 
     # if no sqlite, the class SqliteDataOutput is disabled
-    if 'SQLITE_STATS' in os.environ:
+    if 'SqliteDataOutput' not in enabled_features:
         try:
             root_module.classes.remove(root_module['ns3::SqliteDataOutput'])
         except KeyError: