avahi: enable GTK support (required by OProfileUI)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4610 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 6 insertions, 5 deletions

diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc
index 090c4835f5..97bb2165b2 100644
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/packages/avahi/avahi.inc
@@ -5,7 +5,7 @@ SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat libdaemon dbus glib-2.0 gtk+"
 RRECOMMENDS = "libnss-mdns"
 RRECOMMENDS_avahi-daemon = "libnss-mdns"
 
@@ -16,7 +16,6 @@ inherit autotools pkgconfig update-rc.d
 EXTRA_OECONF = "--with-distro=debian \
              --with-avahi-priv-access-group=adm \
              --disable-gdbm \
-             --disable-gtk \
              --disable-mono \
              --disable-monodoc \
              --disable-qt3 \
@@ -24,10 +23,11 @@ EXTRA_OECONF = "--with-distro=debian \
              --disable-python \
              --disable-doxygen-doc"
 
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils libavahi-ui"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
+FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
 FILES_avahi-daemon = "${sbindir}/avahi-daemon \
                       ${sysconfdir}/avahi/avahi-daemon.conf \
                       ${sysconfdir}/avahi/hosts \
diff --git a/meta/packages/avahi/avahi_0.6.20.bb b/meta/packages/avahi/avahi_0.6.20.bb
index ca2ff90dc6..34bc54834a 100644
--- a/meta/packages/avahi/avahi_0.6.20.bb
+++ b/meta/packages/avahi/avahi_0.6.20.bb
@@ -1,10 +1,11 @@
 require avahi.inc
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r2"
+PR = "r3"
 
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
-                       ${sysconfdir}/avahi/avahi-autoipd.action"
+                       ${sysconfdir}/avahi/avahi-autoipd.action \
+                       ${sysconfdir}/dhcp3/*/avahi-autoipd"
 
 do_stage() {
         autotools_stage_all