Revert "avahi: Build without dbus"

This reverts commit 5221a852e80526d188306b05202e595616f0c065.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index bf8a387c3886888e6931a691ef0a1531a891868a..a394cc20a6b5ed168354258298ca3e5a8c5951e2 100644 (file)
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -7,6 +7,7 @@ etc/avahi/services
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/smb.service
 etc/avahi/services/ssh.service
+etc/dbus-1/system.d/avahi-dbus.conf
 etc/rc.d/init.d/avahi
 usr/bin/avahi-browse
 usr/bin/avahi-browse-domains
@@ -89,6 +90,16 @@ usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
 usr/share/avahi
 usr/share/avahi/avahi-service.dtd
+#usr/share/dbus-1/interfaces
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
 #usr/share/locale/ach
 #usr/share/locale/ach/LC_MESSAGES
 #usr/share/locale/ach/LC_MESSAGES/avahi.mo

diff --git a/lfs/avahi b/lfs/avahi
index c476e7e4573e14c281cc076658bb0adc634406a9..cc1d5c3369c9f1c67bdadd4206996f3837575803 100644 (file)
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
 PAK_VER    = 5
 
-DEPS      = "libdaemon"
+DEPS      = "dbus libdaemon"
 
 CFLAGS    += -U_FORTIFY_SOURCE
 
@@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-gtk \
                --disable-gtk3 \
                --disable-pygtk \
-               --disable-dbus \
                --disable-python \
                --disable-pygobject \
                --disable-python-dbus \