X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fperl.m4;h=9d7e55c4d4766b3d083d6c9b8ddb4d71e1785647;hb=161d300c640daa32135028b35d3180d5e9327a3b;hp=7d6abc34a681767a78124972e79baeae12a42dc6;hpb=58389a3e63b4681f90e09eeb0913c9f6672c7a0c;p=gnulib.git

diff --git a/m4/perl.m4 b/m4/perl.m4
index 7d6abc34a..9d7e55c4d 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,14 +1,19 @@
-#serial 2
+# serial 9
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
-dnl
 
-AC_DEFUN(jm_PERL,
+# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2010 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+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.
     candidate_perl_names="$PERL"
@@ -19,23 +24,23 @@ AC_DEFUN(jm_PERL,
   fi
 
   found=no
-  AC_SUBST(PERL)
-  PERL="$missing_dir/missing 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([
-*** You don't seem to have perl5.003 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.
+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.
 ] )
 ])