cvs: /php4/ext/db config.m4 db.c

sas Sun Nov 14 18:04:16 1999 EDT Modified files: /php4/ext/db config.m4 db.c Log: Check for db1/ndbm.h and use it in db. Fixes #2647 Index: php4/ext/db/config.m4 diff -u php4/ext/db/config.m4:1.3 php4/ext/db/config.m4:1.4 --- php4/ext/db/config.m4:1.3 Wed Apr 21 23:03:35 1999 +++ php4/ext/db/config.m4 Sun Nov 14 18:03:45 1999 @@ -1,8 +1,10 @@ -dnl $Id: config.m4,v 1.3 1999/04/22 03:03:35 ssb Exp $ +dnl $Id: config.m4,v 1.4 1999/11/14 23:03:45 sas Exp $ dnl config.m4 for extension db 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 Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.11 php4/ext/db/db.c:1.12 --- php4/ext/db/db.c:1.11 Thu Oct 7 10:00:18 1999 +++ php4/ext/db/db.c Sun Nov 14 18:03:45 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.11 1999/10/07 14:00:18 andrei Exp $ */ +/* $Id: db.c,v 1.12 1999/11/14 23:03:45 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -79,7 +79,11 @@ #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 *