moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

buildconf: follow-up for commit 7e02f7fd

This commit is contained in:
Yang Tse 2011-11-30 21:53:21 +01:00
parent 7e02f7fdee
commit c92234c3bc
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
buildconf
View File

@ -331,24 +331,31 @@ done
# run the correct scripts now # run the correct scripts now
# #
if test ! -f m4/curl-functions.m4; then
echo "buildconf: cURL m4 macros not found"
exit 1
fi
echo "buildconf: running libtoolize" echo "buildconf: running libtoolize"
$libtoolize --copy --automake --force || die "The libtoolize command failed" $libtoolize --copy --automake --force || die "The libtoolize command failed"
if test "$lt_major" = "1" && test "$lt_minor" = "5"; then if test "$lt_major" = "1" && test "$lt_minor" = "5"; then
if test -z "$lt_patch" || test "$lt_patch" -lt "26"; then if test -z "$lt_patch" || test "$lt_patch" -lt "26"; then
echo "buildconf: running libtoolize hack to rename some variables" if test -f m4/libtool.m4; then
$PERL -i.bak -pe \ our_libtool_m4='m4/libtool.m4'
's/lt_prog_compiler_pic_works/lt_cv_prog_compiler_pic_works/g; \ elif test -f libtool.m4; then
s/lt_prog_compiler_static_works/lt_cv_prog_compiler_static_works/g;' \ our_libtool_m4='libtool.m4'
m4/libtool.m4 fi
if test -n "$our_libtool_m4"; then
echo "buildconf: running libtoolize hack to rename some variables"
$PERL -i.bak -pe \
's/lt_prog_compiler_pic_works/lt_cv_prog_compiler_pic_works/g; \
s/lt_prog_compiler_static_works/lt_cv_prog_compiler_static_works/g;' \
$our_libtool_m4
fi
fi fi
fi fi
if test ! -f m4/curl-functions.m4; then
echo "buildconf: cURL m4 macros not found"
exit 1
fi
echo "buildconf: running aclocal" echo "buildconf: running aclocal"
${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS || die "The aclocal command line failed" ${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS || die "The aclocal command line failed"