From bff125dab82b629c0e365b0cd20dc00d7435e477 Mon Sep 17 00:00:00 2001 From: Ralph Giles <giles@mozilla.com> Date: Fri, 4 Nov 2016 14:22:19 -0700 Subject: [PATCH] Make 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. --- configure.ac | 1 + doc/Doxyfile.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 4533a76..50112a5 100644 --- a/configure.ac +++ b/configure.ac @@ -148,6 +148,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 5f0f3f6..0fa3363 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -15,4 +15,6 @@ WARN_NO_PARAMDOC = YES JAVADOC_AUTOBRIEF = YES SORT_MEMBER_DOCS = NO +HAVE_DOT = @HAVE_DOT@ + PROJECT_LOGO = @top_srcdir@/doc/opus_logo.svg -- GitLab