From 2d8b89074c21627bd2c9c94357ca158868937da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 18 Jun 2011 13:11:39 +0200
Subject: Use UseFlags for compiling the unit test.


diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index 76abbcb..8cc43b9 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -8,21 +8,21 @@ if env["TEST"] :
 		env["UNITTEST_OBJECTS"] = []
 	if env["SCONS_STAGE"] == "test" :
 		myenv = env.Clone()
-		myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
-		myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
-		myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
-		myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
-		myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
-		myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
-		myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
-		myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
-		myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
-		myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
-		myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
-		myenv.MergeFlags(env.get("OPENSSL_FLAGS", ""))
-		myenv.MergeFlags(env["PLATFORM_FLAGS"])
+		myenv.UseFlags(env.get("CHECKER_FLAGS",""))
+		myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
+		myenv.UseFlags(env.get("LIMBER_FLAGS",""))
+		myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
+		myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
+		myenv.UseFlags(env.get("LIBIDN_FLAGS", ""))
+		myenv.UseFlags(env.get("BOOST_FLAGS", ""))
+		myenv.UseFlags(env.get("SQLITE_FLAGS", ""))
+		myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
+		myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
+		myenv.UseFlags(env.get("ZLIB_FLAGS", ""))
+		myenv.UseFlags(env.get("OPENSSL_FLAGS", ""))
+		myenv.UseFlags(env["PLATFORM_FLAGS"])
 		if env.get("HAVE_LIBXML") :
 			myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
 		if env.get("HAVE_EXPAT") :
-- 
cgit v0.10.2-6-g49f6