summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@10gen.com>2012-11-06 16:23:34 -0500
committerAndy Schwerin <schwerin@10gen.com>2012-11-08 14:42:05 -0500
commit3dc1e3f1508120806bda0bcb5d2d40484d9dd965 (patch)
tree95e00d27b01da44dbf66229d8cf4d5b268dc7d1e
parent924afa46297540f1b1e787a10d70259413524fc0 (diff)
downloadmongo-3dc1e3f1508120806bda0bcb5d2d40484d9dd965.tar.gz
SERVER-7133 Build gsasl support in the static client library.
-rwxr-xr-xdistsrc/client/SConstruct4
-rw-r--r--src/SConscript.client4
2 files changed, 8 insertions, 0 deletions
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
index abc93caae00..0bf69a59e79 100755
--- a/distsrc/client/SConstruct
+++ b/distsrc/client/SConstruct
@@ -73,6 +73,10 @@ for lib in boostLibs:
language="C++"):
if not win:
Exit(1)
+
+env['MONGO_BUILD_SASL_CLIENT'] = conf.CheckLibWithHeader(
+ "gsasl", "gsasl.h", "C", "gsasl_check_version(GSASL_VERSION);", autoadd=False)
+
conf.Finish()
clientEnv = env.Clone()
diff --git a/src/SConscript.client b/src/SConscript.client
index 0ce8c14d5f7..cc4e671a198 100644
--- a/src/SConscript.client
+++ b/src/SConscript.client
@@ -76,6 +76,10 @@ clientSource = [
'mongo/util/util.cpp',
]
+if env['MONGO_BUILD_SASL_CLIENT']:
+ clientSource.extend(['mongo/client/sasl_client_authenticate.cpp',
+ 'mongo/util/gsasl_session.cpp'])
+
exampleSourceMap = [
('authTest', 'mongo/client/examples/authTest.cpp'),
('clientTest', 'mongo/client/examples/clientTest.cpp'),