(scan_one_configure_file): Also recognize AC_CONFIG_HEADERS.

Remove trailing blanks.

1 files changed, 7 insertions, 7 deletions

diff --git a/automake.in b/automake.in
index c83e312eb..fe5f6fcfe 100755
--- a/automake.in
+++ b/automake.in
@@ -957,7 +957,7 @@ sub finish_languages
 	# dependency tracking was requested, and this extension
 	# supports it, then we don't generate the rule here.
 	local ($comp) = '';
-	
+
 	if ($use_dependencies && $language_map{$lang . '-autodep'} ne 'no')
 	{
 	    # Don't generate the rule, but still generate the variables.
@@ -1250,7 +1250,7 @@ sub handle_single_transform_list
 		    # Compute the rule to compile this object.
 		    local ($flag) = $language_map{$lang . '-flags'};
 		    local ($val) = "(${derived}_${flag}";
-		    ($rule = $language_map{$lang . '-compile'}) =~    
+		    ($rule = $language_map{$lang . '-compile'}) =~
 			s/\(AM_$flag/$val/;
 
 		    $rule .= ' ' . $language_map{$lang . '-output-arg'};
@@ -1996,7 +1996,7 @@ sub handle_ltlibraries
 	# Check that the library fits the standard naming convention.
     	$libname_rx = "^lib.*\.la";
 	if (&variable_value ($xlib . '_LDFLAGS') =~ /-module/
-	    || &variable_value ('LDFLAGS') =~ /-module/) 
+	    || &variable_value ('LDFLAGS') =~ /-module/)
 	{
 		# Relax name checking for libtool modules.
 	    	$libname_rx = "\.la";
@@ -2725,7 +2725,7 @@ sub handle_dist_worker
 	# thing.  If we're in the topmost directory, then we use
 	# `distdir' instead of `top_distdir'; this lets us work
 	# correctly with an enclosing package.
-	$output_rules .= 
+	$output_rules .=
 	    ("\t" . 'for subdir in $(' . $dist_subdir_name . '); do ' . "\\\n"
 	     . "\t" . '  if test "$$subdir" = .; then :; else ' . "\\\n"
 	     . "\t" . '    test -d $(distdir)/$$subdir ' . "\\\n"
@@ -2969,7 +2969,7 @@ sub add_depend2
 
 	local ($flag) = $language_map{$lang . '-flags'};
 	local ($val) = "(${derived}_${flag}";
-	($rule = $language_map{$lang . '-compile'}) =~    
+	($rule = $language_map{$lang . '-compile'}) =~
 	    s/\(AM_$flag/$val/;
 
 	$rule =~ s,([/\$]),\\$1,g;
@@ -4502,7 +4502,7 @@ sub scan_one_configure_file
 	# Handle configuration headers.  A config header of `[$1]'
 	# means we are actually scanning AM_CONFIG_HEADER from
 	# aclocal.m4.
-	if (/A([CM])_CONFIG_HEADER\s*\((.*)\)/
+	if (/A([CM])_CONFIG_HEADERS?\s*\((.*)\)/
 	    && $2 ne '[$1]')
 	{
 	    &am_conf_line_error
@@ -6266,7 +6266,7 @@ sub read_am_file
 	    local ($source_suffix);
 	    local ($object_suffix);
 
-	    if (($source_suffix, $object_suffix) = ($1 =~ $SUFFIX_RULE_PATTERN)) 
+	    if (($source_suffix, $object_suffix) = ($1 =~ $SUFFIX_RULE_PATTERN))
 	    {
 	      $suffix_rules{$source_suffix} = $object_suffix;
 	      print "Sources ending in .$source_suffix become .$object_suffix\n" if $verbose;