From 297d08ad26b5b2e01ca1e6f82f3e2ead9745ec07 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 5 Feb 1996 20:26:51 +0000
Subject: [PATCH] Merged in Cygnus changes

---
 ChangeLog   |  4 ++++
 Makefile.in |  2 ++
 TODO        |  2 ++
 automake.in | 31 ++++++++++++++++++++-----------
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2f0beb7..fa001489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@ Tue Jan 30 12:19:09 1996  Tom Tromey  (tromey@gerbil.cygnus.com)
 
 Fri Jan 26 00:15:25 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* automake.in (am_conf_error): New function.
+	(scan_configure): Use it.
+	(scan_configure): A comma also ends AC_OUTPUT macro.
+
 	* automake.in (read_am_file): Compute top_builddir when including
 	header-vars.am.
 	(handle_configure): Use $top_builddir, not $top_reldir.
diff --git a/Makefile.in b/Makefile.in
index 7ab92817..af582b6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,8 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
+top_builddir = .
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/TODO b/TODO
index b3a94212..c846e743 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,8 @@ Top priorities:
 * Must rewrite am_install_var.  Should break into multiple functions.
   This will allow the callers to be a little smarter.
 * Rewrite clean targets.
+* Use @other_input_files to automate regeneration.  Must do dirname
+  canonicalization
 
 Handle MAINT_CHARSET.  Use recode in dist target.  Handle dist-zoo and
 dist-zip.
diff --git a/automake.in b/automake.in
index 31637d7e..097f53bd 100755
--- a/automake.in
+++ b/automake.in
@@ -1101,10 +1101,9 @@ sub handle_configure
 	if defined $contents{'CONFIG_HEADER'};
 
     # Generate CONFIG_HEADER define, and define interally.
-    $output_vars .= "CONFIG_HEADER = ${top_builddir}${config_name}\n"
-	if $config_name;
-    $contents{'CONFIG_HEADER'} = "${top_builddir}${config_name}"
+    $output_vars .= "CONFIG_HEADER = ${top_builddir}/${config_name}\n"
 	if $config_name;
+    $contents{'CONFIG_HEADER'} = "${top_builddir}/${config_name}";
 }
 
 # Handle C headers.
@@ -1431,7 +1430,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)
@@ -1455,15 +1454,17 @@ sub scan_configure
 	{
 	    if (! defined $contents{'SUBDIRS'})
 	    {
-		&am_error
+		&am_conf_error
 		    ("ud_GNU_GETTEXT in configure.in but SUBDIRS not defined");
 	    }
 	    else
 	    {
-		&am_error ("ud_GNU_GETTEXT in configure.in but \`po' not in SUBDIRS")
-		    if $contents{'SUBDIRS'} !~ /\bpo\b/;
-		&am_error ("ud_GNU_GETTEXT in configure.in but \`intl' not in SUBDIRS")
-		    if $contents{'SUBDIRS'} !~ /\bintl\b/;
+		&am_conf_error
+		    ("ud_GNU_GETTEXT in configure.in but \`po' not in SUBDIRS")
+			if $contents{'SUBDIRS'} !~ /\bpo\b/;
+		&am_conf_error
+		    ("ud_GNU_GETTEXT in configure.in but \`intl' not in SUBDIRS")
+			if $contents{'SUBDIRS'} !~ /\bintl\b/;
 	    }
 
 	    &require_file ($NORMAL, 'ABOUT-NLS');
@@ -1503,9 +1504,9 @@ sub scan_configure
     &require_file ($NORMAL, 'config.guess', 'config.sub')
 	if $seen_canonical;
 
-    &am_error ("fp_PROG_INSTALL must be used in configure.in")
+    &am_conf_error ("fp_PROG_INSTALL must be used in configure.in")
 	unless $seen_prog_install;
-    &am_error ("AC_ARG_PROGRAM must be used in configure.in")
+    &am_conf_error ("AC_ARG_PROGRAM must be used in configure.in")
 	unless $seen_arg_prog;
 
     close (CONFIGURE);
@@ -2220,6 +2221,14 @@ sub am_error
     $exit_status = 1;
 }
 
+# The same, but while scanning configure.in.
+sub am_conf_error
+{
+    # FIXME can run in subdirs.
+    warn "automake: configure.in: ", join (' ', @_), "\n";
+    $exit_status = 1;
+}
+
 # Print usage information.
 sub usage
 {
-- 
2.43.5