Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
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
Zsolt Vadász
wine
Commits
3d08f5d9
Commit
3d08f5d9
authored
18 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Store the full path to the prelink tool.
parent
6a97f220
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+14
-16
14 additions, 16 deletions
configure
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
with
15 additions
and
17 deletions
configure
+
14
−
16
View file @
3d08f5d9
...
...
@@ -6884,26 +6884,26 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="false"
case $host_cpu in
*i[3456789]86*)
for ac_prog in prelink
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
# Extract the first word of "prelink", so it can be a program name with args.
set dummy prelink; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_p
rog
_PRELINK+set}" = set; then
if test "${ac_cv_p
ath
_PRELINK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$PRELINK"; then
ac_cv_prog_PRELINK="$PRELINK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
case $PRELINK in
[\\/]* | ?:[\\/]*)
ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /sbin /usr/sbin $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_p
rog
_PRELINK="$a
c_prog
"
ac_cv_p
ath
_PRELINK="$a
s_dir/$ac_word$ac_exec_ext
"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
...
...
@@ -6911,9 +6911,11 @@ done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false"
;;
esac
fi
fi
PRELINK=$ac_cv_prog_PRELINK
PRELINK=$ac_cv_path_PRELINK
if test -n "$PRELINK"; then
{ echo "$as_me:$LINENO: result: $PRELINK" >&5
echo "${ECHO_T}$PRELINK" >&6; }
...
...
@@ -6923,10 +6925,6 @@ echo "${ECHO_T}no" >&6; }
fi
test -n "$PRELINK" && break
done
test -n "$PRELINK" || PRELINK="false"
;;
esac
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
1
View file @
3d08f5d9
...
...
@@ -126,7 +126,7 @@ AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false)
case $host_cpu in
*i[[3456789]]86*)
AC_
CHECK
_PROG
S
(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
AC_
PATH
_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
;;
esac
...
...
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