From patchwork Mon Aug 13 03:58:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duncan Roe X-Patchwork-Id: 956808 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=optusnet.com.au Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41phm365hCz9s78 for ; Mon, 13 Aug 2018 13:58:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727300AbeHMGis (ORCPT ); Mon, 13 Aug 2018 02:38:48 -0400 Received: from mail108.syd.optusnet.com.au ([211.29.132.59]:58990 "EHLO mail108.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726447AbeHMGis (ORCPT ); Mon, 13 Aug 2018 02:38:48 -0400 Received: from dimstar.local.net (unknown [210.49.74.88]) by mail108.syd.optusnet.com.au (Postfix) with SMTP id 6C77D1A0398 for ; Mon, 13 Aug 2018 13:58:11 +1000 (AEST) Received: (qmail 19033 invoked by uid 501); 13 Aug 2018 03:58:10 -0000 From: Duncan Roe To: netfilter-devel@vger.kernel.org Subject: [PATCH] nft: Fix configure.ac so --enable-pdf-doc actually works Date: Mon, 13 Aug 2018 13:58:10 +1000 Message-Id: <20180813035810.18992-1-duncan_roe@optusnet.com.au> X-Mailer: git-send-email 2.9.0 X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.2 cv=I9sVfJog c=1 sm=1 tr=0 a=DRuhS6OGlO/VPiI5KpoYuA==:117 a=DRuhS6OGlO/VPiI5KpoYuA==:17 a=x7bEGLp0ZPQA:10 a=dapMudl6Dx4A:10 a=PO7r1zJSAAAA:8 a=viVRWJtMNvAILdjSzEcA:9 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove a duplicate test for a2x which always failed and fix the test for readline in libreadline which also always failed but somehow didn't get invoked. The PDF build only works in single-threaded make, so after a multi-threaded build fails one needs to run single-threaded e.g. make -j7 || make Signed-off-by: Duncan Roe --- configure.ac | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index c1c9035..8ea702d 100644 --- a/configure.ac +++ b/configure.ac @@ -62,13 +62,6 @@ AM_COND_IF([BUILD_PDF], [ AS_IF([test "$DBLATEX" == "no"], [AC_MSG_ERROR([dblatex not found])]) AS_IF([test -z "$A2X"], - [AC_MSG_ERROR([a2x not found])]) - [need_a2x=yes] -]) - -AS_IF([test "$need_a2x" = "yes"], [ - AC_CHECK_PROG(A2X, [a2x], [found], [no]) - AS_IF([test "$A2X" != "found"], [AC_MSG_ERROR([a2x not found, please install asciidoc])]) ]) @@ -88,7 +81,7 @@ AC_ARG_WITH([cli], [AS_HELP_STRING([--without-cli], [], [with_cli=yes]) AS_IF([test "x$with_cli" != xno], [ AC_CHECK_LIB([readline], [readline], , - AC_MSG_ERROR([No suitable version of libreadline found])) + AC_MSG_ERROR([No suitable version of libreadline found]), [-lncurses]) AC_DEFINE([HAVE_LIBREADLINE], [1], []) ]) AC_SUBST(with_cli)