From: Glenn Morris <rgm@gnu.org>
Date: Sat, 3 Feb 2018 01:42:08 +0000 (-0500)
Subject: Try to work around intermittent autogen failure on hydra.nixos.org
X-Git-Tag: emacs-27.0.90~5734
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c532a8015e932fa4bee1ed68ce01b3c0b802d09c;p=emacs.git

Try to work around intermittent autogen failure on hydra.nixos.org

* autogen.sh (check_version): Try to handle odd systems where
/bin/sh does not define the "command" builtin.
---

diff --git a/autogen.sh b/autogen.sh
index acebc2381a3..2e6b62db843 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -82,7 +82,14 @@ check_version ()
         printf '%s' "(using $uprog0=$uprog) "
     fi
 
-    command -v $uprog > /dev/null || return 1
+    ## /bin/sh should always define the "command" builtin, but for
+    ## some odd reason sometimes it does not on hydra.nixos.org.
+    ## /bin/sh = "BusyBox v1.27.2", "built-in shell (ash)". ?
+    if command -v command > /dev/null; then
+        command -v $uprog > /dev/null || return 1
+    else
+        $uprog --version > /dev/null 2>&1 || return 1
+    fi
     have_version=`get_version $uprog` || return 4
 
     have_maj=`major_version $have_version`