--- D:\ISL\tschapzi\external\mongo\mongodb-src-r2.0.4-rc1.original\SConstruct	2012-03-12 06:07:40.000000000 +-0100
+++ D:\ISL\tschapzi\external\mongo\mongodb-src-r2.0.4-rc1.fixed\SConstruct	2012-03-15 15:35:12.000000000 +-0100
@@ -152,12 +152,13 @@
 add_option( "extralib", "comma separated list of libraries  (--extralib js_static,readline" , 1 , True )
 add_option( "staticlib", "comma separated list of libs to link statically (--staticlib js_static,boost_program_options-mt,..." , 1 , True )
 add_option( "staticlibpath", "comma separated list of dirs to search for staticlib arguments" , 1 , True )
 
 add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
 add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
+add_option( "boost-prefix", "path to the boost library", 1, True, "boostDir" )
 
 add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
 
 # experimental features
 add_option( "mm", "use main memory instead of memory mapped files" , 0 , True )
 add_option( "asio" , "Use Asynchronous IO (NOT READY YET)" , 0 , True )
@@ -286,12 +287,13 @@
 
 boostVersion = GetOption( "boostVersion" )
 if boostVersion is None:
     boostVersion = ""
 else:
     boostVersion = "-" + boostVersion
+boostDir = GetOption( "boostDir" )
 
 if ( not ( usesm or usev8 or justClientLib) ):
     usesm = True
     options_topass["usesm"] = True
 
 distBuild = len( COMMAND_LINE_TARGETS ) == 1 and ( str( COMMAND_LINE_TARGETS[0] ) == "s3dist" or str( COMMAND_LINE_TARGETS[0] ) == "dist" )
@@ -588,13 +590,14 @@
         if os.path.exists( "C:/boost" ):
 	        return "C:/boost"
         if os.path.exists( "/boost" ):
 	        return "/boost"
         return None
 
-    boostDir = find_boost()
+    if boostDir is None:
+        boostDir = find_boost()
     if boostDir is None:
         print( "can't find boost" )
         Exit(1)
     else:
         print( "boost found at '" + boostDir + "'" )