X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fperl.m4;h=4c12829b43974cd941b992c6f2b943aedd258653;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=96421b9a31df9b039ae819f28b1a13bd7c6751e8;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/perl.m4 b/m4/perl.m4
index 96421b9a3..4c12829b4 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,11 +1,10 @@
-#serial 7
+# serial 9
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
-dnl
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 Free Software
-# Foundation, Inc.
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2014 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,11 +12,10 @@ dnl
 
 AC_DEFUN([gl_PERL],
 [
-  dnl FIXME: don't hard-code 5.003
-  dnl FIXME: should we cache the result?
-  AC_MSG_CHECKING([for perl5.003 or newer])
+  dnl FIXME: don't hard-code 5.005
+  AC_MSG_CHECKING([for perl5.005 or newer])
   if test "${PERL+set}" = set; then
-    # `PERL' is set in the user's environment.
+    # 'PERL' is set in the user's environment.
     candidate_perl_names="$PERL"
     perl_specified=yes
   else
@@ -26,21 +24,21 @@ AC_DEFUN([gl_PERL],
   fi
 
   found=no
-  AC_SUBST(PERL)
+  AC_SUBST([PERL])
   PERL="$am_missing_run perl"
   for perl in $candidate_perl_names; do
     # Run test in a subshell; some versions of sh will print an error if
     # an executable is not found, even if stderr is redirected.
-    if ( $perl -e 'require 5.003; use File::Compare' ) > /dev/null 2>&1; then
+    if ( $perl -e 'require 5.005; use File::Compare' ) > /dev/null 2>&1; then
       PERL=$perl
       found=yes
       break
     fi
   done
 
-  AC_MSG_RESULT($found)
+  AC_MSG_RESULT([$found])
   test $found = no && AC_MSG_WARN([
-WARNING: You don't seem to have perl5.003 or newer installed, or you lack
+WARNING: You don't seem to have perl5.005 or newer installed, or you lack
          a usable version of the Perl File::Compare module.  As a result,
          you may be unable to run a few tests or to regenerate certain
          files if you modify the sources from which they are derived.