[PATCH nft 1/2] configure.ac: Fix a2x check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* 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@xxxxxxxx>
---
 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




[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux