From 6ba3a3b5a5d0cd2cac3d5c623527bd0b57c1abcb Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Sun, 25 Mar 2012 11:48:30 +0200 Subject: Change Swiften dep_modules sequence to fix linking issues. 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") -- cgit v0.10.2-6-g49f6