From patchwork Sun Sep 1 13:54:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 271592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 5AC912C008A for ; Sun, 1 Sep 2013 23:58:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BDE04931BA; Sun, 1 Sep 2013 13:59:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qbjgeVoL76Gr; Sun, 1 Sep 2013 13:59:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D4A393130; Sun, 1 Sep 2013 13:59:10 +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 016131BF841 for ; Sun, 1 Sep 2013 13:58:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EC1DB8AD8F for ; Sun, 1 Sep 2013 13:58:20 +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 d+vdC64apvzQ for ; Sun, 1 Sep 2013 13:58:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by whitealder.osuosl.org (Postfix) with ESMTP id 22F7A88CF0 for ; Sun, 1 Sep 2013 13:58:20 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 73077859; Sun, 1 Sep 2013 15:55:15 +0200 (CEST) Received: from localhost (unknown [37.160.118.199]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0717281F for ; Sun, 1 Sep 2013 15:55:14 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 1 Sep 2013 15:54:51 +0200 Message-Id: <1378043691-28892-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] neon: disable webdav when no XML support is available 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 Since 9169810a9bd97c99d8b7a0e8aadabdcca3883e99 ("neon: replace 'choice' for XML library with two options") the option BR2_PACKAGE_NEON_NOXML no longer exists. However, it was not taken into account properly within neon.mk, as this option was still used to disable webdav support when no XML library has been selected. Fixes: http://autobuild.buildroot.org/results/7ed/7ed657570d83b28389dd8c01ffdd895d2e8d145f/ Signed-off-by: Thomas Petazzoni --- package/neon/neon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 1915e6c..2edc6b2 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -42,7 +42,7 @@ else NEON_CONF_OPT += --with-libxml2=no endif -ifeq ($(BR2_PACKAGE_NEON_NOXML),y) +ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),) # webdav needs xml support NEON_CONF_OPT += --disable-webdav endif