FS-9260: fix make detection to not fail on openbsed, and fix libtoolize detection...

diff --git a/bootstrap.sh b/bootstrap.sh
index 97237d7a959e7122ea9ec25a1077a244d9785f36..f3bed2d4e18118c145772f363e4a9a44edd28987 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -159,7 +159,7 @@ check_lt_ver() {
 check_libtoolize() {
   # check libtoolize availability
   if [ -n "${LIBTOOL}" ]; then
-    libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize}
+    libtoolize=${LIBTOOLIZE:-`dirname "${LIBTOOL}"`/libtoolize}
   else
     libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize libtoolize22 libtoolize15 libtoolize14`}
   fi
@@ -190,7 +190,7 @@ check_make() {
   
   make=`which make`
   if [ -x "$make" ]; then
-     make_version=`$make --version | grep GNU`
+     make_version=`$make --version || true | grep GNU`
      if [ $? -ne 0 ]; then
         make=`which gmake`
         if [ -x "$make" ]; then