[Libreoffice-commits] core.git: configure.ac

[Michael Stahl]

 configure.ac |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit ef777ffc384f8363188923ccb10af7b788035632
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 7 15:20:43 2017 +0100

    configure: check that graphviz/dot is found, needed by doxygen
    
    Change-Id: I70937c4c6075ce1814c3be5b8613fb28cd28fc26
    Reviewed-on: https://gerrit.libreoffice.org/44408
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/configure.ac b/configure.ac
index 23b1ff84ed5a..fd06712066a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7302,6 +7302,11 @@ else
             if test -z "$DOXYGEN"; then
                 AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen])
             fi
+            if $DOXYGEN -g - | grep -q "HAVE_DOT *= *YES"; then
+                if ! dot -V 2>/dev/null; then
+                    AC_MSG_ERROR([dot not found in \$PATH but doxygen defaults to HAVE_DOT=YES; install graphviz or disable its use via --without-doxygen])
+                fi
+            fi
         else
             AC_MSG_CHECKING([for doxygen])
             DOXYGEN=$with_doxygen