Check for db1/ndbm.h and use it in db. Fixes #2647

diff --git a/ext/db/config.m4 b/ext/db/config.m4
index a87dbef89d9941a2104c5dace907b5a00007dd58..319174dd518421271be4e1aab3393fbde7533de9 100644 (file)
--- a/ext/db/config.m4
+++ b/ext/db/config.m4
@@ -4,6 +4,8 @@ dnl don't forget to call PHP_EXTENSION(db)
 
 divert(1)
 
+AC_CHECK_HEADERS(db1/ndbm.h)
+
 # Checks for libraries.
 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
 AC_DEFUN(AC_PREFERRED_DB_LIB,[

diff --git a/ext/db/db.c b/ext/db/db.c
index c246d6bf35a9678c5aa759a49f601938127b7c81..527e2c665b4c3412763c6580a5ec2afd44217fc5 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -79,8 +79,12 @@
 #define DB_DBM_HSEARCH 1
 #include <db.h>
 #else
+#ifdef HAVE_DB1_NDBM_H
+#include <db1/ndbm.h>
+#else
 #include <ndbm.h>
 #endif
+#endif
 
 #define DBM_TYPE DBM *
 #define DBM_MODE_TYPE int