From patchwork Sat Apr 28 21:16:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 155696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 44691B6FCC for ; Sun, 29 Apr 2012 07:17:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EF655902D3; Sat, 28 Apr 2012 21:17:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8HDNS3tEbhly; Sat, 28 Apr 2012 21:17:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 99A2A908A4; Sat, 28 Apr 2012 21:17:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4276C8F753 for ; Sat, 28 Apr 2012 21:17:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2EB158F599 for ; Sat, 28 Apr 2012 21:17:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kRb8q2kL7yjZ for ; Sat, 28 Apr 2012 21:17:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9832E9058A for ; Sat, 28 Apr 2012 21:17:09 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1SOF0d-0000ZF-My; Sat, 28 Apr 2012 23:17:07 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.77) (envelope-from ) id 1SOF0d-0004M1-CG; Sat, 28 Apr 2012 23:16:51 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sat, 28 Apr 2012 23:16:20 +0200 Message-Id: <1335647781-16536-3-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1335647781-16536-1-git-send-email-arnout@mind.be> References: <1335647781-16536-1-git-send-email-arnout@mind.be> Subject: [Buildroot] [PATCH 2/3] avahi: use CONF_ENABLE and CONF_PKG_ENABLE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Arnout Vandecappelle (Essensium/Mind)" Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/avahi/avahi.mk | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 32e3df7..64a83db 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -91,31 +91,12 @@ else AVAHI_CONF_OPT += --disable-libdaemon endif -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) -AVAHI_DEPENDENCIES += expat -AVAHI_CONF_OPT += --with-xml=expat -else -AVAHI_CONF_OPT += --with-xml=none -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -AVAHI_DEPENDENCIES += dbus -else -AVAHI_CONF_OPT += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -AVAHI_DEPENDENCIES += libglib2 -else -AVAHI_CONF_OPT += --disable-glib --disable-gobject -endif - -ifeq ($(BR2_PACKAGE_LIBGLADE),y) -AVAHI_DEPENDENCIES += libglade -else -AVAHI_CONF_OPT += --disable-gtk -endif +$(eval $(call CONF_ENABLE,AVAHI,$(BR2_PACKAGE_AVAHI_DAEMON),expat,--with-xml=expat,--with-xml=none)) +$(eval $(call CONF_PKG_ENABLE,AVAHI,dbus)) +$(eval $(call CONF_PKG_ENABLE,AVAHI,libglib2,--enable-glib --enable-gobject,--disable-glib --disable-gobject)) +$(eval $(call CONF_PKG_ENABLE,AVAHI,libglade,gtk)) +$(eval $(call CONF_PKG_ENABLE,AVAHI,python)) ifeq ($(BR2_PACKAGE_PYTHON),y) AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \ am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ @@ -124,11 +105,6 @@ AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \ am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ py_cv_mod_socket_=yes - -AVAHI_DEPENDENCIES += python -AVAHI_CONF_OPT += --enable-python -else -AVAHI_CONF_OPT += --disable-python endif ifeq ($(BR2_PACKAGE_LIBINTL),y)