Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Will Newton committed Dec 15, 2014
1 parent e4f639e commit 3a12c70
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure
Expand Up @@ -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;;

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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.]*\)],
Expand Down
2 changes: 1 addition & 1 deletion manual/install.texi
Expand Up @@ -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
Expand Down

0 comments on commit 3a12c70

Please sign in to comment.