kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Michael Jerris 2016-06-17 13:41:59 -04:00
parent b0be5d6737
commit 5502f4f537
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap.sh
View File

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