From 0602df301cd76a3f1b444c4742b288bc6aed80ac Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@ruby-lang.org>
Date: Thu, 23 Feb 2023 15:14:27 +0900
Subject: [PATCH] merge revision(s) 613fca01486e47dee9364a2fd86b5f5e77fe23c8:
 [Backport #19189]

	[Bug #19189] Fallback to the default "pkg-config"

	---
	 lib/mkmf.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 lib/mkmf.rb | 2 +-
 version.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 2305641b61..be3be8517b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1866,7 +1866,7 @@ SRC
     if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
       # if and only if package specific config command is given
     elsif ($PKGCONFIG ||=
-           (pkgconfig = with_config("pkg-config", RbConfig::CONFIG["PKG_CONFIG"])) &&
+           (pkgconfig = with_config("pkg-config") {config_string("PKG_CONFIG") || "pkg-config"}) &&
            find_executable0(pkgconfig) && pkgconfig) and
         xsystem([*envs, $PKGCONFIG, "--exists", pkg])
       # default to pkg-config command
diff --git a/version.h b/version.h
index 3a3f16ce1e..4ccfd28f72 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_RELEASE_YEAR 2023
 #define RUBY_RELEASE_MONTH 2