[v2] Bump required version of texinfo to 4.7
diff mbox

Message ID 1418377163-13960-1-git-send-email-will.newton@linaro.org
State New
Headers show

Commit Message

Will Newton Dec. 12, 2014, 9:39 a.m. 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-11  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.
---
 INSTALL             | 2 +-
 configure           | 2 +-
 configure.ac        | 2 +-
 manual/install.texi | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Changes in v2:
 - Update configure makeinfo version check to 4.7

Comments

Roland McGrath Dec. 12, 2014, 9:06 p.m. UTC | #1
OK

Patch
diff mbox

diff --git a/INSTALL b/INSTALL
index 0fee315..43bcaf3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -349,7 +349,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 c4e6546..5327c18 100755
--- a/configure
+++ b/configure
@@ -4777,7 +4777,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 82271c1..006fbd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -922,7 +922,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 1484081..686c44c 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -393,7 +393,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