From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29466 invoked by alias); 31 Mar 2006 02:18:02 -0000 Received: (qmail 29456 invoked by uid 22791); 31 Mar 2006 02:18:02 -0000 X-Spam-Check-By: sourceware.org Received: from ausmtp04.au.ibm.com (HELO ausmtp04.au.ibm.com) (202.81.18.152) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 31 Mar 2006 02:17:58 +0000 Received: from sd0208e0.au.ibm.com (d23rh904.au.ibm.com [202.81.18.202]) by ausmtp04.au.ibm.com (8.13.6/8.13.5) with ESMTP id k2V2QQeO158812 for ; Fri, 31 Mar 2006 13:26:26 +1100 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.250.244]) by sd0208e0.au.ibm.com (8.12.10/NCO/VER6.8) with ESMTP id k2V2L3nx241502 for ; Fri, 31 Mar 2006 13:21:03 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.12.11/8.13.3) with ESMTP id k2V2HiVr032151 for ; Fri, 31 Mar 2006 12:17:44 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av03.au.ibm.com (8.12.11/8.12.11) with ESMTP id k2V2HhC9031935; Fri, 31 Mar 2006 12:17:44 +1000 Received: by ozlabs.au.ibm.com (Postfix, from userid 1017) id 3E72873724; Fri, 31 Mar 2006 13:18:33 +1100 (EST) Date: Fri, 31 Mar 2006 02:32:00 -0000 From: Ben Elliston To: binutils@sourceware.org Cc: dave.anglin@nrc-cnrc.gc.ca Subject: Fix for PR 1860 Message-ID: <20060331021833.GA31401@ozlabs.au.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6i Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2006-03/txt/msg00365.txt.bz2 After some experimentation, I determined that Texinfo 4.4 is now required to build the binutils documentation. The reason this is probably not widely known is that many of us are now using a more modern version of Texinfo such as 4.8. Dave Anglin tripped over this on a system where he had Texinfo 4.2 installed. After determining the minimum version requirement--a version that supports @include{@value}--I have adjusted the top-level configure script to check for it. Tested with a number of configure && make all-binutils runs with different makeinfo versions in my PATH. Okay for mainline? Ben 2006-03-31 Ben Elliston PR binutils/1860 * configure.in: Require makeinfo 4.4 or higher. * configure: Regenerate. Index: configure.in =================================================================== RCS file: /cvs/src/src/configure.in,v retrieving revision 1.301 diff -u -p -r1.301 configure.in --- configure.in 14 Mar 2006 16:10:08 -0000 1.301 +++ configure.in 31 Mar 2006 02:15:26 -0000 @@ -2203,10 +2203,10 @@ case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) changequote(,) - # For an installed makeinfo, we require it to be from texinfo 4.2 or + # For an installed makeinfo, we require it to be from texinfo 4.4 or # higher, else we use the "missing" dummy. if ${MAKEINFO} --version \ - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then + | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then : else MAKEINFO="$MISSING makeinfo" Index: configure =================================================================== RCS file: /cvs/src/src/configure,v retrieving revision 1.214 diff -u -p -r1.214 configure --- configure 14 Mar 2006 16:10:08 -0000 1.214 +++ configure 31 Mar 2006 02:15:41 -0000 @@ -3628,10 +3628,10 @@ case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) - # For an installed makeinfo, we require it to be from texinfo 4.2 or + # For an installed makeinfo, we require it to be from texinfo 4.4 or # higher, else we use the "missing" dummy. if ${MAKEINFO} --version \ - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then + | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then : else MAKEINFO="$MISSING makeinfo"