samba: avahi support needs avahi-daemon / dbus

./configure checks for libavahi-client.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 0b24e51a9e90b44493c7ca05f7cbc2207495389c..e68adf000342d9b64b7bad054298c9256ec0d132 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,7 +18,7 @@
        fs: old-style squashfs for big endian archs fixed.
 
        Updated/fixed packages: busybox, imagemagick, libglib2, lua,
-       luafilesystem, lzo, netcat, php, qt, startup-notification,
+       luafilesystem, lzo, netcat, php, qt, samba, startup-notification,
        sysvinit, util-linux
 
        Issues resolved (http://bugs.uclibc.org):

diff --git a/package/samba/Config.in b/package/samba/Config.in
index a7a0b34df3763b6f2e3b34df79ff55deb99ec5f7..58a84f3d623f61ec9901bbe5618545818e4ac915 100644 (file)
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -241,12 +241,13 @@ config BR2_PACKAGE_SAMBA_AVAHI
        bool "support avahi"
        default y
        depends on BR2_PACKAGE_SAMBA
-       depends on BR2_PACKAGE_AVAHI
+       depends on BR2_PACKAGE_AVAHI_DAEMON
+       depends on BR2_PACKAGE_DBUS
        help
          Include support for avahi
 
-comment "support avahi - disabled (requires avahi)"
-       depends on !BR2_PACKAGE_AVAHI
+comment "support avahi - disabled (requires avahi-daemon/dbus)"
+       depends on !BR2_PACKAGE_AVAHI_DAEMON || !BR2_PACKAGE_DBUS
 
 config BR2_PACKAGE_SAMBA_GAMIN
        bool "support gamin"