cvs: /php4/ext/dba dba_db3.c php3_db3.h /php4/ext/dba Makefile.am config.h.stub config.m4 dba.c

sas Sat Nov 20 17:51:13 1999 EDT Added files: /php4/ext/dba dba_db3.c php3_db3.h Modified files: /php4/ext/dba Makefile.am config.h.stub config.m4 dba.c Log: add Berkeley DB3 support Index: php4/ext/dba/Makefile.am diff -u php4/ext/dba/Makefile.am:1.3 php4/ext/dba/Makefile.am:1.4 --- php4/ext/dba/Makefile.am:1.3 Sat Nov 13 07:40:30 1999 +++ php4/ext/dba/Makefile.am Sat Nov 20 17:50:41 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.3 1999/11/13 12:40:30 sas Exp $ +# $Id: Makefile.am,v 1.4 1999/11/20 22:50:41 sas Exp $ noinst_LTLIBRARIES=libphpext_dba.la libphpext_dba_la_SOURCES=dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c \ - dba_ndbm.c + dba_ndbm.c dba_db3.c Index: php4/ext/dba/config.h.stub diff -u php4/ext/dba/config.h.stub:1.1 php4/ext/dba/config.h.stub:1.2 --- php4/ext/dba/config.h.stub:1.1 Wed Jul 21 11:12:31 1999 +++ php4/ext/dba/config.h.stub Sat Nov 20 17:50:42 1999 @@ -6,11 +6,13 @@ #define DB2_DB_DB2_H 0 #define DB2_DB_H 0 #define DB2_DB2_H 0 +#define DB3_DB_H 0 #define HAVE_DBA 0 #define DBA_GDBM 0 #define DBA_NDBM 0 #define DBA_DBOPEN 0 #define DBA_DB2 0 +#define DBA_DB3 0 #define DBA_DBM 0 #define DBA_CDB 0 Index: php4/ext/dba/config.m4 diff -u php4/ext/dba/config.m4:1.2 php4/ext/dba/config.m4:1.3 --- php4/ext/dba/config.m4:1.2 Thu Nov 4 15:47:19 1999 +++ php4/ext/dba/config.m4 Sat Nov 20 17:50:42 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/11/04 20:47:19 rasmus Exp $ +dnl $Id: config.m4,v 1.3 1999/11/20 22:50:42 sas Exp $ dnl config.m4 for extension dba dnl don't forget to call PHP_EXTENSION(dba) @@ -134,7 +134,7 @@ DB2_EXTRA="DB2_DB_H" fi - if test "$DB2_EXTRA" != ""; then + if test -n "$DB2_EXTRA"; then eval "AC_DEFINE($DB2_EXTRA, 1)" fi @@ -150,6 +150,34 @@ fi ]) AC_MSG_CHECKING(for Berkeley DB2 support) +AC_DBA_STD_RESULT + +AC_ARG_WITH(db3, +[ --with-db3[=DIR] Include Berkeley DB3 support],[ + if test "$withval" != "no"; then + for i in /usr/local /usr $withval; do + if test -f "$i/include/db.h" ; then + THIS_PREFIX="$i" + DB3_EXTRA="DB3_DB_H" + fi + done + + if test -n "$DB3_EXTRA"; then + eval "AC_DEFINE($DB3_EXTRA, 1)" + fi + + for LIB in db; do + AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ + AC_CHECK_LIB($LIB, db_create, [AC_DEFINE(DBA_DB3,1) THIS_LIBS="$LIB"]) + ]) + done + + AC_DBA_STD_ASSIGN + AC_DBA_STD_CHECK + AC_DBA_STD_ATTACH + fi +]) +AC_MSG_CHECKING(for Berkeley DB3 support) AC_DBA_STD_RESULT AC_ARG_WITH(dbm, Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.5 php4/ext/dba/dba.c:1.6 --- php4/ext/dba/dba.c:1.5 Fri Sep 17 05:56:29 1999 +++ php4/ext/dba/dba.c Sat Nov 20 17:50:42 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.5 1999/09/17 09:56:29 sas Exp $ */ +/* $Id: dba.c,v 1.6 1999/11/20 22:50:42 sas Exp $ */ #include "php.h" @@ -40,6 +40,7 @@ #include "php3_dbm.h" #include "php3_cdb.h" #include "php3_db2.h" +#include "php3_db3.h" function_entry dba_functions[] = { PHP_FE(dba_open, NULL) @@ -158,6 +159,9 @@ #if DBA_DB2 DBA_HND(db2) #endif +#if DBA_DB3 + DBA_HND(db3) +#endif { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; @@ -200,7 +204,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.5 1999/09/17 09:56:29 sas Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.6 1999/11/20 22:50:42 sas Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name);