ruby-changes:73838
From: Nobuyoshi <ko1@a...>
Date: Sun, 2 Oct 2022 17:29:41 +0900 (JST)
Subject: [ruby-changes:73838] f3a3ab110e (master): [Bug #16909] Honor the tool prefix against pkg-config
https://git.ruby-lang.org/ruby.git/commit/?id=f3a3ab110e From f3a3ab110e60db0fb61b278f32fdb17dcc0b8128 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 11 Sep 2022 19:10:24 +0900 Subject: [Bug #16909] Honor the tool prefix against pkg-config --- configure.ac | 13 ++++++++----- 1 file 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"] https://github.com/ruby/ruby/blob/trunk/configure.ac#L520 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([[ -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/