* automake.in (&conditional_ambiguous_p): Don't forget to ->string

the Conditionals.

diff --git a/ChangeLog b/ChangeLog
index 1a70d07..e751ec9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-06  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&conditional_ambiguous_p): Don't forget to ->string
+       the Conditionals.
+
 2002-10-31  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.texi (Dist): Fix the distcleancheck_listfiles example.

diff --git a/automake.in b/automake.in
index 519d9ca..6026b74 100755 (executable)
--- 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);
        }
     }