kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

[Bug #16909] Honor the tool prefix against pkg-config

This commit is contained in:
Nobuyoshi Nakada 2022-09-11 19:10:24 +09:00
parent de9c612d63
commit f3a3ab110e
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2022-10-02 17:29:48 +09:00 
Merged: https://github.com/ruby/ruby/pull/6482
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -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(DOXYGEN, doxygen)
for prog in ${ac_tool_prefix:+${ac_tool_prefix}pkg-config} pkg-config; do
AC_CHECK_PROG(PKG_CONFIG, $prog, [$prog], [], [],
[`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
test -z "${PKG_CONFIG}" || break
done
AC_CHECK_TOOL(PKG_CONFIG, pkg-config)
AS_IF([test -z "$PKG_CONFIG"], [],
["$PKG_CONFIG" --print-errors --version > /dev/null 2>&1], [],
[
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_COMPILE_IFELSE([AC_LANG_PROGRAM([[