[PATCH 1/1 rev. 1] nft: configure.ac: Replace magic dblatex dep.

[PATCH 1/1 rev. 1] nft: configure.ac: Replace magic dblatex dep.

[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.

Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
---
 configure.ac | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e7edcf..877f530 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([pdf-doc],
+	      AS_HELP_STRING([--enable-pdf-doc], [Enable PDF documentation]),
+	      AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no],
+	      [enable_pdf_doc=yes]), [enable_pdf_doc=no])
+AM_CONDITIONAL([BUILD_PDF], [test "x$enable_pdf_doc" == "xyes" ])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_MKDIR_P
@@ -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}"
-- 
2.9.0

Re: [PATCH 1/1 rev. 1] nft: configure.ac: Replace magic dblatex dep.

[Nick Vinson]

[-- Attachment #1.1: Type: text/plain, Size: 2152 bytes --]

The difference between this patch and the original one is that this
patch defaults pdf documentation generation to 'disabled' instead of
'enabled'.

Thanks,
Nicholas Vinson

On 07/02/2016 11:34 AM, Nicholas Vinson wrote:
> 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.
> 
> Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
> ---
>  configure.ac | 19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0e7edcf..877f530 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([pdf-doc],
> +	      AS_HELP_STRING([--enable-pdf-doc], [Enable PDF documentation]),
> +	      AS_IF([test "x$enable_pdf_doc" = "xno"], [enable_pdf_doc=no],
> +	      [enable_pdf_doc=yes]), [enable_pdf_doc=no])
> +AM_CONDITIONAL([BUILD_PDF], [test "x$enable_pdf_doc" == "xyes" ])
> +
>  # Checks for programs.
>  AC_PROG_CC
>  AC_PROG_MKDIR_P
> @@ -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}"
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/1 rev. 1] nft: configure.ac: Replace magic dblatex dep.

[Pablo Neira Ayuso]

On Sat, Jul 02, 2016 at 11:37:50AM -0700, Nick Vinson wrote:
> The difference between this patch and the original one is that this
> patch defaults pdf documentation generation to 'disabled' instead of
> 'enabled'.

Thanks for explaining, I have applied this.