discover and configure modules in db/modules/

1 files changed, 9 insertions, 0 deletions

diff --git a/SConstruct b/SConstruct
index a2231faa2c5..ea92db6bae6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -26,6 +26,7 @@ import types
 import urllib
 import urllib2
 from buildscripts import utils
+from buildscripts import moduleconfig
 
 import libdeps
 
@@ -835,6 +836,14 @@ def doConfigure(myenv):
         myenv.Append( CPPDEFINES=[ "HEAP_CHECKING" ] )
         myenv.Append( CCFLAGS=["-fno-omit-frame-pointer"] )
 
+    # discover modules (subdirectories of db/modules/), and
+    # load the (python) module for each module's build.py
+    modules = moduleconfig.discover_modules('.')
+
+    # ask each module to configure itself, and return a
+    # dictionary of name => list_of_sources for each module.
+    env["MONGO_MODULES"] = moduleconfig.configure_modules(modules, conf, env)
+
     return conf.Finish()
 
 env = doConfigure( env )