summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2012-03-25 09:48:30 (GMT)
committerTobias Markmann <tm@ayena.de>2012-03-25 19:26:27 (GMT)
commit6ba3a3b5a5d0cd2cac3d5c623527bd0b57c1abcb (patch)
tree80eb955b5ddff0bfc316f87ac8ca3a686ed5f1eb
parent27c05027c9039006a5e8adea6086d3a159337037 (diff)
downloadswift-contrib-tobias/unbound.zip
swift-contrib-tobias/unbound.tar.bz2
Change Swiften dep_modules sequence to fix linking issues.tobias/unbound
-rw-r--r--Swiften/SConscript5
1 files changed, 1 insertions, 4 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 42c1588..f2f583d 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -6,10 +6,7 @@ Import("env")
# Flags
################################################################################
-swiften_dep_modules = ["BOOST", "GCONF", "LIBIDN", "ZLIB", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP"]
-
-if env["unbound"] :
- swiften_dep_modules.extend(["LDNS", "UNBOUND"])
+swiften_dep_modules = ["BOOST", "GCONF", "LIBIDN", "ZLIB", "LDNS", "UNBOUND", "OPENSSL", "LIBXML", "EXPAT", "AVAHI", "LIBMINIUPNPC", "LIBNATPMP"]
if env["SCONS_STAGE"] == "flags" :
env["SWIFTEN_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "swift")