From: Tom Tromey <tromey@redhat.com>
Date: Mon, 12 Feb 1996 20:59:46 +0000 (+0000)
Subject: Fixed bug reported by Franc,ois
X-Git-Tag: Release-0-30~27
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fe786eecc62b9792380e714fe5a58f075318e44f;p=automake.git

Fixed bug reported by Franc,ois
---

diff --git a/ChangeLog b/ChangeLog
index 54eb0966..cbcb87d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
 Mon Feb 12 10:39:28 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* automake.in (scan_configure): Ignore "\" in AC_OUTPUT line.
+	Test acouttbs.test.
+
 	* automake.in (scan_configure): Delete everything after "," or
 	")".  Test acoutnoq.test.
 	(handle_dist): Use $relative_dir, not nonexistent $subdir.
+	(handle_subdirs): 'po' and 'intl' are sometimes substituted into
+	SUBDIRS; don't warn about their absence.
 
 Sun Feb 11 15:55:15 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
diff --git a/TODO b/TODO
index 067ee8d0..0013c60f 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,8 @@ Top priorities:
 * Rewrite clean targets.
 * Expand test suite.
 
+Makefile.in must now depend on configure.in
+
 Consider using Ulrich's test suite idea
 If so, also allow support for Cygnus-style dejagnu-based test suites
 via an option
diff --git a/automake.in b/automake.in
index ee8ddb22..856124c0 100755
--- a/automake.in
+++ b/automake.in
@@ -1097,13 +1097,6 @@ sub handle_subdirs
 	return;
     }
 
-    &am_conf_error
-	("ud_GNU_GETTEXT in configure.in but \`po' not in SUBDIRS")
-	    if $seen_gettext && $contents{'SUBDIRS'} !~ /\bpo\b/;
-    &am_conf_error
-	("ud_GNU_GETTEXT in configure.in but \`intl' not in SUBDIRS")
-	    if $seen_gettext && $contents{'SUBDIRS'} !~ /\bintl\b/;
-
     &require_file ($NORMAL, 'ABOUT-NLS') if $seen_gettext;
 
     return if ! defined $contents{'SUBDIRS'};
@@ -1577,6 +1570,7 @@ sub scan_configure
 	    # Look at potential Makefile.am's.
 	    foreach (split)
 	    {
+		next if $_ eq "\\";
 		if (-f $_ . '.am')
 		{
 		    push (@make_list, $_);
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 02308a02..eabfe8f1 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Mon Feb 12 10:05:48 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* acouttbs.test: New file.
+
 	* Makefile.am (DIST_OTHER): New variable.
 
 	* acoutnoq.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5ee9517..675b95c1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ 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 \
-acoutnoq.test
+acoutnoq.test acouttbs.test
 
 DIST_OTHER = $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 78c38cde..1ed49398 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -41,7 +41,7 @@ transform = @program_transform_name@
 AUTOMAKE_OPTIONS = gnits
 
 TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
-acoutnoq.test
+acoutnoq.test acouttbs.test
 
 DIST_OTHER = $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in