From: Tom Tromey <tromey@redhat.com>
Date: Tue, 13 Jan 1998 22:27:39 +0000 (+0000)
Subject: perl 4 fix for aclocal
X-Git-Tag: pre-depend-change~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5deddfd0ab5d0e3f29278d1a3930c3d76c45912;p=thirdparty%2Fautomake.git

perl 4 fix for aclocal
---

diff --git a/ChangeLog b/ChangeLog
index 5ba3a3ed3..2c0a1b143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 13 09:19:33 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* aclocal.in (add_file): Hack for Perl 4.  From Seth Alves.
+
 Thu Dec 11 12:29:46 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* scripts.am: Don't add @EXEEXT@ to installed scripts.  Scripts
diff --git a/THANKS b/THANKS
index 8b573c33b..71539a64e 100644
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ Phil Nelson		phil@cs.wwu.edu
 Ralph Schleicher	rs@purple.UL.BaWue.DE
 Ramón García Fernández	ramon@jl1.quim.ucm.es
 Rob Savoye		rob@cygnus.com
+Seth Alves		alves@hungry.com
 Steve M. Robbins	steve@nyongwa.montreal.qc.ca
 Tatu Ylonen		ylo@ssh.fi
 The Crimson Binome	steve@nyongwa.montreal.qc.ca
diff --git a/aclocal.in b/aclocal.in
index 384482591..0f5119702 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -3,7 +3,7 @@
 # @configure_input@
 
 # aclocal - create aclocal.m4 by scanning configure.in
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -320,10 +320,12 @@ sub add_file
     $file_seen{$file} = 1;
 
     $output .= $file_contents{$file} . "\n";
-    local (@rlist);
+    local ($a, @rlist);
     foreach (split ("\n", $file_contents{$file}))
     {
-	if (/$ac_require_rx/g)
+	# This is a hack for Perl 4.
+	$a = $_;
+	if ($a =~ /$ac_require_rx/g)
 	{
 	    push (@rlist, $1);
 	}