summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-08-29 19:35:36 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-08-29 19:35:36 (GMT)
commitc06b3891ff9ff2f6780e7547a54d2688dafa016c (patch)
tree9e786583f4caf498be07ef81084ab4130c0b0c2b
parent96c607c93a7a532d5a80329e2838fe131c1f2461 (diff)
downloadbuildroot-c06b3891ff9ff2f6780e7547a54d2688dafa016c.tar.gz
buildroot-c06b3891ff9ff2f6780e7547a54d2688dafa016c.tar.bz2
samba: avahi support needs avahi-daemon / dbus
./configure checks for libavahi-client. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/samba/Config.in7
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 0b24e51..e68adf0 100644
--- 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 a7a0b34..58a84f3 100644
--- 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"