Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-22 21:15:00 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-22 21:15:00 (GMT) |
| commit | bfe07e82cd79d56f1327425ce3e6c8a84908421b (patch) | |
| tree | e25497309d50145ac78162d7b0caffef7170e066 | |
| parent | 3694f2b0db159844c4ed595202c07b6f1fb96c80 (diff) | |
| download | swift-bfe07e82cd79d56f1327425ce3e6c8a84908421b.zip swift-bfe07e82cd79d56f1327425ce3e6c8a84908421b.tar.bz2 | |
Don't check for Avahi on OS X.
| -rw-r--r-- | BuildTools/SCons/SConstruct | 7 | ||||
| -rw-r--r-- | Slimber/CLI/SConscript | 2 |
2 files changed, 5 insertions, 4 deletions
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"]) |