* automake.in (saw_sources_p): Correctly count header extensions

	seen.
	(handle_headers): Fixed order of arguments to am_install_var.
	* automake.in (am_install_var): Don't error if EXTRA_foo is
	defined uselessly.

diff --git a/ChangeLog b/ChangeLog
index 81e73f566e7e5c238cc62b2b5e15edab1bca6440..cedf2a6e679c65239e43de1f857775038598cece 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 1999-03-27  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (saw_sources_p): Correctly count header extensions
+       seen.
+       (handle_headers): Fixed order of arguments to am_install_var.
+
+       * automake.in (am_install_var): Don't error if EXTRA_foo is
+       defined uselessly.
+
        * scripts.am (install-@DIR@SCRIPTS): Use NDIR when appropriate.
        (uninstall-@DIR@SCRIPTS): Likewise.
        * progs.am (install-@DIR@PROGRAMS): Use NDIR when appropriate.

diff --git a/automake.in b/automake.in
index 0fb8edfa941bbc42080b9a26c46631cd14720b4e..5c07046a2a5041e2c9ca2c1fd6392b3b52e872fd 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3251,7 +3251,7 @@ sub handle_configure
 sub handle_headers
 {
     local (@r);
-    @r = &am_install_var ('header', '-defaultdist', 'HEADERS', 'include',
+    @r = &am_install_var ('-defaultdist', 'header', 'HEADERS', 'include',
                          'oldinclude', 'pkginclude',
                          'noinst', 'check');
     foreach (@r)
@@ -4988,7 +4988,8 @@ sub saw_sources_p
     }
     else
     {
-       $headers = defined $extension_seen{'header'};
+       local (@exts) = &lang_extensions ('header');
+       $headers = @exts;
     }
 
     return scalar keys %extension_seen > $headers;
@@ -6788,12 +6789,8 @@ sub am_install_var
            # all, or install targets.
            if ($X eq 'EXTRA')
            {
-               if (! $warned_about_extra && ! $do_require)
-               {
-                   $warned_about_extra = 1;
-                   &am_line_error ($one_name,
-                                   "\`$one_name' should not be defined");
-               }
+               # We used to warn if EXTRA_FOO was defined uselessly,
+               # but this was annoying.
                next;
            }