Bug fix

diff --git a/ChangeLog b/ChangeLog
index 09504df7f9812b2e8fd2af0506b7f72a29c0d837..f94d2568cabccfe20765af29a00cbe7dfddd179b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug 12 10:28:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * aclocal.in (add_file): Fixed regexp for matching AC_DEFUN.  Test
+       order.test.
+
        * m4/AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL.m4: New file.
        * m4/AM_SYS_POSIX_TERMIOS.m4: New file.
 

diff --git a/aclocal.in b/aclocal.in
index 212ab35e1c8d0d839fb576451228e4be14516932..bcee148098a0d48999ea8f2967ed6884532687c6 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -219,7 +219,7 @@ sub add_file
 
        # See if we're defining a macro that was already seen.  This
        # is mostly a special case for `acinclude.m4'.
-       if (/AC_DEFUN\(\[?([^])]*)\]?/)
+       if (/AC_DEFUN\(\[?([^])\n]+)\]?/)
         {
            if ($1 ne $file && $file_seen{$1})
            {

diff --git a/tests/order.test b/tests/order.test
index 979dc9bbb0c0ef409d3aed1e433a5ce912f98292..ed965bdb5c1bf0e49585e92139d1bd9a49929fec 100755 (executable)
--- a/tests/order.test
+++ b/tests/order.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-# Make sure macros defined in acinclude.m4 are always found correctly.
-# Report from Jim Meyering.
+# Make sure AC_DEFUN is handled correctly.  This test isn't named very
+# well.  Report from Jim Meyering.
 
 . $srcdir/defs || exit 1
 
@@ -10,7 +10,8 @@ jm_TEST
 END
 
 cat > acinclude.m4 << 'END'
-AC_DEFUN([jm_TEST])
+AC_DEFUN(jm_TEST
+)
 AC_REQUIRE([jm_TEST])
 END