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
@@ -1,21 +1,21 @@
 import os
 
 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, "") :
 			myenv["ENV"][i] = os.environ[i]
 
 	tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
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
@@ -1,17 +1,17 @@
 import os
 
 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",
 			"BoostConnectionTest.cpp",
 			"DomainNameResolverTest.cpp",
 		])
diff --git a/Swiften/SConscript b/Swiften/SConscript
index d896cd8..6ebc865 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -3,19 +3,19 @@ Import("env")
 env["SWIFTEN_FLAGS"] = {
 		"LIBPATH": [Dir(".")],
 		"LIBS": ["Swiften"]
 	}
 
 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",
 		"Avatars/AvatarStorage.cpp",
 		"Client/Client.cpp",
 		"Client/ClientSession.cpp",