diff options
author | Ralph Giles <giles@thaumas.net> | 2016-10-27 20:23:29 +0300 |
---|---|---|
committer | Ralph Giles <giles@thaumas.net> | 2016-10-27 20:53:27 +0300 |
commit | 76fa939bde92a868c2a7e51018b79e56d1484285 (patch) | |
tree | 44a3d919f466773403432c673d1265f4535105e0 | |
parent | 6d0628493550f4ef0eaecf3058a502404bc6dca2 (diff) |
Make use of dot optional in generating documentation.
Different distributions of doxygen have different default
values of HAVE_DOT setting, so we need to pick a specific
setting to avoid 'missing dot' warnings on some platforms.
Doxygen uses it to generate inclusion graphs for our various
header files, which is somewhat useful, but not essential.
We therefore enable dot if it's present (usually through
the parent graphviz package) but disable it if it's not
available, silencing the warning, but not giving uniform
results.
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | doc/Doxyfile.in | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8bf02372..71310087 100644 --- a/configure.ac +++ b/configure.ac @@ -781,6 +781,7 @@ AC_ARG_ENABLE([doc], AS_IF([test "$enable_doc" = "yes"], [ AC_CHECK_PROG(HAVE_DOXYGEN, [doxygen], [yes], [no]) + AC_CHECK_PROG(HAVE_DOT, [dot], [yes], [no]) ],[ HAVE_DOXYGEN=no ]) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index cd776752..36eee0b5 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -318,3 +318,18 @@ PREDEFINED = OPUS_EXPORT= \ OPUS_CUSTOM_EXPORT_STATIC= \ OPUS_WARN_UNUSED_RESULT= \ OPUS_ARG_NONNULL(_x)= + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. + +# Debian defaults to YES here, while Fedora and Homebrew default to NO. +# So we set this based on whether the graphviz package is available at +# configure time. +# +HAVE_DOT = @HAVE_DOT@ |