Minor bug fixes

diff --git a/ChangeLog b/ChangeLog
index 884ee44..f31208d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 24 00:33:50 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (am_install_var): Typo fix.
+       (handle_configure): Require $inputs[0].
+
 Fri Nov 22 00:01:45 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_lib_objects): Fixed error message

diff --git a/TODO b/TODO
index ad9c7e3..2c56d2f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,7 +9,9 @@ Priorities for release:
 * for new autoconf:
   * completely handle multi-":" mode for AC_CONFIG_HEADER
   * Scan multiple input files when Makefile is generated?
-    This would provide flexibility for large projects
+    This would provide flexibility for large projects; subsumes
+    the "Makefile.tmpl" idea
+    Figuring out when to update the sub-parts is hard, maybe
   * figure out what to pass as CONFIG_HEADER to config.status
 
 * look @ jim's $(t:=foo) problem
@@ -102,9 +104,6 @@ from joerg-martin schwarz:
     Makefile variables automatically.
 
 Configuring in the large:
-* add support for Makefile.tmpl that is auto-included in every
-  Makefile.am.  That makes it easier to do some non-std thing in every
-  subdirectory.
 * allow hierarchy of dirs to share one aclocal.m4
   How?
 
@@ -373,18 +372,21 @@ document why EXTRA_* vars must be statically knowable
 
 document the "make SHELL='/bin/sh -x'" trick for debugging
 
+section on relationship to GNU make
+
+LDFLAGS; maybe why it is different from LIBADD/LDADD
+
+document that dependencies:
+* are put into .deps
+* are system-dependent
+
 ================================================================
 
 Things to do for autoconf:
 
-* allow random code to be inserted a la the 2nd arg to AC_OUTPUT:
-Joel> I know that the following is needed at the end of configure.in:
-Joel>         [test -z "$CONFIG_HEADERS" || echo timestamp >stamp-h])
-Joel> However, if automake checked that this line is present, it would
-Joel> help...this bit me for a while.
-
-* patch autoreconf to run automake and aclocal (this is done but
-  not really available)
+* patch autoreconf to run automake and aclocal.  I've done this but it is
+  not really available.  It can't be made available until automake
+  is officially released
 
 ================================================================
 

diff --git a/automake.in b/automake.in
index b06fabb..cc82781 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1738,7 +1738,7 @@ sub handle_tags
        if ($config_header && $relative_dir eq &dirname ($config_header))
        {
            # The config header is in this directory.  So require it.
-           ($xform = &basename ($config_header)) =~ s/(\W)/\\\1/g;
+           ($xform = &basename ($config_header)) =~ s/(\W)/\\$1/g;
        }
        $xform = ('s/\@CONFIG\@/' . $xform . '/;'
                  . 's/\@DIRS\@/' . join (' ', @tag_deps) . '/');
@@ -2389,7 +2389,9 @@ sub handle_configure
 
        if ($local =~ /^(.*):(.*)$/)
        {
-           # This is the ":" syntax of AC_OUTPUT.
+           # This is the ":" syntax of AC_OUTPUT.  Note that the
+           # first word on @inputs must be the name of the created
+           # file.
            @inputs = split (':', $2);
            $local = $1;
        }
@@ -2411,7 +2413,7 @@ sub handle_configure
        push (@actual_other_files, $local);
 
        &require_file_with_conf_line ($ac_output_line, $FOREIGN,
-                                     $input);
+                                     $inputs[0]);
     }
 
     # These files get removed by "make clean".
@@ -4201,7 +4203,7 @@ sub am_install_var
                        if (! $seen_libtool)
                        {
                            &am_line_error ($one_name,
-                                           "\`$rcurse' is a libtool library name, but AM_PROG_LIBTOOL is not in \`configure.in'");
+                                           "\`$rcurs' is a libtool library name, but AM_PROG_LIBTOOL is not in \`configure.in'");
                            $seen_libtool = 1;
                        }
 

diff --git a/m4/header.m4 b/m4/header.m4
index 0477b3a..6b15c34 100644 (file)
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -2,11 +2,11 @@
 
 AC_DEFUN(AM_CONFIG_HEADER,
 [AC_PREREQ([2.11.2])
-AC_CONFIG_HEADER($1)
+AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.
 dnl This file resides in the same directory as the config header
 dnl that is generated.  We must strip everything past the first ":",
 dnl and everything past the last "/".
-changequote(<<,>>)
-AC_OUTPUT_COMMANDS(<<test -z "<<$>>CONFIG_HEADER" || echo timestamp > patsubst($1, <<^\([^:]*/\)?.*>>, <<\1>>)>>)
-changequote([,])])
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+test -z "<<$>>CONFIG_HEADER" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl
+changequote([,]))])