From: Akim Demaille Date: Wed, 17 Jul 2002 16:07:32 +0000 (+0000) Subject: * lib/Autom4te/General.pm (find_file): Browse the directories in X-Git-Tag: AUTOCONF-2.53b~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb1a9ef1cfd094d9889cd9d73eead9beacfe4fe;p=thirdparty%2Fautoconf.git * lib/Autom4te/General.pm (find_file): Browse the directories in the order they are given. --- diff --git a/ChangeLog b/ChangeLog index 0810d9bd2..5585f194c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-17 Akim Demaille + + * lib/Autom4te/General.pm (find_file): Browse the directories in + the order they are given. + 2002-07-17 Akim Demaille * tests/wrapsh.as, tests/wrappl.as: Merge into... diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm index 3a2ddbb76..e48d6fc16 100644 --- a/lib/Autom4te/General.pm +++ b/lib/Autom4te/General.pm @@ -225,9 +225,9 @@ sub find_configure_ac (;$) # $FILENAME # find_file ($FILENAME, @INCLUDE) # ------------------------------- -# We match exactly the behavior of GNU m4: first look in the current +# We match exactly the behavior of GNU M4: first look in the current # directory (which includes the case of absolute file names), and, if -# the file is not absolute, just fail. Otherwise, look in the path. +# the file is not absolute, just fail. Otherwise, look in @INCLUDE. # # If the file is flagged as optional (ends with `?'), then return undef # if absent. @@ -249,7 +249,7 @@ sub find_file ($@) return undef; } - foreach my $path (reverse @include) + foreach my $path (@include) { return canonpath (catfile ($path, $filename)) if -e catfile ($path, $filename); diff --git a/tests/Makefile.in b/tests/Makefile.in index d1e4961d4..56ac91acc 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -200,7 +200,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \ autoscan autoupdate ifnames DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in atlocal.in +DIST_COMMON = Makefile.am Makefile.in atlocal.in wrapper.in all: all-am .SUFFIXES: