Merge from V6_main_20120808 08Aug12

[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 367d672ca4662f6cb21b91a0a8b3185a35e4c33f..3f4a47db32322ac0036a6503648cae5b4e170a8e 100644 (file)
--- a/adm/unix/config_files/check_htmlgen.m4
+++ b/adm/unix/config_files/check_htmlgen.m4
@@ -1,21 +1,22 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl Copyright (C) 2006-2012  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.
+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.
 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 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 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 See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 dnl
+
 AC_DEFUN([CHECK_HTML_GENERATORS],[
 
 AC_CHECKING(for html generators)
@@ -71,6 +72,7 @@ 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)
@@ -95,7 +97,11 @@ else
   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