summaryrefslogtreecommitdiff
path: root/devel/automake/files/patch-aclocal.in
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2004-08-03 22:36:52 +0000
committerAde Lovett <ade@FreeBSD.org>2004-08-03 22:36:52 +0000
commite32a8245791aab6e734fe5ecda71641e15c94b45 (patch)
tree4daccf3b91f25a920b92ab009f8f336fb635fb30 /devel/automake/files/patch-aclocal.in
parent- Fix conjuration with gcc-3.4.2 (diff)
Move devel/autoconf->devel/autoconf253 and devel/automake->devel/automake15
All autotools ports are now truly versioned and do not conflict with each other. This marks the end of "Phase 1" of the autotools updates.
Notes
Notes: svn path=/head/; revision=115365
Diffstat (limited to 'devel/automake/files/patch-aclocal.in')
-rw-r--r--devel/automake/files/patch-aclocal.in48
1 files changed, 0 insertions, 48 deletions
diff --git a/devel/automake/files/patch-aclocal.in b/devel/automake/files/patch-aclocal.in
deleted file mode 100644
index 3cd773443ae7..000000000000
--- a/devel/automake/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- aclocal.in.orig Sun Sep 9 11:31:39 2001
-+++ aclocal.in Sun Sep 9 11:37:54 2001
-@@ -34,6 +34,8 @@
- # Note that this isn't pkgdatadir, but a separate directory.
- $acdir = "@datadir@/aclocal";
-
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
-
- # Exit status.
-@@ -115,6 +117,9 @@
-
-
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,13 @@
- $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
- }
-
-+ local (@skipinolist) = ();
- local ($m4dir);
- foreach $m4dir (@dirlist)
- {
- opendir (DIR, $m4dir)
- || die "aclocal: couldn't open directory `$m4dir': $!\n";
-+ local ($file, $fullfile, $expr);
- local ($file, $fullfile);
- foreach $file (sort grep (! /^\./, readdir (DIR)))
- {
-@@ -314,6 +321,12 @@
- next if $file eq 'aclocal.m4';
-
- $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);