Bump required version of texinfo to 4.7

System Internals / glibc - Will Newton [linaro.org] - 15 December 2014 02:59 UTC

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

- 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.

###

diff --git a/ChangeLog b/ChangeLog
index e973b55..b40f6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-15 Will Newton
+
+ * 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

* sysdeps/posix/shm-directory.h (SHM_GET_NAME): Take new argument
diff --git a/INSTALL b/INSTALL
index dd5c34a..35f70e0 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 b1fda38..cde55de 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 784e360..f1e6394 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 35467b1..2b9b57c 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

3a12c70 Bump required version of texinfo to 4.7
ChangeLog | 8 ++++++++
INSTALL | 2 +-
configure | 2 +-
configure.ac | 2 +-
manual/install.texi | 2 +-
5 files changed, 12 insertions(+), 4 deletions(-)

Upstream: sourceware.org


  • Share