From bfe07e82cd79d56f1327425ce3e6c8a84908421b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 22 Apr 2010 23:15:00 +0200
Subject: Don't check for Avahi on OS X.


diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 844654d..f210650 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -257,9 +257,10 @@ else :
 	env["LIBIDN_BUNDLED"] = 1
 
 # Avahi
-if conf.CheckCHeader("avahi-client/client.h") and conf.CheckLib("avahi-client") :
-	env["HAVE_AVAHI"] = True
-	env["AVAHI_FLAGS"] = { "LIBS": ["avahi-client"] }
+if env["PLATFORM"] != "darwin" :
+	if conf.CheckCHeader("avahi-client/client.h") and conf.CheckLib("avahi-client") :
+		env["HAVE_AVAHI"] = True
+		env["AVAHI_FLAGS"] = { "LIBS": ["avahi-client"] }
 
 conf.Finish()
 
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index 87324ad..825660c 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -4,6 +4,6 @@ myenv = env.Clone()
 myenv.MergeFlags(env["SLIMBER_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env["AVAHI_FLAGS"])
+myenv.MergeFlags(env.get("AVAHI_FLAGS", {}))
 
 myenv.Program("slimber", ["main.cpp"])
-- 
cgit v0.10.2-6-g49f6