]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
configure.ac: docbook2man invalid syntax error
authorEric Leblond <eric@regit.org>
Tue, 19 Jun 2018 21:46:52 +0000 (23:46 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 20 Jun 2018 11:51:41 +0000 (13:51 +0200)
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.

Signed-off-by: Eric Leblond <eric@regit.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
configure.ac

index 4d21cb47e227e6072163648aa9c20a63d4fceb3d..9f5d0f9a4236530d43f670ed2c1fa5fce323babd 100644 (file)
@@ -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)