summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-11-28 09:48:01 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-28 09:48:01 (GMT)
commit34eb7f55fbdd1566ee117738f3a423354ce1b45c (patch)
treeb239d9b7966f0b18e39aeeed3c1c76e720760f3c /Swiften
parent48ffe88bf768fd762a3bcb52717a9079ec803de5 (diff)
downloadswift-contrib-34eb7f55fbdd1566ee117738f3a423354ce1b45c.zip
swift-contrib-34eb7f55fbdd1566ee117738f3a423354ce1b45c.tar.bz2
Replace slightly-too-magic MergeFlags by our own UseFlags.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/QA/ClientTest/SConscript4
-rw-r--r--Swiften/QA/SConscript2
-rw-r--r--Swiften/SConscript6
3 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index 31c4011..15a68c6 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -4,8 +4,8 @@ Import("env")
if env["TEST"] :
myenv = env.Clone()
- myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
- myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
if ARGUMENTS.get(i.lower(), False) :
diff --git a/Swiften/QA/SConscript b/Swiften/QA/SConscript
index b885909..4638d6c 100644
--- a/Swiften/QA/SConscript
+++ b/Swiften/QA/SConscript
@@ -7,4 +7,4 @@ SConscript(dirs = [
# "DNSSDTest",
"StorageTest",
"TLSTest",
- ]) \ No newline at end of file
+ ])
diff --git a/Swiften/SConscript b/Swiften/SConscript
index e81309e..080e88e 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -11,12 +11,12 @@ if env["SCONS_STAGE"] == "flags" :
swiften_env["LIBPATH"] = [Dir(".")]
swiften_env["LIBS"] = ["Swiften"]
dep_env = env.Clone()
- dep_env.MergeFlags(dep_env["PLATFORM_FLAGS"])
for module in ["BOOST", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT"] :
if env.get(module + "_BUNDLED", False) :
- swiften_env.MergeFlags(env.get(module + "_FLAGS", {}))
+ swiften_env.UseFlags(env.get(module + "_FLAGS", {}))
else :
- dep_env.MergeFlags(env.get(module + "_FLAGS", {}))
+ dep_env.UseFlags(env.get(module + "_FLAGS", {}))
+ dep_env.UseFlags(dep_env["PLATFORM_FLAGS"])
for var, e in [("SWIFTEN_FLAGS", swiften_env), ("SWIFTEN_DEP_FLAGS", dep_env)] :
env[var] = {