moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-04 18:38:03 -05:00
Code Issues Releases Wiki Activity

buildconf: fix libtool 1.5.x warnings triggered with autoconf 2.6x or later

Browse Source 
Using libtool 1.5.x (x < 26) with autoconf 2.6x or later generates warnings
due to some libtool variables not following naming convention for variables
that will be cached.

This is addressed renaming a couple of variables to make these follow expected
naming convention.
This commit is contained in:
Yang Tse 2011-11-30 19:31:50 +01:00
parent bd94807003
commit 7e02f7fdee
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildconf
View File

@ -276,6 +276,10 @@ fi
# perl check # perl check
# #
PERL=`findtool ${PERL:-perl}` PERL=`findtool ${PERL:-perl}`
if test -z "$PERL"; then
echo "buildconf: perl not found"
exit 1
fi
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# Remove files generated on previous buildconf/configure run. # Remove files generated on previous buildconf/configure run.
@ -311,6 +315,7 @@ for fname in .deps \
libcurl.pc \ libcurl.pc \
libtool \ libtool \
libtool.m4 \ libtool.m4 \
libtool.m4.bak \
ltmain.sh \ ltmain.sh \
ltoptions.m4 \ ltoptions.m4 \
ltsugar.m4 \ ltsugar.m4 \
@ -329,6 +334,16 @@ done
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 -z "$lt_patch" || test "$lt_patch" -lt "26"; 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;' \
m4/libtool.m4
fi
fi
if test ! -f m4/curl-functions.m4; then if test ! -f m4/curl-functions.m4; then
echo "buildconf: cURL m4 macros not found" echo "buildconf: cURL m4 macros not found"
exit 1 exit 1