[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#790649: FTBFS: Program 'makeinfo' version >= 5 is required.



* Cyril Brulebois <kibi@debian.org> [2015-06-30 18:03]:
> The following patch does the trick. If we really want to keep the
> version check (we already had texinfo 5 in stable, but not in
> oldstable), having a versioned build-dep on texinfo should be a
> better idea?

I sent the following upstream, which is at leat a better upstream fix.

commit a8375daa8e2d1f1eca334c6add5dd2ffc5bcde01
Author: Martin Michlmayr <tbm@cyrius.com>
Date:   Tue Jun 30 12:38:11 2015 -0400

    Update configure.ac to reconize texi2any
    
    makeinfo, which is nowadays provided by texi2any, reports texi2any as
    of version 6.0.

diff --git a/configure.ac b/configure.ac
index 10a5efe..13041bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ if test x"${MAKEINFO_FOUND}" = xyes
 then
   MAKEINFO_VERSION_REQ=5
   AC_MSG_CHECKING([for makeinfo version >= $MAKEINFO_VERSION_REQ])
-  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^makeinfo .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\1/p'`
+  MAKEINFO_VERSION=`makeinfo --version | sed -ne 's/^\(makeinfo\|texi2any\) .* \([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*$/\2/p'`
   if test x$MAKEINFO_VERSION = x -o 0$MAKEINFO_VERSION -lt $MAKEINFO_VERSION_REQ
   then
     AC_MSG_RESULT([no])

-- 
Martin Michlmayr
Linux for HP Helion OpenStack, Hewlett-Packard


Reply to: