Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
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
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
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
d1520708
Commit
d1520708
authored
9 years ago
by
Philippe Canal
Browse files
Options
Downloads
Patches
Plain Diff
Allow skipping /usr/local during search (--disable-search-usrlocal). [ROOT-6384]
parent
a9acd466
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+22
-0
22 additions, 0 deletions
configure
with
22 additions
and
0 deletions
configure
+
22
−
0
View file @
d1520708
...
...
@@ -100,6 +100,7 @@ options=" \
enable_ruby
\
enable_rfio
\
enable_rpath
\
enable_search_usrlocal
\
enable_sapdb
\
enable_shadowpw
\
enable_shared
\
...
...
@@ -186,6 +187,7 @@ enable_builtin_zlib=no
enable_builtin_lzma
=
no
enable_builtin_llvm
=
yes
enable_afdsmgrd
=
no
enable_search_usrlocal
=
yes
if
test
"x
$ENABLEALL
"
=
"xyes"
;
then
enable_gdml
=
yes
...
...
@@ -611,6 +613,16 @@ check_library() {
libdirs
=
"
$sdklibs
"
fi
if
test
"x
$enable_search_usrlocal
"
=
"xno"
;
then
no_usrlocal
=
""
for
i
in
libdirs
;
do
if
[[
$i
!=
/usr/local/
*
]]
;
then
no_usrlocal
=
"
$no_usrlocal
$i
"
fi
done
libdirs
=
"
$no_usrlocal
"
fi
# Write a message
checking_msg
$lib
...
...
@@ -858,6 +870,15 @@ check_header() {
done
hdrdirs
=
"
$sdkhdrs
"
fi
if
test
"x
$enable_search_usrlocal
"
=
"xno"
;
then
no_usrlocal
=
""
for
i
in
$hdrdirs
;
do
if
[[
$i
!=
/usr/local/
*
]]
;
then
no_usrlocal
=
"
$no_usrlocal
$i
"
fi
done
hdrdirs
=
"
$no_usrlocal
"
fi
# Write a message
checking_msg
$hdrs
...
...
@@ -1727,6 +1748,7 @@ enable/disable options, prefix with either --enable- or --disable-
rpath Set run-time library load path on executables
ruby Ruby ROOT bindings, requires ruby >= 1.8
sapdb MaxDB/SapDB support, requires libsqlod and libsqlrte
search-usrlocal Search for libraries and headers in /usr/local
shadowpw Shadow password support
shared Use shared 3rd party libraries if possible
soversion Set version number in sonames (recommended)
...
...
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