SERVER-6951 SERVER-9656 SERVER-9849 Handle third_party libraries consistently

5 files changed, 19 insertions, 9 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 9f0597f62ed..3f6f3f9e332 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -135,7 +135,7 @@ env.StaticLibrary('expressions',
                   LIBDEPS=['bson',
                            'path',
                            '$BUILD_DIR/mongo/db/common',
-                           '$BUILD_DIR/third_party/pcrecpp'
+                           '$BUILD_DIR/third_party/shim_pcrecpp'
                            ] )
 
 env.StaticLibrary('expressions_geo',
@@ -273,7 +273,7 @@ env.StaticLibrary('mongocommon', commonFiles,
                            'stacktrace',
                            'stringutils',
                            'fail_point',
-                           '$BUILD_DIR/third_party/pcrecpp',
+                           '$BUILD_DIR/third_party/shim_pcrecpp',
                            '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
                            '$BUILD_DIR/third_party/shim_boost'] +
                            extraCommonLibdeps)
@@ -371,7 +371,8 @@ env.CppUnitTest('bson_template_evaluator_test', ['scripting/bson_template_evalua
 if usesm:
     env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp',
                                                              'scripting/sm_db.cpp'],
-                      LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator'])
+                      LIBDEPS=['$BUILD_DIR/third_party/shim_spidermonkey',
+                               'bson_template_evaluator'])
 elif usev8:
     env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
                                                              'scripting/v8_db.cpp',
@@ -833,7 +834,7 @@ if shellEnv is not None:
         "mongo",
         coreShellFiles,
         LIBDEPS=[ "clientandshell", "mongocommon", "scripting", 
-                 "$BUILD_DIR/third_party/pcrecpp"] + env['MODULE_LIBDEPS_MONGOSHELL'] )
+                 "$BUILD_DIR/third_party/shim_pcrecpp"] + env['MODULE_LIBDEPS_MONGOSHELL'] )
 
     shellEnv.Install( '#/', mongo_shell )
 
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index 7fc9298de9b..369c8f7892d 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -37,7 +37,7 @@ env.StaticLibrary('base', [
         ], LIBDEPS=["$BUILD_DIR/mongo/base/base",
                     "$BUILD_DIR/mongo/bson",
                     "$BUILD_DIR/mongo/platform/platform",
-                    "$BUILD_DIR/third_party/libstemmer_c/stemmer"
+                    "$BUILD_DIR/third_party/shim_stemmer"
                     ])
 
 env.StaticLibrary( 'server_common', [
diff --git a/src/mongo/util/compress.cpp b/src/mongo/util/compress.cpp
index f768fd0d28e..5d5cfc4cc25 100644
--- a/src/mongo/util/compress.cpp
+++ b/src/mongo/util/compress.cpp
@@ -18,7 +18,7 @@
 
 #include "mongo/util/compress.h"
 
-#include "third_party/snappy/snappy.h"
+#include "snappy.h"
 
 namespace mongo {
 
diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 8f1dfeedcbf..e9446b3dbd2 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -9,11 +9,11 @@ env.SConscript( [
 env.Append(CPPPATH='$BUILD_DIR/third_party/s2')
 
 if use_system_version_of_library("pcre"):
-    env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'],
+    env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
                        SYSLIBDEPS=[ 'pcre' , 'pcrecpp' ] )
 else:
     env.SConscript('pcre-${PCRE_VERSION}/SConscript')
-    env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'],
+    env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'],
                        LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] )
 
 if use_system_version_of_library("boost"):
@@ -60,4 +60,10 @@ else:
     env.StaticLibrary('shim_allocator', 'shim_allocator.cpp',
                       LIBDEPS=['gperftools-2.0/tcmalloc_minimal'])
 
-env.SConscript('libstemmer_c/SConscript')
+if use_system_version_of_library("stemmer"):
+    env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
+                      SYSLIBDEPS= ['stemmer'])
+else:
+    env.SConscript('libstemmer_c/SConscript')
+    env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'],
+                      LIBDEPS=['libstemmer_c/stemmer'])
diff --git a/src/third_party/shim_stemmer.cpp b/src/third_party/shim_stemmer.cpp
new file mode 100644
index 00000000000..43dc23e553e
--- /dev/null
+++ b/src/third_party/shim_stemmer.cpp
@@ -0,0 +1,3 @@
+// This file intentionally blank.  shim_stemmer.cpp is part of the
+// third_party/libstemmer_c library, which is just a placeholder for forwarding
+// library dependencies.