* lib/Autom4te/FileUtils.pm: Sync from Automake.

diff --git a/ChangeLog b/ChangeLog
index 7fa6fe73b3aa4bcbaef8367e7f65256d4acdac10..9fc16862f9462b9c9ebe1735fa33391b2f349f38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/Autom4te/FileUtils.pm: Sync from Automake.
+
 2006-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/autoconf/general.m4 (_AC_INIT_CONFIG_LOG): Don't

diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index d2d49a561c3fdc79d45a518d808ba8ef8f557531..2ad0f125fe9aa0ca772f0b8f1b8404c677bbf66f 100644 (file)
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -76,22 +76,17 @@ sub find_file ($@)
   return File::Spec->canonpath ($file_name)
     if -e $file_name;
 
-  if (File::Spec->file_name_is_absolute ($file_name))
+  if (!File::Spec->file_name_is_absolute ($file_name))
     {
-      fatal "$file_name: no such file or directory"
-       unless $optional;
-      return undef;
-    }
-
-  foreach my $path (@include)
-    {
-      return File::Spec->canonpath (File::Spec->catfile ($path, $file_name))
-       if -e File::Spec->catfile ($path, $file_name)
+      foreach my $path (@include)
+       {
+         return File::Spec->canonpath (File::Spec->catfile ($path, $file_name))
+           if -e File::Spec->catfile ($path, $file_name)
+       }
     }
 
   fatal "$file_name: no such file or directory"
     unless $optional;
-
   return undef;
 }