From: John Crispin <john@openwrt.org>
Date: Fri, 24 Aug 2012 06:16:36 +0000 (+0000)
Subject: [packages] avahi: remove inappropriate dependency on dbus in Changeset 32330
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=60d471aac96b954d5e367454f1fce22795158b3d

[packages] avahi: remove inappropriate dependency on dbus in Changeset 32330

This patch fixes an issue reported by Damiano Albani.
Changeset 32330, while fixing one bug, unfortunately introduces another one -- it makes
avahi-daemon always dependent on the dbus package, causing dbus to be
loaded even when it's not needed.

This patch makes avahi-daemon dependent on dbus only is avahi dbus support has been selected.

Signed-off-by Mike Brady <mikebrady@eircom.net>

SVN-Revision: 33267
---

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 2845c559ba..b906d0aa6b 100644
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -16,7 +16,7 @@ endif
 
 PKG_NAME:=avahi
 PKG_VERSION:=0.6.31
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -94,7 +94,11 @@ endef
 define Package/avahi-daemon
   $(call Package/avahi/Default)
   SUBMENU:=IP Addresses and Names
+  ifeq ($(BUILD_VARIANT),dbus)
   DEPENDS:=+libavahi +libexpat +librt +libdbus
+  else
+  DEPENDS:=+libavahi +libexpat +librt
+  endif
   TITLE+= (daemon)
 endef