From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.pbcl.net ([88.198.119.4] helo=hetzner.pbcl.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1R1Oju-00082i-K1 for openembedded-core@lists.openembedded.org; Wed, 07 Sep 2011 22:28:54 +0200 Received: from blundell.swaffham-prior.co.uk ([91.216.112.25] helo=[192.168.114.3]) by hetzner.pbcl.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1R1Of4-0002iM-76 for openembedded-core@lists.openembedded.org; Wed, 07 Sep 2011 22:23:54 +0200 From: Phil Blundell To: openembedded-core@lists.openembedded.org Date: Wed, 07 Sep 2011 21:23:48 +0100 Message-ID: <1315427028.4368.2.camel@lenovo.internal.reciva.com> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 Subject: [PATCH] avahi: only use gtk if DISTRO_FEATURES includes x11 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2011 20:28:54 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Otherwise avahi isn't buildable for an x11-less DISTRO. Signed-off-by: Phil Blundell --- meta/recipes-connectivity/avahi/avahi.inc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index dc7a5ae..24ea458 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 \ -- 1.7.4.1