From 52835dd30110d51a839872f198eef3b12e369850 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 7 Sep 2011 21:23:48 +0100 Subject: avahi: only use gtk if DISTRO_FEATURES includes x11 Otherwise avahi isn't buildable for an x11-less DISTRO. (From OE-Core rev: fa8dad209247b780590bc8476b5b16e6608d7907) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/avahi/avahi.inc') diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index dc7a5aee69..24ea458e6e 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,7 +14,8 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" +X11DEPENDS = "gtk+ libglade" +DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ @@ -30,6 +31,7 @@ EXTRA_OECONF = "--with-distro=debian \ --disable-mono \ --disable-monodoc \ --disable-gtk3 \ + ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \ --disable-qt3 \ --disable-qt4 \ --disable-python \ -- cgit v1.2.3-54-g00ecf