scons flag to use each library externally --use-system-(prcre|boost) SERVER-3829

currently supported:

--use-system-all

--use-system-pcre
--use-system-sm

Conflicts:

	SConstruct

3 files changed, 24 insertions, 4 deletions

diff --git a/third_party/pcre.py b/third_party/pcre.py
index a2007223931..ad9d6bb5f41 100644
--- a/third_party/pcre.py
+++ b/third_party/pcre.py
@@ -31,6 +31,9 @@ def configure( env , fileLists , options ):
     myenv.Append( CPPDEFINES=["HAVE_CONFIG_H"] )
     fileLists["commonFiles"] += [ myenv.Object(f) for f in getFiles() ]
 
+def configureSystem( env , fileLists , options ):
+
+    env.Append( LIBS=[ "pcrecpp" ] )
 
 
 if __name__ == "__main__":
diff --git a/third_party/sm.py b/third_party/sm.py
index 53e7984b8ae..9927be88b78 100644
--- a/third_party/sm.py
+++ b/third_party/sm.py
@@ -42,15 +42,20 @@ root = "third_party/js-1.7"
 def r(x):
     return "%s/%s" % ( root , x )
 
-def configure( env , fileLists , options ):
-    if not options["usesm"]:
-        return
-
+def configureBasics( env , fileLists , options ):
     if options["windows"]:
         env.Append( CPPDEFINES=[ "XP_WIN" ] )
     else:
         env.Append( CPPDEFINES=[ "XP_UNIX" ] )
 
+    
+
+def configure( env , fileLists , options ):
+    if not options["usesm"]:
+        return
+
+    configureBasics( env , fileLists , options )
+
     env.Prepend( CPPPATH=[root] )
 
     myenv = env.Clone()
@@ -98,3 +103,12 @@ def configure( env , fileLists , options ):
     myenv.Auto( r("jsautocfg.h") , [ jscpucfg ] )
     
     myenv.Depends( r("jsscan.c") , r("jsautokw.h") )
+
+
+def configureSystem( env , fileLists , options ):
+    if not options["usesm"]:
+        return
+    
+    configureBasics( env , fileLists , options )
+
+    env.Append( LIBS=[ "js" ] )
diff --git a/third_party/snappy.py b/third_party/snappy.py
index c70cb28c52e..e53ee632bbd 100644
--- a/third_party/snappy.py
+++ b/third_party/snappy.py
@@ -9,3 +9,6 @@ def configure( env , fileLists , options ):
     files = ["third_party/snappy/snappy.cc", "third_party/snappy/snappy-sinksource.cc"]
 
     fileLists["serverOnlyFiles"] += [ myenv.Object(f) for f in files ]
+
+def configureSystem( env , fileLists , options ):
+    configure( env , fileLists , options )