diff mbox series

[nft,v2,3/7] configure.ac: docbook2man invalid syntax error

Message ID 20180619214656.25636-4-eric@regit.org
State Accepted
Delegated to: Pablo Neira
Headers show
Series python install and build fixes | expand

Commit Message

Eric Leblond June 19, 2018, 9:46 p.m. UTC 
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 mbox series

Patch

diff --git a/configure.ac b/configure.ac
index 4d21cb4..9f5d0f9 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)