From d4781a09b22013da45adf8e9e8b6484fd672a3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 30 Apr 2011 10:08:35 +0200
Subject: Rearrange 'myenv'.


diff --git a/Swiften/SConscript b/Swiften/SConscript
index 0662a60..b2dcdff 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -186,9 +186,6 @@ if env["SCONS_STAGE"] == "build" :
 			"StringCodecs/Hexify.cpp",
 		]
 
-	if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
-		env.MergeFlags(env["GCONF_FLAGS"])
-
 	SConscript(dirs = [
 			"Avatars",
 			"Base",
@@ -220,6 +217,8 @@ if env["SCONS_STAGE"] == "build" :
 		])
 
 	myenv = swiften_env.Clone()
+	if myenv["PLATFORM"] != "darwin" and myenv["PLATFORM"] != "win32" and myenv.get("HAVE_GCONF", 0) :
+		env.MergeFlags(env["GCONF_FLAGS"])
 	if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
 		myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
 	swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_NAME"], sources + swiften_env["SWIFTEN_OBJECTS"])
-- 
cgit v0.10.2-6-g49f6