From 5b2edc13ada1bd5776d0bdaaaaf3d850dffb5d59 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 16 Feb 2001 05:56:09 +0000 Subject: [PATCH] * configure.in: Require Perl 5.005. * automake.in: Require 5.005. --- ChangeLog | 3 +++ automake.in | 2 +- configure | 6 +++--- configure.in | 6 +++--- stamp-vti | 2 +- version.texi | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2dd801..3c959a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-15 Tom Tromey + * configure.in: Require Perl 5.005. + * automake.in: Require 5.005. + * automake.texi (Top): Conditionalize on `nottex', not `info'. Fixes PR automake/122. diff --git a/automake.in b/automake.in index ba7b4dd..ef8c2b6 100755 --- a/automake.in +++ b/automake.in @@ -27,7 +27,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}' # Originally written by David Mackenzie . # Perl reimplementation by Tom Tromey . -require 5; +require 5.005; # Parameters set by configure. Not to be changed. NOTE: assign # VERSION as string so that eg version 0.30 will print correctly. diff --git a/configure b/configure index 492cca7..6fb1dd9 100755 --- a/configure +++ b/configure @@ -878,9 +878,9 @@ fi if test -z "$PERL"; then { echo "configure: error: perl not found" 1>&2; exit 1; } fi -if test -n "`$PERL -v | fgrep 'version 5.001' 2> /dev/null`"; then - { echo "configure: error: perl 5.001 has bug which causes automake to fail" 1>&2; exit 1; } -fi +$PERL -e 'require 5.005;' || { + { echo "configure: error: perl 5.005 or better is required" 1>&2; exit 1; } +} trap '' 1 2 15 cat > confcache <<\EOF diff --git a/configure.in b/configure.in index 301140a..dbe333b 100644 --- a/configure.in +++ b/configure.in @@ -10,9 +10,9 @@ AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([perl not found]) fi -if test -n "`$PERL -v | fgrep 'version 5.001' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.001 has bug which causes automake to fail]) -fi +$PERL -e 'require 5.005;' || { + AC_MSG_ERROR([perl 5.005 or better is required]) +} AC_OUTPUT([Makefile automake aclocal m4/Makefile tests/Makefile], [chmod +x automake aclocal]) diff --git a/stamp-vti b/stamp-vti index e16dc35..e0533f6 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 14 February 2001 +@set UPDATED 15 February 2001 @set UPDATED-MONTH February 2001 @set EDITION 1.4e @set VERSION 1.4e diff --git a/version.texi b/version.texi index e16dc35..e0533f6 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 14 February 2001 +@set UPDATED 15 February 2001 @set UPDATED-MONTH February 2001 @set EDITION 1.4e @set VERSION 1.4e -- 2.7.4