This simple patch just changes
- if (/A([CM])_CONFIG_HEADER\s*\((.*)\)/
+ if (/A([CM])_CONFIG_HEADERS?\s*\((.*)\)/
but there are some trailing spaces which were killed too by
whitespace.el.
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* automake.in (scan_one_configure_file): Recognize also
AC_CONFIG_HEADERS.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.782
diff -u -r1.782 automake.in
--- automake.in 2000/04/05 20:55:48 1.782
+++ automake.in 2000/04/13 10:14:26
@@ -957,7 +957,7 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
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 @@
# 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 @@
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;
Akim
