From 330d8a6bcbeddc88a65622c03fd27cddde21a497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 12 Feb 2013 22:50:33 +0100
Subject: Include frameworks in swiften-config.

Also remove duplicates from frameworks list.

Change-Id: I769d3951677a180c90618dc6ae5b91d028c08e8a

diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 567ff83..cf4ef6a 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -78,7 +78,11 @@ else :
 Help(vars.GenerateHelpText(env))
 
 # Default environment variables
-env["PLATFORM_FLAGS"] = {}
+env["PLATFORM_FLAGS"] = {
+		"LIBPATH": [],
+		"LIBS": [],
+		"FRAMEWORKS": [],
+}
 
 # Default custom tools
 env.Tool("Test", toolpath = ["#/BuildTools/SCons/Tools"])
@@ -195,7 +199,6 @@ if env.get("mac105", 0) :
 			"-mmacosx-version-min=10.5", 
 			"-isysroot", "/Developer/SDKs/MacOSX10.5.sdk", 
 			"-arch", "i386"])
-	env.Append(FRAMEWORKS = ["Security"])
 if env.get("mac106", 0) :
 	assert(env["PLATFORM"] == "darwin")
 	env.Append(CCFLAGS = [
@@ -205,7 +208,6 @@ if env.get("mac106", 0) :
 			"-mmacosx-version-min=10.6", 
 			"-isysroot", "/Developer/SDKs/MacOSX10.6.sdk", 
 			"-arch", "i386"])
-	env.Append(FRAMEWORKS = ["Security"])
 
 if not env["assertions"] :
 	env.Append(CPPDEFINES = ["NDEBUG"])
@@ -257,7 +259,7 @@ if env["PLATFORM"] == "win32" :
 		env["SHLINKCOM"] = [env["SHLINKCOM"], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
 
 if env["PLATFORM"] == "darwin" and not env["target"] in ["iphone-device", "iphone-simulator", "xcode"] :
-	env.Append(FRAMEWORKS = ["IOKit", "AppKit", "SystemConfiguration", "Security", "SecurityInterface"])
+	env["PLATFORM_FLAGS"]["FRAMEWORKS"] += ["IOKit", "AppKit", "SystemConfiguration", "Security", "SecurityInterface"]
 
 # Testing
 env["TEST_TYPE"] = env["test"]
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index c7ec32e..691e9e5 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -23,7 +23,13 @@ swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"])
 cppflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")]))
 config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags)
 
-libflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_LIBDIRFLAGS"), swiften_env.subst("$_LIBFLAGS")]))
+libflags = replaceSwiftenPath(" ".join([
+		swiften_env.subst("$_LIBDIRFLAGS"), 
+		swiften_env.subst("$_LIBFLAGS"), 
+		swiften_env.subst("$_FRAMEWORKPATH"), 
+		swiften_env.subst("$_FRAMEWORKS"), 
+		swiften_env.subst("$_FRAMEWORKSFLAGS")
+	]))
 config_flags += cStringVariable(swiften_env, "LIBFLAGS", libflags)
 
 config_env = env.Clone()
-- 
cgit v0.10.2-6-g49f6