about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-12-11 17:59:45 +0000
committerWill Newton <will.newton@linaro.org>2014-12-15 08:59:31 +0000
commit3a12c70f137707074209241e6c6172ea25f9ab4a (patch)
tree154ea0667352bdf334e789eca48bc3fcf247e01d
parente4f639e4a106d90c6f3159230788653fd6e40a26 (diff)
downloadglibc-3a12c70f137707074209241e6c6172ea25f9ab4a.tar.gz
glibc-3a12c70f137707074209241e6c6172ea25f9ab4a.tar.xz
glibc-3a12c70f137707074209241e6c6172ea25f9ab4a.zip
Bump required version of texinfo to 4.7
It seems we require texinfo 4.7 for the --plaintext option, so
document that and check for the correct version in configure.

ChangeLog:

2014-12-15  Will Newton  <will.newton@linaro.org>

	* manual/install.texi: Bump required version of texinfo
	to 4.7 from 4.5.
	* INSTALL: Regenerated.
	* configure.ac: Check for makeinfo version 4.7 and above.
	* configure: Regenerated.
-rw-r--r--ChangeLog8
-rw-r--r--INSTALL2
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--manual/install.texi2
5 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e973b556e3..b40f6f8953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-15  Will Newton  <will.newton@linaro.org>
+
+	* manual/install.texi: Bump required version of texinfo
+	to 4.7 from 4.5.
+	* INSTALL: Regenerated.
+	* configure.ac: Check for makeinfo version 4.7 and above.
+	* configure: Regenerated.
+
 2014-12-12  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/posix/shm-directory.h (SHM_GET_NAME): Take new argument
diff --git a/INSTALL b/INSTALL
index dd5c34aadb..35f70e0f5e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -356,7 +356,7 @@ build the GNU C Library:
      No other assembler or linker has the necessary functionality at the
      moment.
 
-   * GNU `texinfo' 4.5 or later
+   * GNU `texinfo' 4.7 or later
 
      To correctly translate and install the Texinfo documentation you
      need this version of the `texinfo' package.  Earlier versions do
diff --git a/configure b/configure
index b1fda3867a..cde55de15f 100755
--- a/configure
+++ b/configure
@@ -4789,7 +4789,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.[5-9]*|4.[1-9][0-9]*|[5-9].*)
+    4.[7-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.ac b/configure.ac
index 784e360382..f1e6394e7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -929,7 +929,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.[5-9]*|4.[1-9][0-9]*|[5-9].*],
+  [4.[7-9]*|4.[1-9][0-9]*|[5-9].*],
   MAKEINFO=: aux_missing="$aux_missing makeinfo")
 AC_CHECK_PROG_VER(SED, sed, --version,
   [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
diff --git a/manual/install.texi b/manual/install.texi
index 35467b1b16..2b9b57ca32 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -400,7 +400,7 @@ No other assembler or linker has the necessary functionality at the
 moment.
 
 @item
-GNU @code{texinfo} 4.5 or later
+GNU @code{texinfo} 4.7 or later
 
 To correctly translate and install the Texinfo documentation you need
 this version of the @code{texinfo} package.  Earlier versions do not