moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

buildconf: stop checking for libtool

Browse Source 
As we only use libtoolize, only check for that!
This commit is contained in:
Daniel Stenberg 2014-11-04 14:27:20 +01:00
parent 34f7a3a229
commit 98dcde4ec3
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
buildconf
View File

@ -190,32 +190,32 @@ else
fi fi
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# GNU libtool preliminary check # GNU libtoolize preliminary check
# #
want_lt_major=1 want_lt_major=1
want_lt_minor=4 want_lt_minor=4
want_lt_patch=2 want_lt_patch=2
want_lt_version=1.4.2 want_lt_version=1.4.2
# This approach that tries 'glibtool' first is intended for systems that # This approach that tries 'glibtoolize' first is intended for systems that
# have GNU libtool named as 'glibtool' and libtool not being GNU's. # have GNU libtool named as 'glibtoolize' and libtoolize not being GNU's.
libtool=`findtool glibtool 2>/dev/null` libtoolize=`findtool glibtoolize 2>/dev/null`
if test ! -x "$libtool"; then if test ! -x "$libtoolize"; then
libtool=`findtool ${LIBTOOL:-libtool}` libtoolize=`findtool ${LIBTOOLIZE:-libtoolize}`
fi fi
if test -z "$libtool"; then if test -z "$libtoolize"; then
echo "buildconf: libtool not found." echo "buildconf: libtoolize not found."
echo " You need GNU libtool $want_lt_version or newer installed." echo " You need GNU libtoolize $want_lt_version or newer installed."
exit 1 exit 1
fi fi
lt_pver=`$libtool --version 2>/dev/null|head -n 1` lt_pver=`$libtoolize --version 2>/dev/null|head -n 1`
lt_qver=`echo $lt_pver|sed -e "s/([^)]*)//g" -e "s/^[^0-9]*//g"` lt_qver=`echo $lt_pver|sed -e "s/([^)]*)//g" -e "s/^[^0-9]*//g"`
lt_version=`echo $lt_qver|sed -e "s/[- ].*//" -e "s/\([a-z]*\)$//"` lt_version=`echo $lt_qver|sed -e "s/[- ].*//" -e "s/\([a-z]*\)$//"`
if test -z "$lt_version"; then if test -z "$lt_version"; then
echo "buildconf: libtool not found." echo "buildconf: libtoolize not found."
echo " You need GNU libtool $want_lt_version or newer installed." echo " You need GNU libtoolize $want_lt_version or newer installed."
exit 1 exit 1
fi fi
old_IFS=$IFS; IFS='.'; set $lt_version; IFS=$old_IFS old_IFS=$IFS; IFS='.'; set $lt_version; IFS=$old_IFS
@ -245,27 +245,12 @@ else
lt_status="good" lt_status="good"
fi fi
if test "$lt_status" != "good"; then if test "$lt_status" != "good"; then
echo "buildconf: libtool version $lt_version found." echo "buildconf: libtoolize version $lt_version found."
echo " You need GNU libtool $want_lt_version or newer installed." echo " You need GNU libtoolize $want_lt_version or newer installed."
exit 1 exit 1
fi fi
echo "buildconf: libtool version $lt_version (ok)" echo "buildconf: libtoolize version $lt_version (ok)"
#--------------------------------------------------------------------------
# GNU libtoolize check
#
if test -z "$LIBTOOLIZE"; then
# use (g)libtoolize from same location as (g)libtool
libtoolize="${libtool}ize"
else
libtoolize=`findtool $LIBTOOLIZE`
fi
if test ! -f "$libtoolize"; then
echo "buildconf: libtoolize not found."
echo " You need GNU libtoolize $want_lt_version or newer installed."
exit 1
fi
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# m4 check # m4 check