[git] GPGME - branch, master, updated. gpgme-1.6.0-115-g2f748b5

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  2f748b5a2d162be4f23b18782219771ead54cb51 (commit)
      from  464d404c8816fc93baf945816c93e86bdeb0ea39 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f748b5a2d162be4f23b18782219771ead54cb51
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu May 19 11:14:24 2016 +0200

    Qt: Check for graphviz and set HAVE_DOT correctly
    
    * configure.ac: Check for graphviz and define HAVE_DOT.
    * lang/qt/doc/Doxyfile.in (HAVE_DOT): Use variable.

diff --git a/configure.ac b/configure.ac
index 1472132..7559559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,10 +334,20 @@ if test "$found" = "1"; then
             # This is not highlighted becase it's not really important.
             then AC_MSG_WARN([Doxygen not found - Qt binding doc will not be built.])
         fi
+        AC_CHECK_PROGS([GRAPHVIZ], [dot])
+        if test -z "$GRAPHVIZ";
+            then AC_MSG_WARN([Graphviz not found - Qt binding doc will not have diagrams.])
+        fi
     fi
 fi
 AM_CONDITIONAL([HAVE_DOXYGEN],
                [test -n "$DOXYGEN"])
+if test -n "$GRAPHVIZ"; then
+    HAVE_DOT="YES"
+else
+    HAVE_DOT="NO"
+fi
+AC_SUBST(HAVE_DOT)
 
 # Python bindings.
 LIST_MEMBER("python", $enabled_languages)
diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in
index ef0a5c0..5d94f90 100644
--- a/lang/qt/doc/Doxyfile.in
+++ b/lang/qt/doc/Doxyfile.in
@@ -2087,7 +2087,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: YES.
 
-HAVE_DOT               = YES
+HAVE_DOT               = @HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

-----------------------------------------------------------------------

Summary of changes:
 configure.ac            | 10 ++++++++++
 lang/qt/doc/Doxyfile.in |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org