summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-16 18:21:45 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-16 18:21:45 (GMT)
commit4d182bfb1621687a818f0a80fc77a392f381c5da (patch)
tree73db7e9349e4edc786d4974209136fa0ec6e98cb /Swiften/QA/ClientTest
parentdfb2231c337a00e10e93e6cd61fd004db772c51d (diff)
downloadswift-contrib-4d182bfb1621687a818f0a80fc77a392f381c5da.zip
swift-contrib-4d182bfb1621687a818f0a80fc77a392f381c5da.tar.bz2
Fix inconsistent build flags with test=X.
Diffstat (limited to 'Swiften/QA/ClientTest')
-rw-r--r--Swiften/QA/ClientTest/SConscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index a9d9a19..f22e89d 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -4,15 +4,15 @@ Import("env")
if env["TEST"] :
myenv = env.Clone()
- myenv.MergeFlags(env["SWIFTEN_FLAGS"])
- myenv.MergeFlags(env["CPPUNIT_FLAGS"])
- myenv.MergeFlags(env["LIBIDN_FLAGS"])
- myenv.MergeFlags(env["BOOST_FLAGS"])
- myenv.MergeFlags(env["SQLITE_FLAGS"])
- myenv.MergeFlags(env["ZLIB_FLAGS"])
- myenv.MergeFlags(env["OPENSSL_FLAGS"])
- myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
- myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv["SQLITE_FLAGS"])
+ myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+ myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+ myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
+ myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
if os.environ.get(i, "") :