[Olena-patches] oln 10.153: Fix doxygen version detection

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * configure.ac: Check for doxygen version. * config/oln.m4: Add macro to check for doxygen version. Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * tools/swilena/ruby/Makefile.am: Remove `ruby_DATA' variable. Index: configure.ac --- configure.ac Mon, 12 Apr 2004 19:37:26 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.3 600) +++ configure.ac Tue, 13 Apr 2004 17:19:35 +0200 thivol_d (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.3 600) @@ -236,6 +236,8 @@ ### FIXME: could be much better. AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen]) +AC_CHECK_DOXYGEN_VERSION + ## if test -z "$DOXYGEN"; then ## AC_MSG_WARN([`doxygen' not found -- `doxygen' must be installed to generate the documentation]) Index: config/oln.m4 --- config/oln.m4 Mon, 12 Apr 2004 19:37:26 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.2 640) +++ config/oln.m4 Tue, 13 Apr 2004 17:30:48 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.2 640) @@ -325,7 +325,7 @@ [dnl AC_CACHE_CHECK([for SWIG supports for -noruntime], [ac_cv_swig_flags], - [if swig -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then + [if $SWIG -help 2>&1 | grep -- "-noruntime" > /dev/null 2>&1; then ac_cv_swig_flags=recent else ac_cv_swig_flags=old @@ -342,6 +342,23 @@ AC_SUBST([SWIG_FLAGS]) ]) +# Doxygen >= 1.3.4 is needed. + +AC_DEFUN([AC_CHECK_DOXYGEN_VERSION], +[dnl + AC_CACHE_CHECK([for doxygen >= 1.3.4], + [ac_cv_doxygen_version], + [if $DOXYGEN --version 2>&1 | grep ['1.3.[456]'] > /dev/null 2>&1; then + ac_cv_doxygen_version=recent + else + ac_cv_doxygen_version=old + fi]) + if [ [ "$ac_cv_doxygen_version" = "old" ] ] ; then + AC_MSG_ERROR([Doxygen 1.3.4 or newer is required]) + fi +]) + + # AC_CXX_CHECK_MATH([FUNCTION], [MACRO_NAME], [TEST]) # Checks for the availability of a particular math function Index: tools/swilena/ruby/Makefile.am --- tools/swilena/ruby/Makefile.am Mon, 12 Apr 2004 01:16:17 +0200 thivol_d (oln/v/17_Makefile.a 1.3 600) +++ tools/swilena/ruby/Makefile.am Tue, 13 Apr 2004 16:51:38 +0200 thivol_d (oln/v/17_Makefile.a 1.3 600) @@ -7,8 +7,6 @@ rubydir = $(libdir)/ruby -ruby_DATA = swilena_display.rb - include makefile.swig clean-local: -- Damien Thivolle damien.thivolle(a)lrde.epita.fr