* [PATCH libnetfilter_queue] configure: disable doxygen by default
@ 2020-06-08 21:25 Pablo Neira Ayuso
2020-06-09 5:28 ` [PATCH libnetfilter_queue] configure: Make --help show doxygen is off " Duncan Roe
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2020-06-08 21:25 UTC (permalink / raw)
To: netfilter-devel
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 <pablo@netfilter.org>
---
configure.ac | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0de144c350d5..96e18be694a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}"
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH libnetfilter_queue] configure: Make --help show doxygen is off by default
2020-06-08 21:25 [PATCH libnetfilter_queue] configure: disable doxygen by default Pablo Neira Ayuso
@ 2020-06-09 5:28 ` Duncan Roe
2020-06-09 8:58 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Duncan Roe @ 2020-06-09 5:28 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 96e18be..763dbd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
--
2.14.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH libnetfilter_queue] configure: Make --help show doxygen is off by default
2020-06-09 5:28 ` [PATCH libnetfilter_queue] configure: Make --help show doxygen is off " Duncan Roe
@ 2020-06-09 8:58 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2020-06-09 8:58 UTC (permalink / raw)
To: Duncan Roe; +Cc: netfilter-devel
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-09 8:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-08 21:25 [PATCH libnetfilter_queue] configure: disable doxygen by default Pablo Neira Ayuso
2020-06-09 5:28 ` [PATCH libnetfilter_queue] configure: Make --help show doxygen is off " Duncan Roe
2020-06-09 8:58 ` Pablo Neira Ayuso
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).