Fix checks for gdbm/ndbm headers.

Author: nascheme

Tools/configure/conf_syslibs.py

@@ -73,17 +73,27 @@ def detect_dbm(v):
         else:
             v.have_ndbm = False
 
-    # Check for gdbm/ndbm.h and gdbm-ndbm.h
+    # Check for gdbm/ndbm.h and gdbm-ndbm.h (matches configure.ac AC_CACHE_CHECK pattern)
     # "gdbm-ndbm.h" and "gdbm/ndbm.h" are both normalized to "gdbm_ndbm_h"
-    ac_cv_header_gdbm_slash_ndbm_h = pyconf.check_header("gdbm/ndbm.h")
+    ac_cv_header_gdbm_slash_ndbm_h = pyconf.check_header(
+        "gdbm/ndbm.h", autodefine=False
+    )
     if ac_cv_header_gdbm_slash_ndbm_h:
         pyconf.define(
             "HAVE_GDBM_NDBM_H",
             1,
             "Define to 1 if you have the <gdbm/ndbm.h> header file.",
         )
 
-    ac_cv_header_gdbm_dash_ndbm_h = pyconf.check_header("gdbm-ndbm.h")
+    ac_cv_header_gdbm_dash_ndbm_h = pyconf.check_header(
+        "gdbm-ndbm.h", autodefine=False
+    )
+    if ac_cv_header_gdbm_dash_ndbm_h:
+        pyconf.define(
+            "HAVE_GDBM_DASH_NDBM_H",
+            1,
+            "Define to 1 if you have the <gdbm-ndbm.h> header file.",
+        )
 
     if ac_cv_header_gdbm_slash_ndbm_h or ac_cv_header_gdbm_dash_ndbm_h:
         with pyconf.save_env():

configure-new

@@ -7671,6 +7671,9 @@ function u_detect_dbm(    _i_db, _n_db, _tmp_split, ac_cv_have_libdb, ac_cv_head
 		pyconf_define("HAVE_GDBM_NDBM_H", 1, 0, "Define to 1 if you have the <gdbm/ndbm.h> header file.")
 	}
 	ac_cv_header_gdbm_dash_ndbm_h = (pyconf_check_header("gdbm-ndbm.h") ? "yes" : "no")
+	if (((ac_cv_header_gdbm_dash_ndbm_h != "") && (ac_cv_header_gdbm_dash_ndbm_h != "no"))) {
+		pyconf_define("HAVE_GDBM_DASH_NDBM_H", 1, 0, "Define to 1 if you have the <gdbm-ndbm.h> header file.")
+	}
 	if ((((ac_cv_header_gdbm_slash_ndbm_h != "") && (ac_cv_header_gdbm_slash_ndbm_h != "no")) || ((ac_cv_header_gdbm_dash_ndbm_h != "") && (ac_cv_header_gdbm_dash_ndbm_h != "no")))) {
 		pyconf_save_env()
 		r = pyconf_search_libs("dbm_open", "gdbm_compat")