From a0ade5d3d65a9045c7ad714669a558eed7f5afe4 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 2 Jul 2003 23:15:52 +0000 Subject: [PATCH] * automake.in (handle_single_transform_list): Use $var->name to print variable in the configure-substitution diagnostic. Do not mention the parent when it is the variable itself. --- ChangeLog | 4 ++++ automake.in | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1422fe9d0..5032efc79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-07-03 Alexandre Duret-Lutz + * automake.in (handle_single_transform_list): Use $var->name + to print variable in the configure-substitution diagnostic. + Do not mention the parent when it is the variable itself. + * tests/package.test: Delete. * tests/Makefile.am (TESTS): Remove package.test. diff --git a/automake.in b/automake.in index 583fad20b..a8142eb34 100755 --- a/automake.in +++ b/automake.in @@ -1894,11 +1894,14 @@ sub handle_single_transform_list ($$$$@) # Configure substitutions in _SOURCES variables are errors. if (/^\@.*\@$/) { - err_var ($var, - "`$var' includes configure substitution `$_', and is " . - "referred to\nfrom `$topparent': configure " . - "substitutions are not allowed\nin _SOURCES variables"); - next; + my $parent_msg = ''; + $parent_msg = "\nand is referred to from `$topparent'" + if $topparent ne $var->name; + err_var ($var, + "`" . $var->name . "' includes configure substitution `$_'" + . $parent_msg . ";\nconfigure " . + "substitutions are not allowed in _SOURCES variables"); + next; } # If the source file is in a subdirectory then the `.o' is put -- 2.47.2