Simplify, avoid unbalanced parentheses from last change.

* lib/m4sugar/m4sh.m4 (_AS_VAR_ARITH_PREPARE): Simplify, avoid
unbalanced parentheses from last change.
Spotted by Eric Blake, fix suggested by Paolo Bonzini.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 7a8502d8e38c81c7b7f330a23ca3ff2fe83edc58..cdce7ec2c30160c9d55bfc25c77412f5829fb5e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-11-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * lib/m4sugar/m4sh.m4 (_AS_VAR_ARITH_PREPARE): Simplify, avoid
+       unbalanced parentheses from last change.
+       Spotted by Eric Blake, fix suggested by Paolo Bonzini.
+
        Fix exit status of expr version of as_func_arith.
        * lib/m4sugar/m4sh.m4 (_AS_VAR_ARITH_PREPARE): Count an exit
        status of 1 of expr also as success, to avoid failure if the

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 56697ad5c3f09c4d1c4aa04fc72d4f0a7c357397..2c592c612eec81d56252e97369e21e805f140734 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1742,8 +1742,7 @@ AS_IF([_AS_RUN(["AS_ESCAPE(m4_quote(_AS_VAR_ARITH_WORKS))"])],
   }'],
 [as_func_arith ()
   {
-    as_val=`expr "$[]@"`
-    case $? in 0|1) :;; *) false;; esac
+    as_val=`expr "$[]@" || test $? -eq 1`
   }]) # as_func_arith
 ])