1 files changed, 29 insertions, 16 deletions
diff --git a/Swiften/Network/SConscript b/Swiften/Network/SConscript
index b742bfe..ea0fb62 100644
--- a/Swiften/Network/SConscript
+++ b/Swiften/Network/SConscript
@@ -2,6 +2,10 @@ Import("swiften_env")
 
 myenv = swiften_env.Clone()
 
+if myenv.get("unbound", False) :
+   myenv.MergeFlags(myenv.get("UNBOUND_FLAGS", {}))
+   myenv.MergeFlags(myenv.get("LDNS_FLAGS", {}))
+
 sourceList = [
 			"ProxiedConnection.cpp",
 			"HTTPConnectProxiedConnection.cpp",
@@ -30,9 +34,6 @@ sourceList = [
 			"DomainNameResolver.cpp",
 			"DomainNameAddressQuery.cpp",
 			"DomainNameServiceQuery.cpp",
-			"PlatformDomainNameResolver.cpp",
-			"PlatformDomainNameServiceQuery.cpp",
-			"PlatformDomainNameAddressQuery.cpp",
 			"StaticDomainNameResolver.cpp",
 			"HostAddress.cpp",
 			"HostAddressPort.cpp",
@@ -53,8 +54,16 @@ sourceList = [
 			"NATTraversalRemovePortForwardingRequest.cpp",
 			"NATTraversalInterface.cpp",
 	]
-		
-if myenv["PLATFORM"] == "darwin" :
+
+if myenv.get("unbound", False) :
+	myenv.Append(CPPDEFINES = "USE_UNBOUND")
+	sourceList.append("UnboundDomainNameResolver.cpp")
+else :
+	sourceList.append("PlatformDomainNameResolver.cpp")
+	sourceList.append("PlatformDomainNameServiceQuery.cpp")
+	sourceList.append("PlatformDomainNameAddressQuery.cpp")
+
+if myenv["PLATFORM"] == "darwin" and myenv["target"] != "android":
 	myenv.Append(FRAMEWORKS = ["CoreServices", "SystemConfiguration"])
 	sourceList += [ "MacOSXProxyProvider.cpp" ]
 	sourceList += [ "UnixNetworkEnvironment.cpp" ]
@@ -72,20 +81,24 @@ else :
 
 objects = myenv.SwiftenObject(sourceList)
 
-if myenv["experimental"] :
+if myenv["experimental"] :	
 	# LibNATPMP classes
-	natpmp_env = myenv.Clone()
-	natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", []))
-	objects += natpmp_env.SwiftenObject([
-				"NATPMPInterface.cpp",
-			])
+	if myenv.get("HAVE_LIBNATPMP", False) :
+		natpmp_env = myenv.Clone()	
+		natpmp_env.Append(CPPDEFINES = natpmp_env["LIBNATPMP_FLAGS"].get("INTERNAL_CPPDEFINES", []))
+		myenv.Append(CPPDEFINES = ["HAVE_LIBNATPMP"])
+		objects += natpmp_env.SwiftenObject([
+					"NATPMPInterface.cpp",
+				])
 
 	# LibMINIUPnP classes
-	upnp_env = myenv.Clone()
-	upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", []))
-	objects += upnp_env.SwiftenObject([
-				"MiniUPnPInterface.cpp",
-			])
+	if myenv.get("HAVE_LIBMINIUPNPC", False) :
+		upnp_env = myenv.Clone()
+		upnp_env.Append(CPPDEFINES = upnp_env["LIBMINIUPNPC_FLAGS"].get("INTERNAL_CPPDEFINES", []))
+		myenv.Append(CPPDEFINES = ["HAVE_LIBMINIUPNPC"])
+		objects += upnp_env.SwiftenObject([
+					"MiniUPnPInterface.cpp",
+				])
 	objects += myenv.SwiftenObject([
 				"PlatformNATTraversalWorker.cpp",
 			])