diff 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/StreamStack/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/StreamStack/SConscript')
-rw-r--r-- | Swiften/StreamStack/SConscript | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Swiften/StreamStack/SConscript b/Swiften/StreamStack/SConscript index 449a39b..0aca8d2 100644 --- a/Swiften/StreamStack/SConscript +++ b/Swiften/StreamStack/SConscript @@ -1,21 +1,15 @@ Import("swiften_env") myenv = swiften_env.Clone() -myenv.MergeFlags(swiften_env["OPENSSL_FLAGS"]) sources = [ "HighLayer.cpp", "LowLayer.cpp", - "PlatformTLSLayerFactory.cpp", "StreamStack.cpp", - "TLSLayerFactory.cpp", + "TLSLayer.cpp", "WhitespacePingLayer.cpp", "XMPPLayer.cpp", ] -if myenv.get("HAVE_OPENSSL", 0) : - myenv.Append(CPPDEFINES = "HAVE_OPENSSL") - sources += ["OpenSSLLayer.cpp"] - objects = myenv.StaticObject(sources) swiften_env.Append(SWIFTEN_OBJECTS = [objects]) |