Index: xemacs-21.5.29/configure.ac
===================================================================
--- xemacs-21.5.29.orig/configure.ac
+++ xemacs-21.5.29/configure.ac
@@ -5419,8 +5419,8 @@ fi
 
 dnl Check for DBM support in libgdbm.
 if test "$enable_database_gdbm" != "no"; then
-  AC_CHECK_LIB(gdbm, dbm_open, [
-   enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [
+  AC_CHECK_LIB(ndbm, dbm_open, [
+   enable_database_gdbm=yes enable_database_dbm=no libdbm=-lndbm], [
        AC_CHECK_LIB(gdbm_compat, dbm_open, [
        enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
    if test "$enable_database_gdbm" = "yes"; then
--- xemacs-beta-b604d235f028/configure.ac
+++ xemacs-beta-b604d235f028/configure.ac	2009-12-03 15:29:15.975430547 +0000
@@ -5035,11 +5035,11 @@ dnl #### Should we check for gdbm.h, too
 if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
   ndbm_h_file=""
   AC_CHECK_HEADERS([ndbm.h gdbm/ndbm.h],[ndbm_h_file=$ac_header; break;],[],[])
-  if test "$ndbm_h_found" != "yes"; then
+  if test -z "$ndbm_h_file" ; then
     test "$enable_database_gdbm" = "yes" -o \
          "$enable_database_dbm"  = "yes" && \
       XE_DIE("Required DBM support cannot be provided.")
-    enable_database_gdbm=no enable_database_dbm=no]
+    enable_database_gdbm=no enable_database_dbm=no
   fi
 fi