From cc502f8a172e24f407cad40a049334ff79ac952a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 30 Mar 2013 15:43:26 +0100
Subject: Fix HUNSPELL flags.

Change-Id: I5d728024dc52ec3279528e9f0bf4b0508c459107

diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index b30a79c..d91c5d4 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -9,8 +9,6 @@ if env["SCONS_STAGE"] == "flags" :
 			"LIBPATH": [Dir(".")],
 			"LIBS": ["SwifTools"]
 		}
-	if env["HAVE_HUNSPELL"] :
-		env.MergeFlags(env["HUNSPELL_FLAGS"])
 
 ################################################################################
 # Build
@@ -34,7 +32,7 @@ if env["SCONS_STAGE"] == "build" :
 		]
 	
 	if swiftools_env["HAVE_HUNSPELL"] :
-		swiftools_env.MergeFlags(swiftools_env["HUNSPELL_FLAGS"])
+		swiftools_env.UseFlags(swiftools_env["HUNSPELL_FLAGS"])
 		swiftools_env.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
 		sources += [
 			"SpellCheckerFactory.cpp",
@@ -50,7 +48,7 @@ if env["SCONS_STAGE"] == "build" :
 
 
 	if swiftools_env.get("HAVE_SPARKLE", 0) :
-		swiftools_env.MergeFlags(swiftools_env["SPARKLE_FLAGS"])
+		swiftools_env.UseFlags(swiftools_env["SPARKLE_FLAGS"])
 		swiftools_env.Append(CPPDEFINES = ["HAVE_SPARKLE"])
 		sources += ["AutoUpdater/SparkleAutoUpdater.mm"]
 
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 0bcab5e..53db2df 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -47,6 +47,7 @@ if myenv.get("HAVE_SNARL", False) :
 	myenv.Append(CPPDEFINES = ["HAVE_SNARL"])
 if myenv.get("HAVE_HUNSPELL", True):
 	myenv.Append(CPPDEFINES = ["HAVE_HUNSPELL"])
+	myenv.UseFlags(myenv["HUNSPELL_FLAGS"])
 if env["PLATFORM"] == "win32" :
 	myenv.Append(LIBS = ["cryptui"])
 myenv.UseFlags(myenv["PLATFORM_FLAGS"])
-- 
cgit v0.10.2-6-g49f6