configure: disable doxygen by default
Pablo Neira Ayuso
maintainerPATCH 1/1 configure: disable doxygen by default
doxygen documentation was not enabled in previous releases, let's recover this default behaviour. This is implicitly fixing up `make distcheck' to build the tarballs.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- configure.ac | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
configure.ac +6 -7
@@ -38,15 +38,14 @@ AC_CONFIG_FILES([Makefile src/Makefile utils/Makefile examples/Makefile AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen], [create doxygen documentation])], - [with_doxygen="$withval"], [with_doxygen=yes]) - -AS_IF([test "x$with_doxygen" != xno], [ + [], [with_doxygen=no]) +AS_IF([test "x$with_doxygen" = xyes], [ AC_CHECK_PROGS([DOXYGEN], [doxygen]) ]) AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) -if test -z "$DOXYGEN"; then - dnl Only run doxygen Makefile if doxygen installed - AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) -fi AC_OUTPUT + +echo " +libnetfilter_queue configuration: + doxygen: ${with_doxygen}"
Signature · 1 line
2.20.1
PATCH 1/1 configure: Make --help show doxygen is off by default
Signed-off-by Duncan Roe <[email protected]>
--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
@@ -37,7 +37,7 @@ AC_CONFIG_FILES([Makefile src/Makefile utils/Makefile examples/Makefile include/linux/Makefile include/linux/netfilter/Makefile]) AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen], - [create doxygen documentation])], + [create doxygen documentation [default=no]])], [], [with_doxygen=no]) AS_IF([test "x$with_doxygen" = xyes], [ AC_CHECK_PROGS([DOXYGEN], [doxygen])
Signature · 1 line
2.14.5
Re: [PATCH libnetfilter_queue] configure: Make --help show doxygen is off by default
Applied, thanks.