nft: configure.ac: Replace magic dblatex dep.
PATCH 1/1 nft: configure.ac: Replace magic dblatex dep.
Add a configure switch to enable and disable PDF document generation. This switch is to replace the current method of automatically detecting dblatex and building the PDF documentation when present.
--- configure.ac | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
configure.ac +13 -6
@@ -22,6 +22,12 @@ AC_CONFIG_HEADER([config.h]) AC_DEFINE([_GNU_SOURCE], [], [Enable various GNU extensions]) AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros]) +AC_ARG_ENABLE([pdf-doc], + AS_HELP_STRING([--disable-pdf-doc], [Disable PDF documentation]), + AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no], + [enable_pdf_doc=yes]), [enable_pdf_doc=yes]) +AM_CONDITIONAL([BUILD_PDF], [test "x$enable_pdf_doc" == "xyes" ]) + AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Disable debugging]), AS_IF([test "x$enable_debug" = "xno"], [with_debug=no], [with_debug=yes]),
@@ -63,11 +69,11 @@ AS_IF([test "$DOCBOOK2X_MAN" != "no"], [DB2MAN="$DOCBOOK2X_MAN"], AC_SUBST(DB2MAN) AM_CONDITIONAL([BUILD_MAN], [test -n "$DB2MAN"]) -AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no]) -AS_IF([test "$DBLATEX" == "no"], - [AC_MSG_WARN([dblatex not found, no PDF manpages will be built])] -) -AM_CONDITIONAL([BUILD_PDF], [test "$DBLATEX" == "found"]) +AM_COND_IF([BUILD_PDF], [ + AC_CHECK_PROG(DBLATEX, [dblatex], [found], [no]) + AS_IF([test "$DBLATEX" == "no"], + [AC_MSG_ERROR([dblatex not found])]) +]) # Checks for libraries. PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
@@ -136,4 +142,5 @@ echo " nft configuration: cli support: ${with_cli} enable debugging: ${with_debug} - use mini-gmp: ${with_mini_gmp}" + use mini-gmp: ${with_mini_gmp} + enable pdf documentation: ${enable_pdf_doc}"
Signature · 1 line
2.9.0
Pablo Neira Ayuso
maintainerQuoted 3 lines · Nicholas Vinson
Add a configure switch to enable and disable PDF document generation. This switch is to replace the current method of automatically detecting dblatex and building the PDF documentation when present.
I know I mentioned it was better to default this to yes on the bugzilla report, but I noticed this will just break many existing automated build infrastructure for everyone that have silently skipped building this.
So could you reverse the logic? I'd suggest something like:
--enable-pdf-doc
so the PDF documentation building is disabled by default.
Thanks.
I reversed the logic. I'm also considering this thread closed. The new thread can be found with the subject "[PATCH 1/1 rev.1] nft:
configure.ac: Replace magic dblatex dep." If anyone could direct any further questions or comments to that thread, it would be much appreciated.
Thanks,
Nicholas Vinson
Quoted 18 lines · Pablo Neira Ayuso
Quoted 3 lines · Nicholas Vinson
Add a configure switch to enable and disable PDF document generation. This switch is to replace the current method of automatically detecting dblatex and building the PDF documentation when present.
I know I mentioned it was better to default this to yes on the bugzilla report, but I noticed this will just break many existing automated build infrastructure for everyone that have silently skipped building this.
So could you reverse the logic? I'd suggest something like:
--enable-pdf-doc
so the PDF documentation building is disabled by default.
Thanks.