Bug fix, plus test

diff --git a/ChangeLog b/ChangeLog
index 5df9dd4ea89223c1595a653b46c77d176136c710..54eb0966059ab3558a6f730386e176fe18752bcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 12 10:39:28 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (scan_configure): Delete everything after "," or
+       ")".  Test acoutnoq.test.
+       (handle_dist): Use $relative_dir, not nonexistent $subdir.
+
 Sun Feb 11 15:55:15 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_texinfo): Removed bogus error message.

diff --git a/THANKS b/THANKS
index 8c832e3c552334d8b88904e9d1946398c4a9370e..51750ffc0a0ec71d787d7d7a182a4240ef32d87f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -5,6 +5,8 @@ people:
 François Pinard <pinard@iro.umontreal.ca>
 Gord Matzigkeit <gord@enci.ucalgary.ca>
 Greg A. Woods <woods@most.weird.com>
+Jerome Santini <santini@chambord.univ-orleans.fr>
 Jim Meyering <meyering@na-net.ornl.gov>
 Karl Berry <kb@cs.umb.edu>
+Noah Friedman <friedman@gnu.ai.mit.edu>
 Ulrich Drepper <drepper@gnu.ai.mit.edu>

diff --git a/automake.in b/automake.in
index c32ac228f1b55d283439e25de1a85661e7c6fc8c..ee8ddb227637bd8115878fb2454333b493eb2ad5 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -642,13 +642,6 @@ sub grep_for_vers_texi
     return '';
 }
 
-# Do work of building, etc, Texinfo.  Works for either info or html,
-# depending on first argument.
-sub texinfo_worker
-{
-    local ($dest) = @_;
-}
-
 # Handle all Texinfo source.
 sub handle_texinfo
 {
@@ -998,7 +991,7 @@ sub handle_dist
     {
        &am_error ("DIST_CHARSET defined but no MAINT_CHARSET defined")
            if ! $local_maint_charset;
-       if ($subdir eq '.')
+       if ($relative_dir eq '.')
        {
            $dist_charset = $contents{'DIST_CHARSET'}
        }
@@ -1579,7 +1572,7 @@ sub scan_configure
        if ($in_ac_output)
        {
            s/\].*$//;
-           $in_ac_output = 0 if s/[\),]//;
+           $in_ac_output = 0 if s/[\),].*$//;
 
            # Look at potential Makefile.am's.
            foreach (split)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index e6d5028cffecad6d5a2f3994be60e78671fba26f..02308a02964d93d5c513d4b4ca7456c1d4e2dab6 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 12 10:05:48 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * Makefile.am (DIST_OTHER): New variable.
+
+       * acoutnoq.test: New file.
+
 Sun Feb 11 16:39:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * checkall.test: Delay a little.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e49f5290efd8a6f2687984ceddae7b48dfba84e2..a5ee951750e9c903e680dc2e6e5594cc62b39a9a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,10 @@ AUTOMAKE_OPTIONS = gnits
 
 ## FIXME Ulrich has suggested implementing this in Automake.
 ## Perhaps he is right.
-TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test
+TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
+acoutnoq.test
+
+DIST_OTHER = $(TESTS)
 
 check-local:
        @failed=0; all=0; \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a4b76e0a9edc3a9acced1839e89daa2fe3ca93fe..78c38cdec78452ab77f84bdf759ecc9b4eaf666c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.3 from Makefile.am
+# Makefile.in generated automatically by automake 0.30 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -40,7 +40,10 @@ transform = @program_transform_name@
 
 AUTOMAKE_OPTIONS = gnits
 
-TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test
+TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
+acoutnoq.test
+
+DIST_OTHER = $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in
 
 

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
new file mode 100755 (executable)
index 0000000..e9af2ea
--- /dev/null
+++ b/tests/acoutnoq.test
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Test for bug reported by Jerome Santini.
+# If I put this line in my configure.in:
+# AC_OUTPUT(Makefile src/Makefile tests/Makefile, echo timestamp > stamp-h)dnl
+# automake is not happy:
+# [ ... ]
+
+. $srcdir/defs
+
+cat > configure.in << 'END'
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile, [true])
+END
+
+: > Makefile.am
+
+$AUTOMAKE