summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThilo Cestonaro <thilo@cestona.ro>2011-04-14 08:25:33 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-18 19:11:45 (GMT)
commit427db871922a028bb299dd66c37f3cca4010fd47 (patch)
tree95c0c4bb407a5fd3ec49c138ec5fbff8cf3a7d7a /Swiften/SConscript
parent0b0164a4cdae89afc254bd7aa6f14af81c6b9196 (diff)
downloadswift-contrib-427db871922a028bb299dd66c37f3cca4010fd47.zip
swift-contrib-427db871922a028bb299dd66c37f3cca4010fd47.tar.bz2
Support for SOCKS5 and HTTPConnect proxies.
automatic proxy settings detection; SOCKS5 proxied connection; HTTPConnect proxied connection; License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swiften/SConscript')
-rw-r--r--Swiften/SConscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 57c95fc..0a229e8 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -159,6 +159,9 @@ if env["SCONS_STAGE"] == "build" :
"StringCodecs/Hexify.cpp",
]
+ if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
+ env.MergeFlags(env["GCONF_FLAGS"])
+
SConscript(dirs = [
"Avatars",
"Base",
@@ -333,6 +336,8 @@ if env["SCONS_STAGE"] == "build" :
continue
if file.startswith("CAres") or file.startswith("LibXML") or file.startswith("Expat") or file.startswith("foreach") or file.startswith("Log.h") or file.startswith("format.h") :
continue
+ if file.find("ProxyProvider") != -1 :
+ continue
swiften_header += "#include <" + include + ">\n"
swiften_includes.append(include)
for file in ["EventLoop/SimpleEventLoop.h"] :