X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fperl.m4;h=96421b9a31df9b039ae819f28b1a13bd7c6751e8;hb=33fa864119281479da3a48ba312d5ca42aeb6f50;hp=0cc681ccd9c9b298a118fb23143123af7c78f99a;hpb=8acc6f0d3a59f1990ef2dd578162c9683199a88d;p=gnulib.git

diff --git a/m4/perl.m4 b/m4/perl.m4
index 0cc681ccd..96421b9a3 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,10 +1,17 @@
-#serial 1
+#serial 7
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 dnl
 
-AC_DEFUN(jm_PERL,
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 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?
@@ -20,11 +27,11 @@ AC_DEFUN(jm_PERL,
 
   found=no
   AC_SUBST(PERL)
-  PERL="$missing_dir/missing 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' ) > /dev/null 2>&1; then
+    if ( $perl -e 'require 5.003; use File::Compare' ) > /dev/null 2>&1; then
       PERL=$perl
       found=yes
       break
@@ -33,7 +40,9 @@ AC_DEFUN(jm_PERL,
 
   AC_MSG_RESULT($found)
   test $found = no && AC_MSG_WARN([
-*** You don't seem to have perl5.003 or newer installed.
-*** Because of that, you may be unable to regenerate certain files
-*** if you modify the sources from which they are derived.] )
+WARNING: 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.
+] )
 ])