From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 2 Jul 2003 22:20:32 +0000 (+0000)
Subject: * automake.in (cond_stack_else): Return FALSE if `if' was not
X-Git-Tag: Release-1-7b~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e832a8a9d157e2e019bc11e5ef23d22c4d399a11;p=thirdparty%2Fautomake.git

* 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 e63d4badb..159c7db3c 100644
--- 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 c9e25daaf..583fad20b 100755
--- 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.