From: Luis Ressel <aranea@aixah.de>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft 1/2] configure.ac: Fix a2x check
Date: Sun, 17 Mar 2019 18:19:11 +0100 [thread overview]
Message-ID: <20190317171912.14194-1-aranea@aixah.de> (raw)
* If enable_man_doc is set, but a2x can't be found, configure should
fail instead of silently disabling man page creation.
* The AS_IF block checking $need_a2x is never active (need_a2x has been
removed from configure.ac in 13e44a608 and a277479dc).
* AC_CHECK_PROG(VAR, ...) is a noop if VAR is already set, allowing the
user to explicitly specify the (path to the) binary in VAR. Adjust the
AS_IF check to account for this.
Signed-off-by: Luis Ressel <aranea@aixah.de>
---
configure.ac | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9bbd9d3..ccf8db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,12 +48,9 @@ fi
AM_PROG_AR
AM_PROG_LIBTOOL
-AC_CHECK_PROG(A2X, [a2x], [a2x])
-AM_CONDITIONAL([BUILD_MAN], [test -n "$A2X"])
-
-AS_IF([test "$need_a2x" = "yes"], [
- AC_CHECK_PROG(A2X, [a2x], [found], [no])
- AS_IF([test "$A2X" != "found"],
+AS_IF([test "x$enable_man_doc" = "xyes"], [
+ AC_CHECK_PROG(A2X, [a2x], [a2x], [no])
+ AS_IF([test "$A2X" = "no"],
[AC_MSG_ERROR([a2x not found, please install asciidoc])])
])
--
2.21.0
next reply other threads:[~2019-03-17 17:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 17:19 Luis Ressel [this message]
2019-03-17 17:19 ` [PATCH nft 2/2] configure.ac: Clean up AC_ARG_{WITH,ENABLE} invocations Luis Ressel
2019-03-17 17:56 ` Jan Engelhardt
2019-03-17 18:18 ` Luis Ressel
2019-03-18 14:52 ` [PATCH nft 1/2] configure.ac: Fix a2x check Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190317171912.14194-1-aranea@aixah.de \
--to=aranea@aixah.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).