This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix for PR 1860


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  <bje@au.ibm.com>

        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"


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]