mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[Bug #16909] Honor the tool prefix against pkg-config
This commit is contained in:
parent
de9c612d63
commit
f3a3ab110e
Notes:
git
2022-10-02 17:29:48 +09:00
1 changed files with 8 additions and 5 deletions
13
configure.ac
13
configure.ac
|
@ -520,11 +520,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
|
||||||
AC_CHECK_PROGS(DOT, dot)
|
AC_CHECK_PROGS(DOT, dot)
|
||||||
AC_CHECK_PROGS(DOXYGEN, doxygen)
|
AC_CHECK_PROGS(DOXYGEN, doxygen)
|
||||||
|
|
||||||
for prog in ${ac_tool_prefix:+${ac_tool_prefix}pkg-config} pkg-config; do
|
AC_CHECK_TOOL(PKG_CONFIG, pkg-config)
|
||||||
AC_CHECK_PROG(PKG_CONFIG, $prog, [$prog], [], [],
|
AS_IF([test -z "$PKG_CONFIG"], [],
|
||||||
[`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
|
["$PKG_CONFIG" --print-errors --version > /dev/null 2>&1], [],
|
||||||
test -z "${PKG_CONFIG}" || break
|
[
|
||||||
done
|
unset ac_cv_prog_PKG_CONFIG
|
||||||
|
PKG_CONFIG=
|
||||||
|
AC_MSG_WARN([$PKG_CONFIG does not work; ignore])
|
||||||
|
])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether it is Android])
|
AC_MSG_CHECKING([whether it is Android])
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
|
|
Loading…
Reference in a new issue