CVS update: php3

Date: Friday April 9, 1999 @ 3:04 Author: sas Update of /repository/php3 In directory asf:/u/temp/cvs-serv21841 Modified Files: internal_functions.c configure.in config.h.in acconfig.h aclocal.m4 Makefile.in Log Message: First version of a light weight database API. Currently supports DBM, NDBM, GDBM, CDB. (DB2 when I find the docs) Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.346 php3/internal_functions.c:1.347 *** php3/internal_functions.c:1.346 Thu Feb 25 07:17:01 1999 --- php3/internal_functions.c Fri Apr 9 03:04:27 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.346 1999/02/25 12:17:01 thies Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.347 1999/04/09 07:04:27 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 102,107 **** --- 102,108 ---- #include "functions/php3_wddx.h" #include "functions/php3_wddx_a.h" #include "functions/php3_yp.h" + #include "functions/php3_dba.h" #ifndef WIN32 #include <netinet/in.h> *************** *** 142,147 **** --- 143,149 ---- {"LDAP", ldap_module_ptr}, {"Velocis", velocis_module_ptr}, {"FilePro", filepro_module_ptr}, + {"DBA", dba_module_ptr}, {"Sybase SQL", sybase_module_ptr}, {"Sybase SQL - CT", sybct_module_ptr}, {"Unified ODBC", uodbc_module_ptr}, Index: php3/configure.in diff -c php3/configure.in:1.336 php3/configure.in:1.337 *** php3/configure.in:1.336 Mon Mar 15 11:02:48 1999 --- php3/configure.in Fri Apr 9 03:04:28 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.336 1999/03/15 16:02:48 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.337 1999/04/09 07:04:28 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 241,247 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so --- 241,247 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so *************** *** 527,532 **** --- 527,537 ---- ]) AC_SUBST(GDBM_INCLUDE) fi + + AC_AVAILABLE_DB_LIBS + AC_SUBST(DBA_INCLUDE) + AC_SUBST(DBA_LFLAGS) + AC_SUBST(DBA_LIBS) AC_MSG_CHECKING(for mod_charset compatibility option) AC_ARG_WITH(mod_charset, Index: php3/config.h.in diff -c php3/config.h.in:1.147 php3/config.h.in:1.148 *** php3/config.h.in:1.147 Mon Mar 15 11:02:49 1999 --- php3/config.h.in Fri Apr 9 03:04:28 1999 *************** *** 69,74 **** --- 69,81 ---- #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 + #define DBA_GDBM 0 + #define DBA_NDBM 0 + #define DBA_DBOPEN 0 + #define DBA_DB2 0 + #define DBA_DBM 0 + #define DBA_CDB 0 + /* Some global constants defined by conigure */ #undef PHP_BUILD_DATE #undef PHP_OS Index: php3/acconfig.h diff -c php3/acconfig.h:1.86 php3/acconfig.h:1.87 *** php3/acconfig.h:1.86 Sat Mar 13 08:57:01 1999 --- php3/acconfig.h Fri Apr 9 03:04:29 1999 *************** *** 2,7 **** --- 2,16 ---- #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 + /* define if you have the specific db library */ + + #define DBA_GDBM 0 + #define DBA_NDBM 0 + #define DBA_DBOPEN 0 + #define DBA_DB2 0 + #define DBA_DBM 0 + #define DBA_CDB 0 + /* Some global constants defined by conigure */ #undef PHP_BUILD_DATE #undef PHP_OS Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.31 php3/aclocal.m4:1.32 *** php3/aclocal.m4:1.31 Sat Feb 6 14:33:17 1999 --- php3/aclocal.m4 Fri Apr 9 03:04:29 1999 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.31 1999/02/06 19:33:17 sas Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.32 1999/04/09 07:04:29 sas Exp $ dnl dnl This file contains local autoconf functions. *************** *** 112,117 **** --- 112,150 ---- fi AC_SUBST(DBM_LIB) AC_SUBST(DBM_TYPE) + ]) + + dnl + dnl Check for concurrent available database libraries + dnl + AC_DEFUN(AC_AVAILABLE_DB_LIBS,[ + dnl NDBM in -lc or -ldbm or -lndbm or -ldb1 + AC_CHECK_LIB(c, dbm_open, [AC_DEFINE(DBA_NDBM, 1)], + [AC_CHECK_LIB(dbm, dbm_open, [AC_DEFINE(DBA_NDBM, 1) DBA_LIBS=-ldbm], + [AC_CHECK_LIB(ndbm, dbm_open, [AC_DEFINE(DBA_NDBM, 1) DBA_LIBS=-lndbm], + [AC_CHECK_LIB(db1, dbm_open, [AC_DEFINE(DBA_NDBM, 1) DBA_LIBS=-ldb1])])])]) + dnl DBM in -lc or -ldbm or -ldb1 + AC_CHECK_LIB(c, dbminit, [AC_DEFINE(DBA_DBM, 1)], + [AC_CHECK_LIB(dbm, dbminit, + [AC_DEFINE(DBA_DBM, 1) DBA_LIBS="$DBA_LIBS -ldbm"], + [AC_CHECK_LIB(db1, dbminit, + [AC_DEFINE(DBA_DBM, 1) DBA_LIBS="$DBA_LIBS -ldb1"], + [AC_CHECK_LIB(db, __db_dbm_init, + [AC_DEFINE(DBA_DBM, 1) DBA_LIBS="$DBA_LIBS -ldb"])])])]) + dnl GDBM in -lgdbm + AC_CHECK_LIB(gdbm, gdbm_open, + [AC_DEFINE(DBA_GDBM, 1) DBA_LIBS="$DBA_LIBS -lgdbm"]) + dnl Sleepycat DB2 in -ldb or -ldb2 + AC_CHECK_LIB(db, db_open,[AC_DEFINE(DBA_DB2, 1) DBA_LIBS="$DBA_LIBS -ldb"], + [AC_CHECK_LIB(db2,db_open,[AC_DEFINE(DBA_DB2,1) DBA_LIBS="$DBA_LIBS -ldb2"]) + ]) + dnl dbopen(3) interface + AC_CHECK_LIB(c, dbopen, [AC_DEFINE(DBA_DBOPEN, 1)], + [AC_CHECK_LIB(db1, dbopen, + [AC_DEFINE(DBA_DBOPEN, 1) DBA_LIBS="$DBA_LIBS -ldb1"])]) + dnl DJB's cdb + AC_CHECK_LIB(cdb, cdb_bread, + [AC_DEFINE(DBA_CDB, 1) DBA_LIBS="$DBA_LIBS -lcdb"]) ]) dnl Index: php3/Makefile.in diff -c php3/Makefile.in:1.300 php3/Makefile.in:1.301 *** php3/Makefile.in:1.300 Fri Apr 2 19:29:30 1999 --- php3/Makefile.in Fri Apr 9 03:04:29 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.300 1999/04/03 00:29:30 sas Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.301 1999/04/09 07:04:29 sas Exp $ # prefix = @prefix@ *************** *** 37,43 **** AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ --- 37,43 ---- AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ ! INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @DBA_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 94,104 **** functions/quot_print.c functions/cyr_convert.c \ functions/sysvsem.c functions/dav.c functions/sysvshm.c \ functions/gettext.c functions/php3_mckcrypt.c \ ! functions/yp.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ all: $(BINNAME) --- 94,105 ---- functions/quot_print.c functions/cyr_convert.c \ functions/sysvsem.c functions/dav.c functions/sysvshm.c \ functions/gettext.c functions/php3_mckcrypt.c \ ! functions/yp.c functions/dba.c functions/dba_gdbm.c \ ! functions/dba_dbm.c functions/dba_ndbm.c functions/dba_cdb.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @LIBS@ all: $(BINNAME) -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net