Copyright update: 2016

[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..805ee6e4e74e92db94d1459cca4df52805be777b 100644 (file)
--- a/adm/unix/config_files/check_htmlgen.m4
+++ b/adm/unix/config_files/check_htmlgen.m4
@@ -1,4 +1,21 @@
-dnl Copyright (C) 2003  CEA/DEN, EDF R&D
+dnl Copyright (C) 2006-2016  CEA/DEN, EDF R&D
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl
 
 AC_DEFUN([CHECK_HTML_GENERATORS],[
 
@@ -41,7 +58,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
          ;;
@@ -55,13 +72,18 @@ then
   AC_SUBST(DOXYGEN_WITH_PYTHON)
   AC_SUBST(DOXYGEN_WITH_STL)
 fi
+AM_CONDITIONAL(DOXYGEN_IS_OK, [test x"$doxygen_ok" = xyes])
 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 +92,28 @@ 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"
+  if test "x$GRAPHVIZHOME" = "x/usr" ; then
+    GRAPHVIZ_LDFLAGS="-L${GRAPHVIZHOME}/lib/graphviz"
+  else
+    GRAPHVIZ_LDFLAGS="-L${GRAPHVIZHOME}/lib -L${GRAPHVIZHOME}/lib/graphviz"
+  fi
 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