From: Michael Jerris <mike@jerris.com>
Date: Fri, 17 Jun 2016 17:41:59 +0000 (-0400)
Subject: FS-9260: fix make detection to not fail on openbsed, and fix libtoolize detection... 
X-Git-Tag: v1.6.10~1^2~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5502f4f53742e9731ea1a09a22ea0a1553817c69;p=thirdparty%2Ffreeswitch.git

FS-9260: fix make detection to not fail on openbsed, and fix libtoolize detection to attempt to find libtoolize the same version as specified libtool
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 97237d7a95..f3bed2d4e1 100755
--- 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