diff options
author | Kevin Smith <git@kismith.co.uk> | 2012-03-23 16:00:24 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2012-04-12 13:49:48 (GMT) |
commit | 0bf6afc5c01b9eb3024a8cfd04bfd743890db4f6 (patch) | |
tree | ca480f6b8e27afa97ade97ca7a13b11502b21f31 /Swiften/SConscript | |
parent | d5f885dd9aa65d18145a99826a1c30aeb62aca8e (diff) | |
download | swift-contrib-0bf6afc5c01b9eb3024a8cfd04bfd743890db4f6.zip swift-contrib-0bf6afc5c01b9eb3024a8cfd04bfd743890db4f6.tar.bz2 |
Tidy up of assorted Schannel/CAPI stuffs.
Makes Swift disconnect if a smartcard used for auth is removed.
Fixes compilation.
Changes code style in a few places.
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r-- | Swiften/SConscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript index 41ec947..6308a80 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -43,6 +43,10 @@ if env["SCONS_STAGE"] == "flags" : dep_env.UseFlags(env.get(module + "_FLAGS", {})) dep_env.UseFlags(dep_env["PLATFORM_FLAGS"]) + if env.get("HAVE_SCHANNEL", 0) : + dep_env.Append(LIBS = ["Winscard"]) + + for var, e in [("SWIFTEN_FLAGS", swiften_env), ("SWIFTEN_DEP_FLAGS", dep_env)] : env[var] = { "CPPDEFINES": e.get("CPPDEFINES", []), |