--- configure.orig      2005-12-20 15:37:46.000000000 +1100
+++ configure   2005-12-24 00:38:23.000000000 +1100
@@ -8036,7 +8036,7 @@
 
 
 
-for ac_header in db1/ndbm.h gdbm/ndbm.h db.h
+for ac_header in db1/ndbm.h ndbm.h gdbm/ndbm.h db.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -8188,7 +8188,7 @@
 
 
 
-if test "x" == "x"; then
+if test "x" = "x"; then
    nmh_libs=
       nmh_testname=libc
 else
@@ -8213,6 +8213,9 @@
 #ifdef HAVE_DB1_NDBM_H
 #include <db1/ndbm.h>
 #else
+#ifdef HAVE_NDBM_H
+#include <ndbm.h>
+#else
 #ifdef HAVE_GDBM_NDBM_H
 #include <gdbm/ndbm.h>
 #else
@@ -8224,6 +8227,7 @@
 #endif
 #endif
 #endif
+#endif
 
 int
 main ()