Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-11-03 18:52:03 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-11-03 20:54:36 (GMT) |
| commit | 7a26e76bd05283fcc329469d25a2640107966603 (patch) | |
| tree | 6aaab1a11cc344d5dd59302450ba70c350963847 /Swift/SConscript | |
| parent | 7b0795215f601a9561dbedbed3af32dbe9aba032 (diff) | |
| download | swift-7a26e76bd05283fcc329469d25a2640107966603.zip swift-7a26e76bd05283fcc329469d25a2640107966603.tar.bz2 | |
Quick brush up after previous patch.
Includes:
Initial cleanup of SChannel code; compiling on non-Windows
Be willing to compile Swift with SChannel
Undo some (presumably accidental) OpenSSL changes
Where TLS doesn't support finish messages (SChannel), don't try -PLUS
Diffstat (limited to 'Swift/SConscript')
| -rw-r--r-- | Swift/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/SConscript b/Swift/SConscript index a1ee3ae..b66058b 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -5,7 +5,7 @@ Import("env") SConscript("Controllers/SConscript") if env["SCONS_STAGE"] == "build" : - if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) : + if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) : print "Error: Swift requires OpenSSL support, and OpenSSL was not found." if "Swift" in env["PROJECTS"] : env["PROJECTS"].remove("Swift") |