From: Duncan Roe <duncan_roe@optusnet.com.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH libnetfilter_queue] build: check whether dot is available when configuring doxygen.
Date: Tue, 8 Sep 2020 19:52:12 +1000 [thread overview]
Message-ID: <20200908095212.GA15387@dimstar.local.net> (raw)
In-Reply-To: <20200907103904.238656-1-jeremy@azazel.net>
On Mon, Sep 07, 2020 at 11:39:04AM +0100, Jeremy Sowden wrote:
> Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> ---
> configure.ac | 4 ++++
> doxygen.cfg.in | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index d8d1d387c773..32e499071b26 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -41,6 +41,10 @@ AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen],
> [], [with_doxygen=no])
> AS_IF([test "x$with_doxygen" = xyes], [
> AC_CHECK_PROGS([DOXYGEN], [doxygen])
> + AC_CHECK_PROGS([DOT], [dot], [""])
> + AS_IF([test "x$DOT" != "x"],
> + [AC_SUBST(HAVE_DOT, YES)],
> + [AC_SUBST(HAVE_DOT, NO)])
> ])
>
> AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
> diff --git a/doxygen.cfg.in b/doxygen.cfg.in
> index 3f13f97ad8ba..c54f534ada3f 100644
> --- a/doxygen.cfg.in
> +++ b/doxygen.cfg.in
> @@ -161,7 +161,7 @@ PERL_PATH = /usr/bin/perl
> CLASS_DIAGRAMS = YES
> MSCGEN_PATH =
> HIDE_UNDOC_RELATIONS = YES
> -HAVE_DOT = YES
> +HAVE_DOT = @HAVE_DOT@
> CLASS_GRAPH = YES
> COLLABORATION_GRAPH = YES
> GROUP_GRAPHS = YES
> --
> 2.28.0
>
Tested-by: Duncan Roe <duncan_roe@optusnet.com.au>
next prev parent reply other threads:[~2020-09-08 9:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-06 0:18 Can someone please update libnetfilter_queue online documentation Duncan Roe
2020-09-06 21:49 ` Pablo Neira Ayuso
2020-09-07 1:22 ` Duncan Roe
2020-09-07 10:39 ` [PATCH libnetfilter_queue] build: check whether dot is available when configuring doxygen Jeremy Sowden
2020-09-08 9:52 ` Duncan Roe [this message]
2020-09-08 10:49 ` Pablo Neira Ayuso
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=20200908095212.GA15387@dimstar.local.net \
--to=duncan_roe@optusnet.com.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.