From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 2/2] configure: Allow to disable man page building
Date: Tue, 16 Jan 2018 17:38:07 +0100 [thread overview]
Message-ID: <20180116163807.13276-3-phil@nwl.cc> (raw)
In-Reply-To: <20180116163807.13276-1-phil@nwl.cc>
Aparently there are distributions which come with incompatible docbook
implementations. On those, forced man page creating if required binaries
are found leads to build failure.
Allow them to conveniently disable man page output instead of having to
pass undocumented variables to configure.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
configure.ac | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 22fb293c47035..1d588d5d37773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,12 @@ AC_ARG_ENABLE([debug],
AC_SUBST(with_debug)
AM_CONDITIONAL([BUILD_DEBUG], [test "x$with_debug" != xno])
+AC_ARG_ENABLE([man-doc],
+ AS_HELP_STRING([--disable-man-doc], [Disable man page documentation]),
+ AS_IF([test "x$enable_man_doc" = "xno"], [enable_man_doc=no],
+ [enable_man_doc=yes]), [enable_man_doc=yes])
+AM_CONDITIONAL([BUILD_MAN], [test "x$enable_man_doc" == "xyes" ])
+
AC_ARG_ENABLE([pdf-doc],
AS_HELP_STRING([--enable-pdf-doc], [Enable PDF documentation]),
AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no],
@@ -59,18 +65,20 @@ fi
AM_PROG_AR
AM_PROG_LIBTOOL
-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_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])]
- )]
- )]
-)
-AC_SUBST(DB2MAN)
-AM_CONDITIONAL([BUILD_MAN], [test -n "$DB2MAN"])
+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_WARN([docbookx2-man/db2x_docbook2man not found, no manpages will be built])]
+ )]
+ )]
+ )
+ AC_SUBST(DB2MAN)
+])
AM_COND_IF([BUILD_PDF], [
AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no])
@@ -161,5 +169,6 @@ nft configuration:
cli support: ${with_cli}
enable debugging symbols: ${with_debug}
use mini-gmp: ${with_mini_gmp}
+ enable man page: ${enable_man_doc}
enable pdf documentation: ${enable_pdf_doc}
libxtables support: ${with_libxtables}"
--
2.15.1
prev parent reply other threads:[~2018-01-16 16:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 16:38 [nft PATCH 0/2] Allow to disable man page output Phil Sutter
2018-01-16 16:38 ` [nft PATCH 1/2] configure: Fix help text regarding --enable-debug Phil Sutter
2018-01-16 16:38 ` Phil Sutter [this message]
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=20180116163807.13276-3-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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).