mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
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.
This commit is contained in:
parent
07a87f74fa
commit
02a72f080d
|
@ -640,6 +640,7 @@ Tiago Gonçalves
|
|||
Chris Gonnerman
|
||||
Shelley Gooch
|
||||
David Goodger
|
||||
Michał Górny
|
||||
Elliot Gorokhovsky
|
||||
Hans de Graaff
|
||||
Tim Graham
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix a regression in detecting ``gdbm_compat`` library for the ``_gdbm``
|
||||
module build.
|
5
configure
generated
vendored
5
configure
generated
vendored
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue