Added test for dot (package graphviz). If installed enable

dot graphs in doxygen.

diff --git a/configure.ac b/configure.ac
index 043e0cf..6ed9bea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,20 +72,25 @@ dnl   check for c++ compiler and tools
 AC_PROG_CXX
 AC_PROG_CXX
 AC_PROG_CXXCPP
-#AC_PROG_CC
-#AC_PROG_RANLIB
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 
 dnl   do AC_CHECK_* tests using c++ (e.g. boost header)
 AC_LANG([C++])
 
-
 AC_PATH_PROG(DOCGEN, doxygen)
 if test -z "$DOCGEN" ; then
     AC_MSG_ERROR(doxygen is missing; please install doxygen.)
 fi
 
+AC_PATH_PROG(HAVE_DOT, dot)
+if test -z "$HAVE_DOT" ; then
+    AC_MSG_WARN(dot not found; you should install graphviz.)
+    HAVE_DOT=NO
+else
+    HAVE_DOT=YES
+fi
+
 AC_PATH_PROG(XGETTEXT, xgettext)
 if test -z "$XGETTEXT" ; then
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)

diff --git a/doc/autodoc/Doxyfile.in b/doc/autodoc/Doxyfile.in
index 6fa624a..c69fe1a 100644 (file)
--- a/doc/autodoc/Doxyfile.in
+++ b/doc/autodoc/Doxyfile.in
@@ -1,4 +1,3 @@
-# @configure_input@
 # Doxyfile 1.4.4
 
 #---------------------------------------------------------------------------
@@ -98,7 +97,7 @@ VERBATIM_HEADERS       = NO
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
@@ -195,18 +194,18 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
+HIDE_UNDOC_RELATIONS   = NO
+HAVE_DOT               = @HAVE_DOT@
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
+GROUP_GRAPHS           = NO
 UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = NO
 GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
+DIRECTORY_GRAPH        = NO
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               =
 DOTFILE_DIRS           =