diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b236ecc4037..4449be67001 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-03-05 Joseph S. Myers + + * configure.in: Increase required makeinfo version to 4.1. + * configure: Regenerate. + 2002-03-04 Geoffrey Keating * .cvsignore: Remove *.info* and genrtl*; these files are generated diff --git a/gcc/configure b/gcc/configure index b6bf777aae8..5eada2fccfe 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2085,7 +2085,7 @@ EOF fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3105,7 +3105,7 @@ else echo "configure:3106: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; - 4.*) + 4.[1-9]*) gcc_cv_prog_makeinfo_modern=yes;; *) gcc_cv_prog_makeinfo_modern=no;; esac diff --git a/gcc/configure.in b/gcc/configure.in index 6e6fb6bfb40..580e16a71bf 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -494,7 +494,7 @@ else # that we can use it. gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, [GNU texinfo.* \([0-9][0-9.]*\)], - [4.*]) + [4.[1-9]*]) fi if test $gcc_cv_prog_makeinfo_modern = no; then