Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-07 10:41:22 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-07 10:41:22 (GMT) |
| commit | 52c716c657cf4f5b0a5767f59dc7ddb04261f534 (patch) | |
| tree | 37d62ff65227746c184fbb0eac011d0577f199d7 /Swiften/SConscript | |
| parent | bec14a3e051a97f543175a8bdcc2c1c6fd18ce77 (diff) | |
| download | swift-contrib-52c716c657cf4f5b0a5767f59dc7ddb04261f534.zip swift-contrib-52c716c657cf4f5b0a5767f59dc7ddb04261f534.tar.bz2 | |
Refactored TLS handling.
TLSLayer is now independent of TLS implementation. The implementation-specifics are now in TLSContext and TLSContextFactory.
Diffstat (limited to 'Swiften/SConscript')
| -rw-r--r-- | Swiften/SConscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript index 6b889e8..49d745d 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -24,7 +24,6 @@ if env["SCONS_STAGE"] == "build" : # TODO: Move all this to a submodule SConscript myenv = swiften_env.Clone() myenv.MergeFlags(myenv["ZLIB_FLAGS"]) - myenv.MergeFlags(myenv["OPENSSL_FLAGS"]) sources = [ "Chat/ChatStateTracker.cpp", "Chat/ChatStateNotifier.cpp", @@ -120,14 +119,12 @@ if env["SCONS_STAGE"] == "build" : "StringCodecs/Hexify.cpp", ] - if myenv.get("HAVE_OPENSSL", 0) : - sources += ["TLS/OpenSSL/OpenSSLContext.cpp"] - SConscript(dirs = [ "Avatars", "Base", "StringPrep", "SASL", + "TLS", "EventLoop", "Parser", "JID", |