12 files changed, 25 insertions, 14 deletions
diff --git a/QA/SConscript b/QA/SConscript
index 32aece4..feafb0c 100644
--- a/QA/SConscript
+++ b/QA/SConscript
@@ -1 +1,4 @@
-SConscript("UnitTest/SConscript")
+SConscript(dirs = [
+    "UnitTest",
+    "Swiften"
+  ])
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/QA/Swiften/ClientTest/ClientTest.cpp
index b628a8d..b628a8d 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/QA/Swiften/ClientTest/ClientTest.cpp
diff --git a/Swiften/QA/ClientTest/SConscript b/QA/Swiften/ClientTest/SConscript
index cd48169..164de57 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/QA/Swiften/ClientTest/SConscript
@@ -8,9 +8,10 @@ myenv.MergeFlags(env["CPPUNIT_FLAGS"])
 myenv.MergeFlags(env["LIBIDN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
 myenv.MergeFlags(env["SQLITE_FLAGS"])
-myenv.MergeFlags(env["EXPAT_FLAGS"])
 myenv.MergeFlags(env["ZLIB_FLAGS"])
 myenv.MergeFlags(env["OPENSSL_FLAGS"])
+myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
+myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
 
 for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
 	if os.environ.get(i, "") :
diff --git a/Swiften/QA/NetworkTest/.gitignore b/QA/Swiften/NetworkTest/.gitignore
index 5a3caca..5a3caca 100644
--- a/Swiften/QA/NetworkTest/.gitignore
+++ b/QA/Swiften/NetworkTest/.gitignore
diff --git a/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp b/QA/Swiften/NetworkTest/BoostConnectionServerTest.cpp
index a5c51aa..a5c51aa 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionServerTest.cpp
+++ b/QA/Swiften/NetworkTest/BoostConnectionServerTest.cpp
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/QA/Swiften/NetworkTest/BoostConnectionTest.cpp
index 9929eaa..9929eaa 100644
--- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp
+++ b/QA/Swiften/NetworkTest/BoostConnectionTest.cpp
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/QA/Swiften/NetworkTest/DomainNameResolverTest.cpp
index 8968efd..8968efd 100644
--- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp
+++ b/QA/Swiften/NetworkTest/DomainNameResolverTest.cpp
diff --git a/Swiften/QA/NetworkTest/SConscript b/QA/Swiften/NetworkTest/SConscript
index 606c02e..fa5122b 100644
--- a/Swiften/QA/NetworkTest/SConscript
+++ b/QA/Swiften/NetworkTest/SConscript
@@ -3,6 +3,7 @@ import os
 Import("env")
 
 myenv = env.Clone()
+myenv.MergeFlags(env["CHECKER_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["CPPUNIT_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
@@ -12,7 +13,6 @@ tester = myenv.Program("NetworkTest", [
 		"BoostConnectionServerTest.cpp",
 		"BoostConnectionTest.cpp",
 		"DomainNameResolverTest.cpp",
-		"#/QA/UnitTest/checker.cpp"
 	])
 clientTest = myenv.Alias("NetworkTest", tester, env.get("TEST_RUNNER", "") + tester[0].abspath)
 env.AlwaysBuild(clientTest)
diff --git a/Swiften/QA/SConscript b/QA/Swiften/SConscript
index 6ee7365..6ee7365 100644
--- a/Swiften/QA/SConscript
+++ b/QA/Swiften/SConscript
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 4e82443..5480420 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -2,8 +2,18 @@ import os
 
 Import("env")
 
+# The checker
+checker_env = env.Clone()
+checker_env.MergeFlags(env["CPPUNIT_FLAGS"])
+checker_env.Library("Checker", "checker.cpp")
+env["CHECKER_FLAGS"] = { 
+    "LIBS": ["Checker"],
+    "LIBPATH": [Dir(".")]
+  }
+
 if "check" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
 	myenv = env.Clone()
+	myenv.MergeFlags(env["CHECKER_FLAGS"])
 	myenv.MergeFlags(env["SLIMBER_FLAGS"])
 	myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 	myenv.MergeFlags(env["SWIFTEN_FLAGS"])
@@ -18,7 +28,7 @@ if "check" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
 		myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
 	if env.get("HAVE_EXPAT") :
 		myenv.Append(CPPDEFINES = ["HAVE_EXPAT"])
-	checker = myenv.Program("checker", ["checker.cpp"] + env["UNITTEST_SOURCES"])
+	checker = myenv.Program("checker", env["UNITTEST_SOURCES"])
 	for i in ["HOME", "USERPROFILE", "APPDATA"]:
 		if os.environ.get(i, "") :
 			myenv["ENV"][i] = os.environ[i]
diff --git a/SConstruct b/SConstruct
index 833f3f0..bbb0aca 100644
--- a/SConstruct
+++ b/SConstruct
@@ -252,14 +252,14 @@ elif env.get("bonjour", False) :
 ################################################################################
 
 # Third-party modules
-SConscript([
-		"3rdParty/CppUnit/SConscript",
-		"3rdParty/Boost/SConscript",
-		"3rdParty/LibIDN/SConscript",
-		"3rdParty/SQLite/SConscript"])
+SConscript(dirs = [
+		"3rdParty/CppUnit",
+		"3rdParty/Boost",
+		"3rdParty/LibIDN",
+		"3rdParty/SQLite"])
 
 # Swiften
-SConscript("Swiften/SConscript")
+SConscript(dirs = "Swiften")
 
 # Projects
 for dir in os.listdir(".") :
@@ -270,8 +270,7 @@ for dir in os.listdir(".") :
 		SConscript(sconscript)
 
 # QA
-SConscript("QA/SConscript")
-
+SConscript(dirs = "QA")
 
 ################################################################################
 # Print summary
diff --git a/Swiften/SConscript b/Swiften/SConscript
index c849927..abd9a44 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -263,5 +263,3 @@ env.Append(UNITTEST_SOURCES = [
 		File("StringCodecs/UnitTest/Base64Test.cpp"),
 		File("StringCodecs/UnitTest/SHA1Test.cpp"),
 	])
-
-SConscript("QA/SConscript")