Update.

	* configure.in: Require makeinfo version 4.

3 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 74d3d2d0c4..f33ca8cbad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-02-09  Ulrich Drepper  <drepper@redhat.com>
 
+	* configure.in: Require makeinfo version 4.
+
 	* libio/tst_wscanf.c (main): Add cast to avoid warning.
 	* libio/tst_swscanf.c (main): Likewise..
 
diff --git a/configure b/configure
index 8f4e778bb8..e6e3507826 100755
--- a/configure
+++ b/configure
@@ -1600,7 +1600,7 @@ echo "configure:1600: checking version of $MAKEINFO" >&5
   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;;
-    3.1[1-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9])
+    4.*)
        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 1dc893b721..8aa6497a4f 100644
--- a/configure.in
+++ b/configure.in
@@ -563,7 +563,7 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
   [0.[1-9][0-9].* | [1-9].*], MSGFMT=: aux_missing=t)
 AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [3.1[1-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9]], MAKEINFO=: aux_missing=t)
+  [4.*], MAKEINFO=: aux_missing=t)
 AC_CHECK_PROG_VER(SED, gsed sed, --version,
   [GNU sed version \([0-9]*\.[0-9.]*\)],
   [3.0[2-9]*|3.[1-9]*|[4-9]*], SED=: aux_missing=t)