From de9c612d6342ae2ea5ae1e46b27abecf17c439b5 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 11 Sep 2022 16:40:20 +0900
Subject: [PATCH] Also the tests should use the configured pkg-config

---
 test/mkmf/test_pkg_config.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/mkmf/test_pkg_config.rb b/test/mkmf/test_pkg_config.rb
index 72efb4ba81..f6a960c7d9 100644
--- a/test/mkmf/test_pkg_config.rb
+++ b/test/mkmf/test_pkg_config.rb
@@ -3,7 +3,7 @@ require_relative 'base'
 require 'shellwords'
 
 class TestMkmfPkgConfig < TestMkmf
-  PKG_CONFIG = find_executable0("pkg-config")
+  PKG_CONFIG = config_string("PKG_CONFIG") {|path| find_executable0(path)}
 
   def setup
     super
@@ -26,7 +26,7 @@ class TestMkmfPkgConfig < TestMkmf
         Cflags: -I${includedir}/cflags-I --cflags-other
       EOF
 
-      @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], File.join(Dir.pwd, "fixtures")
+      @pkg_config_path, ENV["PKG_CONFIG_PATH"] = ENV["PKG_CONFIG_PATH"], @fixtures_dir
     end
   end