fixed whoami.test buglet

diff --git a/ChangeLog b/ChangeLog
index 78fdb6874e20f995fbcb3cd696ef3fef43e15ffd..16ed5cddcc888e9c0c6149b58096a1651d4b12e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Feb 12 19:45:16 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * aclocal.in (scan_configure): Tightened regexp a bit.  Test
+       whoami.test.  From Johan Danielsson.
+
        Report from H.J. Lu.
        * automake.in (output_yacc_build_rule): Don't write rule to create
        `.h' file.

diff --git a/THANKS b/THANKS
index 1520cf32970d67420bc126386de9b9f45fdd1996..163cd4d0ef4b50cf588bd441aa12e7978346c4ab 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,7 @@ Jerome Santini                santini@chambord.univ-orleans.fr
 Jim Meyering           meyering@na-net.ornl.gov
 Joel N. Weber II       nemo@koa.iolani.honolulu.hi.us
 Joerg-Martin Schwarz   jms@jms.prima.ruhr.de
+Johan Danielsson       joda@pdc.kth.se
 John W. Coomes         jcoomes@eng.Sun.COM
 Josh MacDonald         jmacd@cs.berkeley.edu
 Joshua Cowan           jcowan@jcowan.reslife.okstate.edu

diff --git a/aclocal.in b/aclocal.in
index dac168b763c87df8b5b0a4b1bb2c3d9651a7fa45..93f88b164ffcd04d8f5d9c4280d152c32f4044d4 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -208,10 +208,10 @@ sub scan_configure
 
        # Search for things we know about.  The "search" sub is
        # constructed dynamically by scan_m4_files.
-       if (! &search && /(AM_[A-Z_]+)/)
+       if (! &search && /(^|\s+)(AM_[A-Z_]+)/)
        {
            # Macro not found, but AM_ prefix found.
-           warn "aclocal: configure.in: $.: macro \`$1' not found in library\n";
+           warn "aclocal: configure.in: $.: macro \`$2' not found in library\n";
            $exit_status = 1;
        }
     }

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 24277537ff8d100fa5eca97304d71e3f25d7c234..3139e63b85a263e6356801ba4046b74ab42f111b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Thu Feb 12 21:00:34 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * whoami.test: New file.
+
        * alpha.test: New file.
 
 Wed Feb 11 17:28:30 1998  Tom Tromey  <tromey@cygnus.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b983ccf22c23769974ad558051df8d4ebcae7ab9..c3ccafc45681f681ea904a85c797ba2ae178b0c4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,8 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test
+libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test \
+whoami.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 56b661961cb51d900b2e1659fbb754a98c2a0095..7afa3834cf9dbfb159a84b2332060f555098d2dc 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -88,7 +88,8 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test
+libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test \
+whoami.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/whoami.test b/tests/whoami.test
new file mode 100755 (executable)
index 0000000..8c8dd13
--- /dev/null
+++ b/tests/whoami.test
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+# Test to make sure aclocal doesn't barf on "WHO_AM_I=...".  Report
+# from Johan Danielsson (and a very nice bug report, too, I might
+# add).
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+WHO_AM_I=17
+END
+
+$ACLOCAL