From 6a3951a036dcd40d8d81072cbc8b2cdcbd9db7a2 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 16 May 2012 18:50:39 +0000
Subject: [PATCH] Update Texinfo version requirement.

---
 ChangeLog           |  7 +++++++
 INSTALL             | 16 ++++++++--------
 configure           |  2 +-
 configure.in        |  2 +-
 manual/install.texi |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d5b6c9..f8f216b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-05-16  Joseph Myers  <joseph@codesourcery.com>
 
+	* configure.in (makeinfo): Require version 4.5 or later.  Allow
+	versions 5 to 9.
+	* configure: Regenerated.
+	* manual/install.texi (texinfo): Increase version requirement to
+	4.5 or later.
+	* INSTALL: Regenerated.
+
 	* include/stdc-predef.h (__STDC_ISO_10646__): Increase to 201103L.
 
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
diff --git a/INSTALL b/INSTALL
index e0433d4..412053d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,10 @@
 Installing the GNU C Library
 ****************************
 
-Before you do anything else, you should read the file `FAQ' located at
-the top level of the source tree.  This file answers common questions
+Before you do anything else, you should read the FAQ at
+`http://sourceware.org/glibc/wiki/FAQ'.  It answers common questions
 and describes problems you may experience with compilation and
-installation.  It is updated more frequently than this manual.
+installation.
 
    Features can be added to the GNU C Library via "add-on" bundles.
 These are separate tar files, which you unpack into the top level of
@@ -177,9 +177,9 @@ files must all contain correct and sensible content.
 
    To format the `GNU C Library Reference Manual' for printing, type
 `make dvi'.  You need a working TeX installation to do this.  The
-distribution already includes the on-line formatted version of the
-manual, as Info files.  You can regenerate those with `make info', but
-it shouldn't be necessary.
+distribution builds the on-line formatted version of the manual, as
+Info files, as part of the build process.  You can build them manually
+with `make info'.
 
    The library has a number of special-purpose configuration parameters
 which you can find in `Makeconfig'.  These can be overwritten with the
@@ -297,7 +297,7 @@ build the GNU C Library:
      No other assembler or linker has the necessary functionality at the
      moment.
 
-   * GNU `texinfo' 3.12f
+   * GNU `texinfo' 4.5 or later
 
      To correctly translate and install the Texinfo documentation you
      need this version of the `texinfo' package.  Earlier versions do
@@ -393,7 +393,7 @@ remain unfixed for all eternity, if not longer.
    It is a good idea to verify that the problem has not already been
 reported.  Bugs are documented in two places: The file `BUGS' describes
 a number of well known bugs and the bug tracking system has a WWW
-interface at `http://sources.redhat.com/bugzilla/'.  The WWW interface
+interface at `http://sourceware.org/bugzilla/'.  The WWW interface
 gives you access to open and closed reports.  A closed report normally
 includes a patch or a hint on solving the problem.
 
diff --git a/configure b/configure
index 8b10f5a..e664260 100755
--- a/configure
+++ b/configure
@@ -4985,7 +4985,7 @@ $as_echo_n "checking version of $MAKEINFO... " >&6; }
   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    4.*)
+    4.[5-9]*|4.[1-9][0-9]*|[5-9].*)
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
diff --git a/configure.in b/configure.in
index 30a062f..ce4b7ad 100644
--- a/configure.in
+++ b/configure.in
@@ -919,7 +919,7 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   MSGFMT=: aux_missing="$aux_missing msgfmt")
 AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.*],
+  [4.[5-9]*|4.[1-9][0-9]*|[5-9].*],
   MAKEINFO=: aux_missing="$aux_missing makeinfo")
 AC_CHECK_PROG_VER(SED, sed, --version,
   [GNU sed version \([0-9]*\.[0-9.]*\)],
diff --git a/manual/install.texi b/manual/install.texi
index 9918425..3b6c1ed 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -334,7 +334,7 @@ No other assembler or linker has the necessary functionality at the
 moment.
 
 @item
-GNU @code{texinfo} 3.12f
+GNU @code{texinfo} 4.5 or later
 
 To correctly translate and install the Texinfo documentation you need
 this version of the @code{texinfo} package.  Earlier versions do not
-- 
2.7.4