From 02a72f080dc89b037c304a85a0f96509de9ae688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 11 Jan 2023 22:46:28 +0100
Subject: [PATCH] gh-98636: Fix detecting gdbm_compat for _dbm module (#98643)

Fix the gdbm_compat library detection logic to actually check for
-lgdbm_compat independently of the ndbm detection.
This fixes the build failure with `--with-dbmliborder=gdbm`,
and implicit fallback to ndbm with the default value.
---
 Misc/ACKS                                                    | 1 +
 .../next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst | 2 ++
 configure                                                    | 5 ++++-
 configure.ac                                                 | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst

diff --git a/Misc/ACKS b/Misc/ACKS
index b4e309c6905..a51658d79fa 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -640,6 +640,7 @@ Tiago Gonçalves
 Chris Gonnerman
 Shelley Gooch
 David Goodger
+Michał Górny
 Elliot Gorokhovsky
 Hans de Graaff
 Tim Graham
diff --git a/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst b/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst
new file mode 100644
index 00000000000..26a7cc8acaf
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-10-25-11-53-55.gh-issue-98636.e0RPAr.rst
@@ -0,0 +1,2 @@
+Fix a regression in detecting ``gdbm_compat`` library for the ``_gdbm``
+module build.
diff --git a/configure b/configure
index 4841c1d8ad5..5b6750aaa8d 100755
--- a/configure
+++ b/configure
@@ -14710,6 +14710,7 @@ fi
 { ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;}
 
 if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
+  { ac_cv_search_dbm_open=; unset ac_cv_search_dbm_open;}
   save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
@@ -14769,7 +14770,9 @@ $as_echo "$ac_cv_search_dbm_open" >&6; }
 ac_res=$ac_cv_search_dbm_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
+  have_gdbm_compat=yes
+else
+  have_gdbm_compat=no
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 0ed5a24e868..956334a865f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4120,8 +4120,9 @@ AS_VAR_IF([ac_cv_header_gdbm_dash_ndbm_h], [yes], [
 AS_UNSET([ac_cv_header_gdbm_ndbm_h])
 
 if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
+  AS_UNSET([ac_cv_search_dbm_open])
   WITH_SAVE_ENV([
-    AC_SEARCH_LIBS([dbm_open], [gdbm_compat])
+    AC_SEARCH_LIBS([dbm_open], [gdbm_compat], [have_gdbm_compat=yes], [have_gdbm_compat=no])
   ])
 fi