diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-09-11 19:10:24 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-10-02 16:08:38 +0900 |
| commit | f3a3ab110e60db0fb61b278f32fdb17dcc0b8128 (patch) | |
| tree | 9be5714b562fb6c0cbba44761cc78c533c302089 | |
| parent | de9c612d6342ae2ea5ae1e46b27abecf17c439b5 (diff) | |
[Bug #16909] Honor the tool prefix against pkg-config
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6482
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a1a1ea8eb8..d20d70b8d1 100644 --- a/configure.ac +++ b/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(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([[ |