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
parentdfb2231c337a00e10e93e6cd61fd004db772c51d (diff)
downloadswift-4d182bfb1621687a818f0a80fc77a392f381c5da.zip
swift-4d182bfb1621687a818f0a80fc77a392f381c5da.tar.bz2
Fix inconsistent build flags with test=X.
-rw-r--r--Swiften/QA/ClientTest/SConscript18
-rw-r--r--Swiften/QA/NetworkTest/SConscript10
-rw-r--r--Swiften/SConscript6
3 files changed, 17 insertions, 17 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, "") :
diff --git a/Swiften/QA/NetworkTest/SConscript b/Swiften/QA/NetworkTest/SConscript
index cf66a68..871df39 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/Swiften/QA/NetworkTest/SConscript
@@ -4,11 +4,11 @@ Import("env")
if env["TEST"] :
myenv = env.Clone()
- myenv.MergeFlags(env["CHECKER_FLAGS"])
- myenv.MergeFlags(env["SWIFTEN_FLAGS"])
- myenv.MergeFlags(env["CPPUNIT_FLAGS"])
- myenv.MergeFlags(env["BOOST_FLAGS"])
- myenv.MergeFlags(env["LIBIDN_FLAGS"])
+ myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+ myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+ myenv.MergeFlags(myenv["BOOST_FLAGS"])
+ myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
tester = myenv.Program("NetworkTest", [
"BoostConnectionServerTest.cpp",
diff --git a/Swiften/SConscript b/Swiften/SConscript
index d896cd8..6ebc865 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -6,13 +6,13 @@ env["SWIFTEN_FLAGS"] = {
}
swiften_env = env.Clone()
-swiften_env.MergeFlags(env["BOOST_FLAGS"])
+swiften_env.MergeFlags(swiften_env["BOOST_FLAGS"])
Export("swiften_env")
# TODO: Move all this to a submodule SConscript
myenv = swiften_env.Clone()
-myenv.MergeFlags(env["ZLIB_FLAGS"])
-myenv.MergeFlags(env["OPENSSL_FLAGS"])
+myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
sources = [
"Avatars/AvatarFileStorage.cpp",
"Avatars/AvatarManager.cpp",