* bin/autoreconf.in (autoreconf_current_directory): Properly

handle an empty aclocal.m4.

diff --git a/ChangeLog b/ChangeLog
index 627b283544a50f1b16fdcc21cebb4c2a19584271..71b3f8e2caf71d8a786afa266bd3473a1acb7e2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-20  Klee Dienes  <kdienes@apple.com>
+
+       * bin/autoreconf.in (autoreconf_current_directory): Properly
+       handle an empty aclocal.m4.
+
 2003-02-20  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/general.m4 (AC_PREFIX_PROGRAM): Quote

diff --git a/THANKS b/THANKS
index 09c09b8f74bffa6c6817c75c817f9c55cabeb486..5565c4520fb9dbb2af1f1538e286c7ce84cf10b1 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -103,6 +103,7 @@ Kelly Anderson              tgcorp@attglobal.net
 Ken Pizzini                 ken@halcyon.com
 Ken Raeburn                 raeburn@cygnus.com
 Kevin Ryde                  user42@zip.com.au
+Klee Dienes                 kdienes@apple.com
 Koji Arai                   JCA02266@nifty.ne.jp
 Kurt D. Zeilenga            kurt@openldap.org
 Larry Jones                 larry.jones@sdrc.com

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index c40e9f0c992852090eb023a7c863f6933cabfc5e..774d0644a1bfc05bbe5edc51968cd971cc9fcb5c 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -297,7 +297,7 @@ sub autoreconf_current_directory ()
       my $aclocal_m4 = new Autom4te::XFile 'aclocal.m4';
       $_ = $aclocal_m4->getline;
       $uses_aclocal = 0
-       unless /generated.*by aclocal/;
+       unless defined ($_) && /generated.*by aclocal/;
     }
 
   # If there are flags for aclocal in Makefile.am, use them.