From 71c627f2cee2afa611e7333c8e2df361c0c8234a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Feb 1998 04:56:24 +0000 Subject: [PATCH] fixed whoami.test buglet --- ChangeLog | 3 +++ THANKS | 1 + aclocal.in | 4 ++-- tests/ChangeLog | 2 ++ tests/Makefile.am | 3 ++- tests/Makefile.in | 3 ++- tests/whoami.test | 12 ++++++++++++ 7 files changed, 24 insertions(+), 4 deletions(-) create mode 100755 tests/whoami.test diff --git a/ChangeLog b/ChangeLog index 78fdb6874..16ed5cddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Thu Feb 12 19:45:16 1998 Tom Tromey + * 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 1520cf329..163cd4d0e 100644 --- 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 dac168b76..93f88b164 100644 --- 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 24277537f..3139e63b8 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Thu Feb 12 21:00:34 1998 Tom Tromey + * whoami.test: New file. + * alpha.test: New file. Wed Feb 11 17:28:30 1998 Tom Tromey diff --git a/tests/Makefile.am b/tests/Makefile.am index b983ccf22..c3ccafc45 100644 --- 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 56b661961..7afa3834c 100644 --- 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 index 000000000..8c8dd1336 --- /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 -- 2.47.3