From f135fe5ba17057ee7246eb94d2e867e6e367cf52 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 6 Nov 2002 10:47:30 +0000 Subject: [PATCH] * automake.in (&conditional_ambiguous_p): Don't forget to ->string the Conditionals. --- ChangeLog | 5 +++++ automake.in | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a70d07d..e751ec9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-11-06 Akim Demaille + + * automake.in (&conditional_ambiguous_p): Don't forget to ->string + the Conditionals. + 2002-10-31 Alexandre Duret-Lutz * automake.texi (Dist): Fix the distcleancheck_listfiles example. diff --git a/automake.in b/automake.in index 519d9ca0..6026b741 100755 --- a/automake.in +++ b/automake.in @@ -6112,12 +6112,14 @@ sub conditional_ambiguous_p ($$@) } elsif ($vcond->true_when ($cond)) { - return ("$var was already defined in condition $vcond, " + return ("$var was already defined in condition " + . $vcond->string . ", " . "which implies condition ". $cond->string, $vcond); } elsif ($cond->true_when ($vcond)) { - return ("$var was already defined in condition $vcond, " + return ("$var was already defined in condition " + . $vcond->string . ", " . "which is implied by condition " . $cond->string, $vcond); } } -- 2.43.5