SCons refactoring, cleans up building and testing the C++ client.

This patch does the following:

1.) Remove pcre.h dependencies in the C++ client, and remove some other
unnecessary dependencies.
2.) Clean up how we build the client from the client source tarball, so it's
more like how we build it from the git repo / full source tarball.
3.) Fix up our "scons" so you only have to write "scons ." to build all of our
binaries, the binary archive (zip or tgz) and client source archive (zip or
tgz).
4.) Fix up SCons aliases "core", "tools", and "all".
5.) Let user specify the name of the client tarball via a SCons command line
switch.

Resolves SERVER-4231, SERVER-5255.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/util/version.h b/src/mongo/util/version.h
index 64f8b140fd5..fcccc1494ab 100644
--- a/src/mongo/util/version.h
+++ b/src/mongo/util/version.h
@@ -3,21 +3,21 @@
 
 #include <string>
 
+#include "mongo/bson/stringdata.h"
+
 namespace mongo {
     struct BSONArray;
 
-    using std::string;
-
     // mongo version
     extern const char versionString[];
     extern const BSONArray versionArray;
-    string mongodVersion();
+    std::string mongodVersion();
     int versionCmp(StringData rhs, StringData lhs); // like strcmp
 
     const char * gitVersion();
     void printGitVersion();
 
-    string sysInfo();
+    std::string sysInfo();
     void printSysInfo();
 
     void show_warnings();