From 7cdb6eb4b7aabdff6df4516edf741a7025fa12d4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 13 Aug 1996 05:20:15 +0000 Subject: [PATCH] Bug fix --- ChangeLog | 3 +++ aclocal.in | 2 +- tests/order.test | 7 ++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09504df7..f94d2568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Mon Aug 12 10:28:46 1996 Tom Tromey + * 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 212ab35e..bcee1480 100644 --- 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 979dc9bb..ed965bdb 100755 --- 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 -- 2.43.5