Skip to content

Commit

Permalink
gh-98636: Fix detecting gdbm_compat for _dbm module
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mgorny committed Dec 31, 2022
1 parent f59c7f8 commit 15510e8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ Tiago Gonçalves
Chris Gonnerman
Shelley Gooch
David Goodger
Michał Górny
Elliot Gorokhovsky
Hans de Graaff
Tim Graham
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a regression in detecting ``gdbm_compat`` library for the ``_gdbm``
module build.
5 changes: 4 additions & 1 deletion configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4118,8 +4118,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

Expand Down

0 comments on commit 15510e8

Please sign in to comment.