libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: [PATCH] libtool: make fork minimisation compatible with dash and zs


From: Gary V. Vaughan
Subject: FYI: [PATCH] libtool: make fork minimisation compatible with dash and zsh.
Date: Sun, 18 Dec 2011 20:49:00 +0700

* build-aub/general.m4sh (lt_HAVE_PLUSEQ_OP): Instead of using
$((..)) arithmetic, which causes an error on dash, use a case
based bash version check.
(lt_HAVE_ARITH_OP, lt_HAVE_XSI_OPS): Also short circuit the
feature probing forks and set these automatically when zsh is
detected.
Reported by Stefano Lattarini.

Signed-off-by: Gary V. Vaughan <address@hidden>
---
 build-aux/general.m4sh |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index e96c0e4..3cfecee 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -75,14 +75,16 @@ basename='s|^.*/||'
 
 
 # We should try to minimise forks, especially on Windows where they are
-# unreasonably slow, so skip the feature probes when bash is being used:
-if test set = "${BASH_VERSION+set}"; then
+# unreasonably slow, so skip the feature probes when bash or zsh are
+# being used:
+if test set = "${BASH_VERSION+set}${ZSH_VERSION}"; then
     : ${lt_HAVE_ARITH_OP="yes"}
     : ${lt_HAVE_XSI_OPS="yes"}
     # The += operator was introduced in bash 3.1
-    test -z "$lt_HAVE_PLUSEQ_OP" \
-      && test 3000 -lt "$((${BASH_VERSINFO[0]}*1000 + ${BASH_VERSINFO[1]}))" \
-      && lt_HAVE_PLUSEQ_OP=yes
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0.*) ;;
+      *)                    lt_HAVE_PLUSEQ_OP=yes ;;
+    esac
 fi
 
 
-- 
1.7.8

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]