[前][次][番号順一覧][スレッド一覧]

ruby-changes:71021

From: Nobuyoshi <ko1@a...>
Date: Wed, 26 Jan 2022 15:56:34 +0900 (JST)
Subject: [ruby-changes:71021] 4010cbfe35 (master): Use the prefixed pkg-config command

https://git.ruby-lang.org/ruby.git/commit/?id=4010cbfe35

From 4010cbfe35aa520fe7efc282c7cc16ca67341a91 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 26 Jan 2022 15:56:22 +0900
Subject: Use the prefixed pkg-config command

---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4699d9b7c1f..534e40a4948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1262,12 +1262,12 @@ AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD) https://github.com/ruby/ruby/blob/trunk/configure.ac#L1262
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(socket, shutdown)  # SunOS/Solaris
 
-if pkg-config --exists capstone; then
-   CAPSTONE_CFLAGS=`pkg-config --cflags capstone`
-   CAPSTONE_LIB_L=`pkg-config --libs-only-L capstone`
+AS_IF([test -n "${PKG_CONFIG}" && ${PKG_CONFIG} --exists capstone], [
+   CAPSTONE_CFLAGS=`${PKG_CONFIG} --cflags capstone`
+   CAPSTONE_LIB_L=`${PKG_CONFIG} --libs-only-L capstone`
    LDFLAGS="$LDFLAGS $CAPSTONE_LIB_L"
    CFLAGS="$CFLAGS $CAPSTONE_CFLAGS"
-fi
+])
 
 AC_CHECK_LIB(capstone, cs_open) # Capstone disassembler for debugging YJIT
 
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]