From eab87ba800bf45782ed7ae2d2648079b7078787f Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Thu, 14 Jun 2018 21:50:59 +0000 Subject: [PATCH] bootstrap: Replace which. Signed-off-by: Nils Gillmann --- bootstrap | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bootstrap b/bootstrap index a1cdcfa00..487f4817c 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,20 @@ #!/bin/sh +echo "Removing folder 'libltdl'..." rm -rf libltdl -echo -n "checking for libtoolize / libtool... " -which glibtoolize || which libtoolize || which libtool || { - echo "*** No libtoolize (libtool) or libtool found, please install it ***" - exit 1 + +echo "checking for libtoolize / libtool... " + +# This is more portable than `which' but comes with +# the caveat of not(?) properly working on busybox's ash: +existence() +{ + command -v "$1" >/dev/null 2>&1 } -autoreconf -if -. "bin/pogen.sh" + +if existence libtool || existence libtoolize || existence glibtoolize; then + autoreconf -if + . "bin/pogen.sh" +else + echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2; + exit 1 +fi -- 2.25.1