* automake.in (cond_stack_else): Return FALSE if `if' was not

used.
(cond_stack_endif): Return TRUE if `if' was not used.  Do not
display $negate and $cond, they are irrelevant and maybe undefined.

diff --git a/ChangeLog b/ChangeLog
index e63d4badb0a15a1474d2927c72d19252729485c6..159c7db3c940f23bdf7613fab7f373a43785fd88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-03  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (cond_stack_else): Return FALSE if `if' was not
+       used.
+       (cond_stack_endif): Return TRUE if `if' was not used.  Do not
+       display $negate and $cond, they are irrelevant and maybe undefined.
+
 2003-07-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):

diff --git a/automake.in b/automake.in
index c9e25daaf968dfa54e1e239b564289730cce33b9..583fad20ba190654f617ff0f6f13ff3531408d13 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5435,7 +5435,7 @@ sub cond_stack_else ($$$)
   if (! @cond_stack)
     {
       error $where, "else without if";
-      return;
+      return FALSE;
     }
 
   $cond_stack[$#cond_stack] =
@@ -5465,8 +5465,8 @@ sub cond_stack_endif ($$$)
 
   if (! @cond_stack)
     {
-      error $where, "endif without if: $negate$cond";
-      return;
+      error $where, "endif without if";
+      return TRUE;
     }
 
   # If $COND is given, check against it.