Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
6358b24f
Commit
6358b24f
authored
19 years ago
by
Daniel Stenberg
Browse files
Options
Downloads
Patches
Plain Diff
allow more evironment variables to control what tools to check for and use
parent
b5863431
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconf
+13
-7
13 additions, 7 deletions
buildconf
with
13 additions
and
7 deletions
buildconf
+
13
−
7
View file @
6358b24f
...
@@ -13,6 +13,7 @@ findtool(){
...
@@ -13,6 +13,7 @@ findtool(){
IFS
=
":"
IFS
=
":"
for
path
in
$PATH
for
path
in
$PATH
do
do
# echo "checks for $file in $path" >&2
if
test
-f
"
$path
/
$file
"
;
then
if
test
-f
"
$path
/
$file
"
;
then
echo
"
$path
/
$file
"
echo
"
$path
/
$file
"
return
return
...
@@ -106,11 +107,16 @@ LIBTOOL_WANTED_VERSION=1.4.2
...
@@ -106,11 +107,16 @@ LIBTOOL_WANTED_VERSION=1.4.2
# glibtool, with 'libtool' being something completely different.
# glibtool, with 'libtool' being something completely different.
libtool
=
`
findtool glibtool 2>/dev/null
`
libtool
=
`
findtool glibtool 2>/dev/null
`
if
test
!
-x
"
$libtool
"
;
then
if
test
!
-x
"
$libtool
"
;
then
libtool
=
`
findtool libtool
`
libtool
=
`
findtool
${
LIBTOOL
:-
libtool
}
`
fi
fi
# set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
if
test
-z
"
$LIBTOOLIZE
"
;
then
LIBTOOLIZE
=
"
${
libtool
}
ize"
# set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
# $libtool is already the full path
libtoolize
=
"
${
libtool
}
ize"
else
libtoolize
=
`
findtool
$LIBTOOLIZE
`
fi
lt_pversion
=
`
$libtool
--version
2>/dev/null|head
-n
1|sed
-e
's/^[^0-9]*//g'
-e
's/[- ].*//'
`
lt_pversion
=
`
$libtool
--version
2>/dev/null|head
-n
1|sed
-e
's/^[^0-9]*//g'
-e
's/[- ].*//'
`
if
test
-z
"
$lt_pversion
"
;
then
if
test
-z
"
$lt_pversion
"
;
then
...
@@ -149,7 +155,7 @@ fi
...
@@ -149,7 +155,7 @@ fi
echo
"buildconf: libtool version
$lt_version
(ok)"
echo
"buildconf: libtool version
$lt_version
(ok)"
if
test
-f
"
$
LIBTOOLIZE
"
;
then
if
test
-f
"
$
libtoolize
"
;
then
echo
"buildconf: libtoolize found"
echo
"buildconf: libtoolize found"
else
else
echo
"buildconf: libtoolize not found. Weird libtool installation!"
echo
"buildconf: libtoolize not found. Weird libtool installation!"
...
@@ -172,14 +178,14 @@ fi
...
@@ -172,14 +178,14 @@ fi
#--------------------------------------------------------------------------
#--------------------------------------------------------------------------
# perl check
# perl check
#
#
PERL
=
`
findtool perl
`
PERL
=
`
findtool
${
PERL
:-
perl
}
`
# ------------------------------------------------------------
# ------------------------------------------------------------
# run the correct scripts now
# run the correct scripts now
echo
"buildconf: running libtoolize"
echo
"buildconf: running libtoolize"
$
{
LIBTOOLIZE
:-
libtoolize
}
--copy
--automake
--force
||
die
"The libtool command failed"
$libtoolize
--copy
--automake
--force
||
die
"The libtool
ize
command failed"
echo
"buildconf: running aclocal"
echo
"buildconf: running aclocal"
${
ACLOCAL
:-
aclocal
}
$ACLOCAL_FLAGS
||
die
"The aclocal command line failed"
${
ACLOCAL
:-
aclocal
}
$ACLOCAL_FLAGS
||
die
"The aclocal command line failed"
if
test
-n
"
$PERL
"
;
then
if
test
-n
"
$PERL
"
;
then
...
@@ -199,7 +205,7 @@ ${AUTOCONF:-autoconf} || die "The autoconf command failed"
...
@@ -199,7 +205,7 @@ ${AUTOCONF:-autoconf} || die "The autoconf command failed"
if
test
-d
ares
;
then
if
test
-d
ares
;
then
cd
ares
cd
ares
echo
"buildconf: running ares/libtoolize"
echo
"buildconf: running ares/libtoolize"
$
{
LIBTOOLIZE
:-
libtoolize
}
--copy
--automake
--force
||
die
"The libtool command failed"
$libtoolize
--copy
--automake
--force
||
die
"The libtool
ize
command failed"
echo
"buildconf: running ares/aclocal"
echo
"buildconf: running ares/aclocal"
${
ACLOCAL
:-
aclocal
}
$ACLOCAL_FLAGS
||
die
"The ares aclocal command failed"
${
ACLOCAL
:-
aclocal
}
$ACLOCAL_FLAGS
||
die
"The ares aclocal command failed"
echo
"buildconf: running ares/autoconf"
echo
"buildconf: running ares/autoconf"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment