diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2004-03-15 01:25:58 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2004-03-15 01:25:58 +0000 |
| commit | eb6f3e503bf30274af29b25408c297050b6a45f2 (patch) | |
| tree | 2c22c0ec6419158394d35fc992f63d844a003d75 /devel/automake18/files/patch-aclocal.in | |
| parent | e1e04277317d39eab347fc15885de14d5e4dcfe2 (diff) | |
Notes
Diffstat (limited to 'devel/automake18/files/patch-aclocal.in')
| -rw-r--r-- | devel/automake18/files/patch-aclocal.in | 64 |
1 files changed, 12 insertions, 52 deletions
diff --git a/devel/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in index 0740a6dda4f9..214fcda58d8b 100644 --- a/devel/automake18/files/patch-aclocal.in +++ b/devel/automake18/files/patch-aclocal.in @@ -1,63 +1,23 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 -@@ -29,7 +29,7 @@ - - BEGIN +--- aclocal.in.orig Sat Feb 7 04:32:57 2004 ++++ aclocal.in Sun Mar 14 17:03:19 2004 +@@ -31,3 +31,3 @@ { - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, $perllibdir; - } - -@@ -42,8 +42,9 @@ - $PACKAGE = '@PACKAGE@'; - # Note that this isn't pkgdatadir, but a separate directory. + unshift @INC, (split ':', $perllibdir); +@@ -47,4 +47,5 @@ # Note also that the versioned directory is handled later. -$acdir = '@datadir@/aclocal'; +$acdir = '@datadir@/aclocal@APIPVERSION@'; $default_acdir = $acdir; +$acdir_x11 = '%%X11BASE%%/share/aclocal'; # contains a list of directories, one per line, to be added - # to the dirlist in addition to $acdir, as if -I had been - # added to the command line. If acdir has been redirected, -@@ -188,11 +189,7 @@ - $default_dirlist="$acdir/dirlist" - if $acdir ne $default_acdir; - -- # Search the versioned directory near the end, and then the -- # unversioned directory last. Only do this if the user didn't -- # override acdir. -- push (@dirlist, "$acdir-$APIVERSION") -- if $acdir eq $default_acdir; -+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; - - # By default $(datadir)/aclocal doesn't exist. We don't want to - # get an error in the case where we are searching the default -@@ -290,12 +287,13 @@ - $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); - } +@@ -622,7 +623,3 @@ -+ local (@skipinolist) = (); - local ($m4dir); - foreach $m4dir (@dirlist) - { - opendir (DIR, $m4dir) - || die "aclocal: couldn't open directory `$m4dir': $!\n"; -- local ($file, $fullfile); -+ local ($file, $fullfile, $ino); - foreach $file (sort grep (! /^\./, readdir (DIR))) - { - # Only examine .m4 files. -@@ -305,6 +303,12 @@ - next if $file eq 'aclocal.m4'; +- # Search the versioned directory near the end, and then the +- # unversioned directory last. Only do this if the user didn't +- # override acdir. +- push (@dirlist, "$acdir-$APIVERSION") +- if $acdir eq $default_acdir; ++ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; - $fullfile = $m4dir . '/' . $file; -+ -+ # Do not scan a file more than once. -+ $ino = (stat($fullfile))[1]; -+ next if grep($ino eq $_, @skipinolist); -+ push @skipinolist, $ino; -+ - $file_contents{$fullfile} = &scan_file ($fullfile); - } - closedir (DIR); |