From f66f5d6077711b4d0b999a38c5eb5c7f8bc3b386 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 31 Aug 2001 13:35:39 +0000 Subject: [PATCH] * lib/Autom4te/General.pm (&find_file): Browse the includes in the inverse order. --- BUGS | 21 +++------------------ ChangeLog | 5 +++++ doc/autoconf.texi | 5 ++++- lib/Autom4te/General.pm | 2 +- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/BUGS b/BUGS index 87f3a1f3..29799ba6 100644 --- a/BUGS +++ b/BUGS @@ -35,21 +35,6 @@ address them. * Status -/*------------------------------------------------------------------. -| Do not use without perfect knowledge of AC_CHECK_HEADER changes. | -`------------------------------------------------------------------*/ - -** AC_CHECK_HEADER - -The handling is being revamped, and has not been tested enough to be -trusted. We are *extremely* interested in your comments and -experience with this being-built new semantics. Nonetheless it is way -too soon to use this version even for beta releases. - -** make distcheck -Always fails. Don't even try. But once installed Autoconf is usable. - -** make check -Might fail if you have an old version of 2.52c installed on your -machine. Please, then run make install before. But once installed -Autoconf is usable. + /*--------------------------. + | Sane for full scale use. | + `--------------------------*/ diff --git a/ChangeLog b/ChangeLog index c3c4e576..0391a6bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-31 Akim Demaille + + * lib/Autom4te/General.pm (&find_file): Browse the includes in the + inverse order. + 2001-08-31 Akim Demaille * bin/autoupdate.in (@include): `installcheck' revealed the path diff --git a/doc/autoconf.texi b/doc/autoconf.texi index d624d9f4..f60919c6 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1153,7 +1153,8 @@ Remake @file{configure} even if newer than its input files. @item --include=@var{dir} @itemx -I @var{dir} -Also look for input files in @var{dir}. Multiple invocations accumulate. +Also look for input files in @var{dir}. Multiple invocations +accumulate. Latest directories are looking in first. @item --output=@var{file} @itemx -o @var{file} @@ -2510,6 +2511,7 @@ Remake the template file even if newer than its input files. @item --include=@var{dir} @itemx -I @var{dir} Also look for input files in @var{dir}. Multiple invocations accumulate. +Latest directories are looking in first. @item --warnings=@var{category} @itemx -W @var{category} @@ -10073,6 +10075,7 @@ Force the update even if the file has not changed. Disregard the cache. @item --include=@var{dir} @itemx -I @var{dir} Also look for input files in @var{dir}. Multiple invocations accumulate. +Latest directories are looking in first. @end table @node Obsolete Macros diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm index 95893dbf..930646b6 100644 --- a/lib/Autom4te/General.pm +++ b/lib/Autom4te/General.pm @@ -140,7 +140,7 @@ sub find_file ($@) return undef; } - foreach my $path (@include) + foreach my $path (reverse @include) { return File::Spec->canonpath (File::Spec->catfile ($path, $filename)) if -e File::Spec->catfile ($path, $filename)