Imported Upstream version 2.4.5upstream/2.4.5

1 files changed, 9 insertions, 23 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 9335eaa39a2..27067e32e9d 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -166,12 +166,15 @@ commonFiles = [ "pch.cpp",
                 "db/dbmessage.cpp"
                 ]
 
-commonSysLibdeps = []
+extraCommonLibdeps = []
 
 if env['MONGO_BUILD_SASL_CLIENT']:
-    commonFiles.extend(['client/sasl_client_authenticate_impl.cpp',
-                        'util/gsasl_session.cpp'])
-    commonSysLibdeps.append('gsasl')
+    env.StaticLibrary('sasl_client_session',
+                      ['client/sasl_client_session.cpp'],
+                      LIBDEPS=['foundation'],
+                      SYSLIBDEPS=['sasl2'])
+    commonFiles.extend(['client/sasl_client_authenticate_impl.cpp'])
+    extraCommonLibdeps.append('sasl_client_session')
 
 # handle processinfo*
 processInfoFiles = [ "util/processinfo.cpp" ]
@@ -218,8 +221,8 @@ env.StaticLibrary('mongocommon', commonFiles,
                            'fail_point',
                            '$BUILD_DIR/third_party/pcrecpp',
                            '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
-                           '$BUILD_DIR/third_party/shim_boost'],
-                  SYSLIBDEPS=commonSysLibdeps)
+                           '$BUILD_DIR/third_party/shim_boost'] +
+                           extraCommonLibdeps)
 
 env.StaticLibrary("coredb", [
         "client/parallel.cpp",
@@ -656,9 +659,6 @@ env.Library("clientandshell", ["client/clientAndShell.cpp"],
                                        "notmongodormongos"])
 env.Library("allclient", "client/clientOnly.cpp", LIBDEPS=["clientandshell"])
 
-if has_option( "sharedclient" ):
-    sharedClientLibName = str( env.SharedLibrary( "mongoclient", [], LIBDEPS=["allclient"] )[0] )
-
 # dbtests test binary
 env.StaticLibrary('testframework', ['dbtests/framework.cpp'], LIBDEPS=['unittest/unittest'])
 
@@ -798,20 +798,6 @@ if shellEnv is not None:
 
 env.Alias( "core", [ '#/%s' % b for b in [ add_exe( "mongo" ), add_exe( "mongod" ), add_exe( "mongos" ) ] ] )
 
-#headers
-if installSetup.headers:
-    for id in [ "", "util/", "util/net/", "util/mongoutils/", "util/concurrency/", "db/",
-                "db/stats/", "db/repl/", "db/ops/", "client/", "bson/", "bson/util/", "s/",
-                "scripting/", "base/", "platform/" ]:
-        env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.h" ) )
-        env.Install( "$INSTALL_DIR/include/" + id, Glob( id + "*.hpp" ) )
-
-#lib
-if installSetup.libraries:
-    env.Install('$INSTALL_DIR/$NIX_LIB_DIR', '#${LIBPREFIX}mongoclient${LIBSUFFIX}')
-    if has_option( "sharedclient" ):
-        env.Install( "$INSTALL_DIR/$NIX_LIB_DIR",  '#${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
-
 # Stage the top-level mongodb banners
 distsrc = env.Dir('#distsrc')
 env.Append(MODULE_BANNERS = [distsrc.File('README'),