db configuration fix for Debian; yet another location for ndbm.

diff --git a/configure.in b/configure.in
index c3fb81a7e1cdc83fb59a16e4aa4d9d3882c8fe1b..a5e891c04a5c2f39fb636e5924fa6fc97111a21e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -555,13 +555,14 @@ AC_CHECK_FUNC(dbm_open, ,
   AC_CHECK_LIB(ndbm, dbm_open, ,
     AC_CHECK_LIB(dbm, dbm_open, ,
       AC_CHECK_LIB(db1, dbm_open, ,
-        AC_CHECK_LIB(gdbm, dbm_open)))))
+        AC_CHECK_LIB(gdbm, dbm_open, ,
+          AC_CHECK_LIB(db, __db_ndbm_open))))))
 
 dnl ----------------
 dnl CHECK FOR NDBM.H
 dnl ----------------
 
-AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h, break, )
+AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h db.h, break, )
 
 dnl ----------------
 dnl CHECK FOR HESIOD

diff --git a/uip/slocal.c b/uip/slocal.c
index 6bf3e15971b11edfdf444e9ef0986a0a4397d4c4..bbf1850615034813236eae29014838b0ab8d60cc 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -55,9 +55,14 @@ extern int  initgroups(char*, int);
 #ifdef HAVE_GDBM_NDBM_H
 #include <gdbm/ndbm.h>
 #else
+#if defined(HAVE_DB_H) && defined(HAVE_LIBDB)
+#define DB_DBM_HSEARCH 1
+#include <db.h>
+#else
 #include <ndbm.h>
 #endif
 #endif
+#endif
 
 #include <utmp.h>