From 209b51ef3975e36b5bc28a51a255e4330b07ef7c Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 31 Dec 2002 21:24:46 +0000 Subject: [PATCH] * automake.in (err): Rename as ... (error): ... this. Adjust all callers. Suggested by H.Merijn Brand. --- ChangeLog | 6 +++ THANKS | 1 + automake.in | 127 ++++++++++++++++++++++++++-------------------------- 3 files changed, 71 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63671468..0de31eed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-31 Alexandre Duret-Lutz + + * automake.in (err): Rename as ... + (error): ... this. Adjust all callers. + Suggested by H.Merijn Brand. + 2002-12-13 Alexandre Duret-Lutz * tests/version7.test: Require GNU make. diff --git a/THANKS b/THANKS index 47cf7a03..d4dc904b 100644 --- a/THANKS +++ b/THANKS @@ -71,6 +71,7 @@ Greg A. Woods woods@most.weird.com Guido Draheim guidod@gmx.de Gustavo Carneiro gjc@inescporto.pt H.J. Lu hjl@lucon.org +H.Merijn Brand h.m.brand@hccnet.nl Harlan Stenn Harlan.Stenn@pfcs.com Henrik Frystyk Nielsen frystyk@w3.org Ian Lance Taylor ian@cygnus.com diff --git a/automake.in b/automake.in index 6299b855..b6e93784 100755 --- a/automake.in +++ b/automake.in @@ -1147,7 +1147,7 @@ do { if (! -f ($am_file . '.am')) { - &err ("`$am_file.am' does not exist"); + &error ("`$am_file.am' does not exist"); } else { @@ -1173,11 +1173,11 @@ sub prog_error ($;%) msg 'automake', '', $msg, %opts; } -# err ($WHERE, $MESSAGE, [%OPTIONS]) -# err ($MESSAGE) -# ---------------------------------- +# error ($WHERE, $MESSAGE, [%OPTIONS]) +# error ($MESSAGE) +# ------------------------------------ # Uncategorized errors. -sub err ($;$%) +sub error ($;$%) { my ($where, $msg, %opts) = @_; msg ('error', $where, $msg, %opts); @@ -1909,8 +1909,8 @@ sub process_option_list # Got a version number. if (version_check $&) { - err ($where, "require Automake $_, but have $VERSION", - uniq_scope => US_GLOBAL); + error ($where, "require Automake $_, but have $VERSION", + uniq_scope => US_GLOBAL); return 1; } } @@ -1924,8 +1924,8 @@ sub process_option_list } else { - err ($where, "option `$_' not recognized", - uniq_scope => US_GLOBAL); + error ($where, "option `$_' not recognized", + uniq_scope => US_GLOBAL); return 1; } } @@ -3372,7 +3372,7 @@ sub handle_libraries # Check that the library fits the standard naming convention. if (basename ($onelib) !~ /^lib.*\.a/) { - err $where, "`$onelib' is not a standard library name"; + error $where, "`$onelib' is not a standard library name"; } $where->push_context ("while processing library `$onelib'"); @@ -3480,9 +3480,9 @@ sub handle_ltlibraries # implied conditions, etc.) if (defined $instdirs{$lib} && $instdirs{$lib} ne $dir) { - err ($where, "`$lib' is already going to be installed in " - . "`$instdirs{$lib}'", partial => 1); - err ($liblocations{$lib}, "`$lib' previously declared here"); + error ($where, "`$lib' is already going to be installed in " + . "`$instdirs{$lib}'", partial => 1); + error ($liblocations{$lib}, "`$lib' previously declared here"); } else { @@ -3684,7 +3684,8 @@ sub scan_texinfo_file $outfile = $1; if ($outfile =~ /\.(.+)$/ && $1 ne 'info') { - err "$filename:$.", "output `$outfile' has unrecognized extension"; + error ("$filename:$.", + "output `$outfile' has unrecognized extension"); return; } } @@ -5338,12 +5339,12 @@ sub scan_autoconf_traces ($) } elsif ($macro eq 'AM_AUTOMAKE_VERSION') { - err ($where, - "version mismatch. This is Automake $VERSION,\n" . - "but the definition used by this AM_INIT_AUTOMAKE\n" . - "comes from Automake $args[1]. You should recreate\n" . - "aclocal.m4 with aclocal and run automake again.\n") - if ($VERSION ne $args[1]); + error ($where, + "version mismatch. This is Automake $VERSION,\n" . + "but the definition used by this AM_INIT_AUTOMAKE\n" . + "comes from Automake $args[1]. You should recreate\n" . + "aclocal.m4 with aclocal and run automake again.\n") + if $VERSION ne $args[1]; $seen_automake_version = 1; } @@ -5426,18 +5427,18 @@ sub scan_autoconf_files { if (-f 'aclocal.m4') { - err ($seen_init_automake || $me, - "your implementation of AM_INIT_AUTOMAKE comes from " . - "an\nold Automake version. You should recreate " . - "aclocal.m4\nwith aclocal and run automake again.\n"); + error ($seen_init_automake || $me, + "your implementation of AM_INIT_AUTOMAKE comes from " . + "an\nold Automake version. You should recreate " . + "aclocal.m4\nwith aclocal and run automake again.\n"); } else { - err ($seen_init_automake || $me, - "no proper implementation of AM_INIT_AUTOMAKE was " . - "found,\nprobably because aclocal.m4 is missing...\n" . - "You should run aclocal to create this file, then\n" . - "run automake again.\n"); + error ($seen_init_automake || $me, + "no proper implementation of AM_INIT_AUTOMAKE was " . + "found,\nprobably because aclocal.m4 is missing...\n" . + "You should run aclocal to create this file, then\n" . + "run automake again.\n"); } } @@ -6030,7 +6031,7 @@ sub cond_stack_if ($$$) { my ($negate, $cond, $where) = @_; - err $where, "$cond does not appear in AM_CONDITIONAL" + error $where, "$cond does not appear in AM_CONDITIONAL" if ! $configure_cond{$cond} && $cond !~ /^TRUE|FALSE$/; push (@cond_stack, make_conditional_string ($negate, $cond)); @@ -6048,7 +6049,7 @@ sub cond_stack_else ($$$) if (! @cond_stack) { - err $where, "else without if"; + error $where, "else without if"; return; } @@ -6060,8 +6061,8 @@ sub cond_stack_else ($$$) { $cond = make_conditional_string ($negate, $cond); - err ($where, "else reminder ($negate$cond) incompatible with " - . "current conditional: $cond_stack[$#cond_stack]") + error ($where, "else reminder ($negate$cond) incompatible with " + . "current conditional: $cond_stack[$#cond_stack]") if $cond_stack[$#cond_stack] ne $cond; } @@ -6079,7 +6080,7 @@ sub cond_stack_endif ($$$) if (! @cond_stack) { - err $where, "endif without if: $negate$cond"; + error $where, "endif without if: $negate$cond"; return; } @@ -6088,8 +6089,8 @@ sub cond_stack_endif ($$$) { $cond = make_conditional_string ($negate, $cond); - err ($where, "endif reminder ($negate$cond) incompatible with " - . "current conditional: $cond_stack[$#cond_stack]") + error ($where, "endif reminder ($negate$cond) incompatible with " + . "current conditional: $cond_stack[$#cond_stack]") if $cond_stack[$#cond_stack] ne $cond; } @@ -6246,7 +6247,7 @@ sub macro_define ($$$$$$) # We will adjust the owner of this variable unless told otherwise. my $adjust_owner = 1; - err $where, "bad characters in variable name `$var'" + error $where, "bad characters in variable name `$var'" if $var !~ /$MACRO_PATTERN/o; # NEWS-OS 4.2R complains if a Makefile variable begins with `_'. @@ -6272,15 +6273,15 @@ sub macro_define ($$$$$$) && exists $var_type{$var}{$cond} && $var_type{$var}{$cond} ne $type) { - err ($where, "$var was set with `$var_type{$var}=' " - . "and is now set with `$type='"); + error ($where, "$var was set with `$var_type{$var}=' " + . "and is now set with `$type='"); } } else { if (!exists $var_type{$var} && $type eq '+') { - err $where, "$var must be set with `=' before using `+='"; + error $where, "$var must be set with `=' before using `+='"; } } $var_type{$var}{$cond} = $type; @@ -6367,13 +6368,13 @@ sub macro_define ($$$$$$) my $undef_cond = variable_not_always_defined_in_cond $var, $cond; if (! $undef_cond->false) { - err ($where, - "Cannot apply `+=' because `$var' is not defined " - . "in\nthe following conditions:\n " - . join ("\n ", map { $_->human } $undef_cond->conds) - . "\nEither define `$var' in these conditions," - . " or use\n`+=' in the same conditions as" - . " the definitions."); + error ($where, + "Cannot apply `+=' because `$var' is not defined " + . "in\nthe following conditions:\n " + . join ("\n ", map { $_->human } $undef_cond->conds) + . "\nEither define `$var' in these conditions," + . " or use\n`+=' in the same conditions as" + . " the definitions."); } else { @@ -7626,7 +7627,7 @@ sub read_am_file ($$) } elsif (/$WHITE_PATTERN/o) { - err $where, "blank line following trailing backslash" + error $where, "blank line following trailing backslash" if $saw_bk; # Stick a single white line before the incoming macro or rule. $spacing = "\n"; @@ -7689,7 +7690,7 @@ sub read_am_file ($$) { # Stick a single white line before the incoming macro or rule. $spacing = "\n"; - err $where, "blank line following trailing backslash" + error $where, "blank line following trailing backslash" if $saw_bk; } elsif (/$COMMENT_PATTERN/o) @@ -7697,7 +7698,7 @@ sub read_am_file ($$) # Stick comments before the incoming macro or rule. $comment .= $spacing . $_; $spacing = ''; - err $where, "comment following trailing backslash" + error $where, "comment following trailing backslash" if $saw_bk && $comment eq ''; $prev_state = IN_COMMENT; } @@ -7843,7 +7844,7 @@ sub read_am_file ($$) $output_trailer .= $cond->subst_string; $output_trailer .= $_; $comment = $spacing = ''; - err $where, "`#' comment at start of rule is unportable" + error $where, "`#' comment at start of rule is unportable" if $_ =~ /^\t\s*\#/; } @@ -7853,8 +7854,8 @@ sub read_am_file ($$) $output_trailer .= $comment; - err ($where, (@cond_stack ? "unterminated conditionals: @cond_stack" - : "too many conditionals closed in include file")) + error ($where, (@cond_stack ? "unterminated conditionals: @cond_stack" + : "too many conditionals closed in include file")) if "@saved_cond_stack" ne "@cond_stack"; } @@ -8076,9 +8077,9 @@ sub file_contents_internal ($$$%) $where->set ($file); # Sanity checks. - err $where, "blank line following trailing backslash:\n$_" + error $where, "blank line following trailing backslash:\n$_" if /\\$/; - err $where, "comment following trailing backslash:\n$_" + error $where, "comment following trailing backslash:\n$_" if /\\#/; if (/^$/) @@ -8199,7 +8200,7 @@ sub file_contents_internal ($$$%) elsif (/$ASSIGNMENT_PATTERN/mso) { my ($var, $type, $val) = ($1, $2, $3); - err $where, "variable `$var' with trailing backslash" + error $where, "variable `$var' with trailing backslash" if /\\$/; $is_rule = 0; @@ -8235,9 +8236,9 @@ sub file_contents_internal ($$$%) } } - err ($where, @cond_stack ? - "unterminated conditionals: @cond_stack" : - "too many conditionals closed in include file") + error ($where, @cond_stack ? + "unterminated conditionals: @cond_stack" : + "too many conditionals closed in include file") if "@saved_cond_stack" ne "@cond_stack"; return ($comment, $result_vars, $result_rules); @@ -8526,9 +8527,9 @@ sub am_install_var { if ($nodir_name eq 'EXTRA') { - err ($where, - "`$one_name' contains configure substitution, " - . "but shouldn't"); + error ($where, + "`$one_name' contains configure substitution, " + . "but shouldn't"); } # Check here to make sure variables defined in # configure.ac do not imply that EXTRA_PRIMARY @@ -9053,7 +9054,7 @@ sub require_variables ($$$@) . "`autoconf' again."; } - err $where, $text, uniq_scope => US_GLOBAL; + error $where, $text, uniq_scope => US_GLOBAL; } return $res; } -- 2.43.5