[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38-fyi-fix-read-am-file-here.patch
From: |
Akim Demaille |
Subject: |
38-fyi-fix-read-am-file-here.patch |
Date: |
Sun, 21 Oct 2001 20:12:39 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&require_file_with_macro): Use &require_file.
(&read_am_file): Move the definition of $here at its proper place.
Index: automake.in
--- automake.in Sun, 21 Oct 2001 18:00:23 +0200 akim
+++ automake.in Sun, 21 Oct 2001 18:33:55 +0200 akim
@@ -2965,8 +2965,8 @@ sub scan_texinfo_file
$outfile = $1;
if ($outfile =~ /\.(.+)$/ && $1 ne 'info')
{
- &am_file_error ($filename, "$.: ",
- "output `$outfile' has unrecognized extension");
+ am_file_error ("$filename:$.",
+ "output `$outfile' has unrecognized extension");
return;
}
}
@@ -5638,7 +5638,7 @@ sub cond_stack_if ($$$)
{
my ($negate, $cond, $where) = @_;
- &am_file_error ($where, "$cond does not appear in AM_CONDITIONAL")
+ am_file_error ($where, "$cond does not appear in AM_CONDITIONAL")
if ! $configure_cond{$cond} && $cond !~ /^TRUE|FALSE$/;
$cond = "${cond}_TRUE"
@@ -5661,7 +5661,7 @@ sub cond_stack_else ($$$)
if (! @cond_stack)
{
- &am_file_error ($where, "else without if");
+ am_file_error ($where, "else without if");
return;
}
@@ -5675,9 +5675,9 @@ sub cond_stack_else ($$$)
$cond = condition_negate ($cond)
if $negate;
- &am_file_error ($where,
- "else reminder ($negate$cond) incompatible with "
- . "current conditional: $cond_stack[$#cond_stack]")
+ am_file_error ($where,
+ "else reminder ($negate$cond) incompatible with "
+ . "current conditional: $cond_stack[$#cond_stack]")
if $cond_stack[$#cond_stack] ne $cond;
}
@@ -5695,7 +5695,7 @@ sub cond_stack_endif ($$$)
if (! @cond_stack)
{
- &am_file_error ($where, "endif without if: $negate$cond");
+ am_file_error ($where, "endif without if: $negate$cond");
return;
}
@@ -5708,9 +5708,9 @@ sub cond_stack_endif ($$$)
$cond = condition_negate ($cond)
if $negate;
- &am_file_error ($where,
- "endif reminder ($negate$cond) incompatible with "
- . "current conditional: $cond_stack[$#cond_stack]")
+ am_file_error ($where,
+ "endif reminder ($negate$cond) incompatible with "
+ . "current conditional: $cond_stack[$#cond_stack]")
if $cond_stack[$#cond_stack] ne $cond;
}
@@ -6743,10 +6743,11 @@ sub read_am_file ($)
my $last_var_name = '';
my $last_var_type = '';
my $last_var_value = '';
- my $here = "$amfile:$.";
# FIXME: shouldn't use $_ in this loop; it is too big.
while ($_)
{
+ my $here = "$amfile:$.";
+
$_ .= "\n"
unless substr ($_, -1, 1) eq "\n";
@@ -7117,9 +7118,9 @@ sub file_contents_internal ($$%)
foreach (make_paragraphs ($file, %transform))
{
# Sanity checks.
- &am_file_error ($file, "blank line following trailing backslash:\n$_")
+ am_file_error ($file, "blank line following trailing backslash:\n$_")
if /\\$/;
- &am_file_error ($file, "comment following trailing backslash:\n$_")
+ am_file_error ($file, "comment following trailing backslash:\n$_")
if /\\#/;
if (/^$/)
@@ -7242,7 +7243,7 @@ sub file_contents_internal ($$%)
elsif (/$ASSIGNMENT_PATTERN/mso)
{
my ($var, $type, $val) = ($1, $2, $3);
- &am_file_error ($file, "macro `$var' with trailing backslash")
+ am_file_error ($file, "macro `$var' with trailing backslash")
if /\\$/;
# Accumulating variables must not be output.
@@ -7844,18 +7845,18 @@ sub require_file ($$@)
sub require_file_with_macro ($$@)
{
my ($macro, $mystrict, @files) = @_;
- @require_file_paths = $relative_dir;
- require_file_internal ($var_location{$macro}, $mystrict, @files);
+ require_file ($var_location{$macro}, $mystrict, @files);
}
# &require_conf_file ($WHERE, $MYSTRICT, @FILES)
# ----------------------------------------------
+# Looks in configuration path, as specified by AC_CONFIG_AUX_DIR.
sub require_conf_file ($$@)
{
my ($where, $mystrict, @files) = @_;
@require_file_paths = @config_aux_path;
- &require_file_internal ($where, $mystrict, @files);
+ require_file_internal ($where, $mystrict, @files);
my $dir = $require_file_paths[0];
@config_aux_path = @require_file_paths;
# Avoid unsightly '/.'s.
@@ -7874,7 +7875,7 @@ sub require_config_file ($@)
}
# &require_conf_file_with_macro ($MACRO, $MYSTRICT, @FILES)
-# -------------------------------------------------------
+# ---------------------------------------------------------
sub require_conf_file_with_macro ($$@)
{
my ($macro, $mystrict, @files) = @_;
@@ -8037,7 +8038,7 @@ sub am_error
# am_file_error ($FILE, @ARGS)
# ----------------------------
-sub am_file_error
+sub am_file_error ($@)
{
my ($file, @args) = @_;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 38-fyi-fix-read-am-file-here.patch,
Akim Demaille <=