--- configure.in.orig	2005-02-23 08:20:47.000000000 -0800
+++ configure.in	2005-12-03 18:16:00.000000000 -0800
@@ -363,7 +363,7 @@
 
 dnl Check for broken vi
 AC_CACHE_CHECK(for broken vi, nmh_cv_attvibug,
-[if echo 'r /nonexist-file
+[if echo 'r ./nonexist-file
 q' | ex > /dev/null
 then
         nmh_cv_attvibug=no
@@ -595,8 +595,13 @@
   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(db, __db_ndbm_open))))))
+        AC_CHECK_LIB(db, __db_ndbm_open, ,
+          AC_CHECK_LIB(gdbm, dbm_open, ,
+            AC_CHECK_LIB(gdbm_compat, dbm_open, , , -lgdbm)))))))
+
+if test "$ac_cv_lib_gdbm_compat_dbm_open" = yes; then
+    AC_CHECK_LIB(gdbm, gdbm_open)
+fi
 
 dnl ----------------
 dnl CHECK FOR NDBM.H