perl 4 fix for aclocal

diff --git a/ChangeLog b/ChangeLog
index 5ba3a3ed3a7f54b956ace984e4442b77bb28df34..2c0a1b1435d066c869131cd6268e75205ada1999 100644 (file)
--- 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 8b573c33bffe9374a3ada94134366b6fcf4c591e..71539a64e7b506401a75e8c90abca128de55b5e6 100644 (file)
--- 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 3844825919b78307d1002d9fc9afce64c3a38b6b..0f51197025e0def9839024c44b888833673c5c21 100644 (file)
--- 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);
        }