merge from branch DEV tag mergeto_trunk_04apr08

[modules/yacs.git] / adm / unix / config_files / check_htmlgen.m4

diff --git a/adm/unix/config_files/check_htmlgen.m4 b/adm/unix/config_files/check_htmlgen.m4
index 7130999b3337883f558aaeb85b6edff9d21efc31..80a47984eeb0dce054cf7a8b2e5e7629114b7b4f 100644 (file)
--- a/adm/unix/config_files/check_htmlgen.m4
+++ b/adm/unix/config_files/check_htmlgen.m4
@@ -41,7 +41,7 @@ then
          DOXYGEN_WITH_PYTHON=yes
          DOXYGEN_WITH_STL=yes
          ;;
-       [1-9].[5-9]*)
+       [[1-9]].[[5-9]]*)
          DOXYGEN_WITH_PYTHON=yes
          DOXYGEN_WITH_STL=yes
          ;;
@@ -60,8 +60,12 @@ dnl AC_SUBST(DOXYGEN)
 AC_SUBST(GRAPHVIZHOME)
 AC_SUBST(GRAPHVIZ_CPPFLAGS)
 AC_SUBST(GRAPHVIZ_LDFLAGS)
+AC_SUBST(GRAPHVIZ_LIBADD)
 GRAPHVIZ_CPPFLAGS=""
 GRAPHVIZ_LDFLAGS=""
+GRAPHVIZ_LIBADD=""
+
+AC_CHECKING([graphviz configuration])
 
 graphviz_ok=yes
 dnl were is graphviz ?
@@ -70,10 +74,24 @@ if test "x$DOT" = "x" ; then
   AC_MSG_WARN(graphviz not found)
   graphviz_ok=no
 else
+  GRAPHVIZ_PREFIX=`echo $DOT | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  GRAPHVIZ_PREFIX=`echo $GRAPHVIZ_PREFIX | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+  GRAPHVIZHOME=$GRAPHVIZ_PREFIX
+
   GRAPHVIZ_CPPFLAGS="-I${GRAPHVIZHOME}/include/graphviz"
   GRAPHVIZ_LDFLAGS="-L${GRAPHVIZHOME}/lib/graphviz"
 fi
 dnl AC_SUBST(DOT)
+CPPFLAGS_old=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $GRAPHVIZ_CPPFLAGS"
+old_graphviz="yes"
+AC_CHECK_HEADERS(dotneato.h, old_graphviz="yes", old_graphviz="no")
+if test "x$old_graphviz" = "xyes" ; then
+  GRAPHVIZ_LIBADD="-ldotneato"
+else
+  GRAPHVIZ_LIBADD="-lgvc"
+fi
+CPPFLAGS=$CPPFLAGS_old
 
 AC_PATH_PROG(LATEX,latex) 
 if test "x$LATEX" = "x" ; then