do'nt require boost options in mongoclient SERVER-855

7 files changed, 13 insertions, 5 deletions

diff --git a/SConstruct b/SConstruct
index 8a17e697e85..8195f7726f4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -359,7 +359,7 @@ if GetOption( "extralib" ) is not None:
 
 # ------    SOURCE FILE SETUP -----------
 
-commonFiles = Split( "stdafx.cpp buildinfo.cpp db/common.cpp db/jsobj.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/cmdline.cpp shell/mongo.cpp" )
+commonFiles = Split( "stdafx.cpp buildinfo.cpp db/common.cpp db/jsobj.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" )
 commonFiles += [ "util/background.cpp" , "util/mmap.cpp" ,  "util/sock.cpp" ,  "util/util.cpp" , "util/message.cpp" , 
                  "util/assert_util.cpp" , "util/httpclient.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/debug_util.cpp",
                  "util/thread_pool.cpp" ]
@@ -384,7 +384,7 @@ else:
 coreDbFiles = [ "db/commands.cpp" ]
 coreServerFiles = [ "util/message_server_port.cpp" , "util/message_server_asio.cpp" ]
 
-serverOnlyFiles = Split( "db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/matcher.cpp db/dbeval.cpp db/dbwebserver.cpp db/dbhelpers.cpp db/instance.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/client.cpp db/security.cpp util/miniwebserver.cpp db/storage.cpp db/reccache.cpp db/queryoptimizer.cpp db/extsort.cpp db/mr.cpp s/d_util.cpp" )
+serverOnlyFiles = Split( "db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/matcher.cpp db/dbeval.cpp db/dbwebserver.cpp db/dbhelpers.cpp db/instance.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/client.cpp db/security.cpp util/miniwebserver.cpp db/storage.cpp db/reccache.cpp db/queryoptimizer.cpp db/extsort.cpp db/mr.cpp s/d_util.cpp db/cmdline.cpp" )
 serverOnlyFiles += [ "db/index.cpp" ] + Glob( "db/index_*.cpp" )
 
 serverOnlyFiles += Glob( "db/dbcommands*.cpp" )
@@ -404,7 +404,7 @@ else:
     nojni = True
 
 coreShardFiles = []
-shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" ,  "s/cursors.cpp" ,  "s/server.cpp" , "s/chunk.cpp" , "s/shardkey.cpp" , "s/config.cpp" , "s/s_only.cpp"  ]
+shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" ,  "s/cursors.cpp" ,  "s/server.cpp" , "s/chunk.cpp" , "s/shardkey.cpp" , "s/config.cpp" , "s/s_only.cpp" , "db/cmdline.cpp" ]
 serverOnlyFiles += coreShardFiles + [ "s/d_logic.cpp" ]
 
 serverOnlyFiles += [ "db/module.cpp" ] + Glob( "db/modules/*.cpp" )
diff --git a/client/clientOnly.cpp b/client/clientOnly.cpp
index e0f59a97f06..566095a1e86 100644
--- a/client/clientOnly.cpp
+++ b/client/clientOnly.cpp
@@ -22,6 +22,8 @@
 
 namespace mongo {
 
+    CmdLine cmdLine;
+
     const char * curNs = "in client mode";
 
     bool dbexitCalled = false;
diff --git a/db/cmdline.cpp b/db/cmdline.cpp
index 59eafdd3f02..2d15279fb29 100644
--- a/db/cmdline.cpp
+++ b/db/cmdline.cpp
@@ -23,7 +23,6 @@
 namespace po = boost::program_options;
 
 namespace mongo {
-    CmdLine cmdLine;
 
     void setupSignals();
     BSONArray argvArray;
diff --git a/db/db.cpp b/db/db.cpp
index fe63df1f916..9ff49ba183a 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -45,6 +45,8 @@
 
 namespace mongo {
 
+    CmdLine cmdLine;
+
     bool useJNI = true;
 
     /* only off if --nocursors which is for debugging. */
diff --git a/dbtests/framework.cpp b/dbtests/framework.cpp
index 4553686db54..0566aa8505b 100644
--- a/dbtests/framework.cpp
+++ b/dbtests/framework.cpp
@@ -34,6 +34,8 @@ namespace po = boost::program_options;
 
 namespace mongo {
     
+    CmdLine cmdLine;
+
     namespace regression {
 
         map<string,Suite*> * mongo::regression::Suite::_suites = 0;
diff --git a/s/server.cpp b/s/server.cpp
index 364437602da..6141816794e 100644
--- a/s/server.cpp
+++ b/s/server.cpp
@@ -28,7 +28,8 @@
 #include "chunk.h"
 
 namespace mongo {
-    
+
+    CmdLine cmdLine;    
     Database *database = 0;
     string mongosCommand;
     string ourHostname;
diff --git a/tools/tool.cpp b/tools/tool.cpp
index 4bb15f437a8..c9a297768e3 100644
--- a/tools/tool.cpp
+++ b/tools/tool.cpp
@@ -32,6 +32,8 @@ namespace po = boost::program_options;
 
 namespace mongo {
 
+    CmdLine cmdLine;
+
     Tool::Tool( string name , bool localDBAllowed , string defaultDB , string defaultCollection ) :
         _name( name ) , _db( defaultDB ) , _coll( defaultCollection ) , _conn(0), _paired(false) {