From patchwork Mon Jun 18 12:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 930824 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=regit.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418VVG3Xhmz9s19 for ; Mon, 18 Jun 2018 22:17:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933942AbeFRMR5 (ORCPT ); Mon, 18 Jun 2018 08:17:57 -0400 Received: from home.regit.org ([37.187.126.138]:59346 "EHLO home.regit.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933501AbeFRMR5 (ORCPT ); Mon, 18 Jun 2018 08:17:57 -0400 X-Greylist: delayed 1578 seconds by postgrey-1.27 at vger.kernel.org; Mon, 18 Jun 2018 08:17:56 EDT Received: from [2001:bf0:c001:30:8590:e614:7c18:3fd4] (helo=tiger-3.in-berlin.de) by home.regit.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1fUt6W-0006SL-01; Mon, 18 Jun 2018 14:17:55 +0200 From: Eric Leblond To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Eric Leblond Subject: [PATCH nft] configure.ac: docbook2man invalid syntax error Date: Mon, 18 Jun 2018 14:17:47 +0200 Message-Id: <20180618121747.22158-1-eric@regit.org> X-Mailer: git-send-email 2.17.1 X-Spam-Score: -1.0 (-) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org docbook2man can not be used with the same option so let's remove it from the alternative. Fedora and debian seems to be fine with that. --- configure.ac | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 2a19733..88f0d74 100644 --- a/configure.ac +++ b/configure.ac @@ -56,14 +56,11 @@ AM_PROG_LIBTOOL AM_COND_IF([BUILD_MAN], [ AC_CHECK_PROG(DOCBOOK2X_MAN, [docbook2x-man], [docbook2x-man], [no]) - AC_CHECK_PROG(DOCBOOK2MAN, [docbook2man], [docbook2man], [no]) AC_CHECK_PROG(DB2X_DOCBOOK2MAN, [db2x_docbook2man], [db2x_docbook2man], [no]) AS_IF([test "$DOCBOOK2X_MAN" != "no"], [DB2MAN="$DOCBOOK2X_MAN"], - [AS_IF([test "$DOCBOOK2MAN" != "no"], [DB2MAN="$DOCBOOK2MAN"], - [AS_IF([test "$DB2X_DOCBOOK2MAN" != "no"], - [DB2MAN="$DB2X_DOCBOOK2MAN"], - [AC_MSG_ERROR([docbook2x-man/db2x_docbook2man not found, required for building man pages])] - )] + [AS_IF([test "$DB2X_DOCBOOK2MAN" != "no"], + [DB2MAN="$DB2X_DOCBOOK2MAN --xinclude"], + [AC_MSG_ERROR([docbook2x-man/db2x_docbook2man not found, required for building man pages])] )] ) AC_SUBST(DB2MAN)