summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Gillmann <ng0@n0.is>2018-06-14 21:50:59 +0000
committerNils Gillmann <ng0@n0.is>2018-06-14 21:50:59 +0000
commiteab87ba800bf45782ed7ae2d2648079b7078787f (patch)
treed760ce28855f3596a2caa7c07f323298f8424801
parent3b8dabb7fb3241e2bddbaf70b568ed1ee015d1b6 (diff)
bootstrap: Replace which.
Signed-off-by: Nils Gillmann <ng0@n0.is>
-rwxr-xr-xbootstrap23
1 files 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