[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 19:37 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv30876 Modified Files: Makefile.in acconfig.h.in acinclude.m4 configure.in.in internal_functions.c Log Message: moved db Index: php4/Makefile.in diff -c php4/Makefile.in:1.16 php4/Makefile.in:1.17 *** php4/Makefile.in:1.16 Wed Apr 21 19:27:59 1999 --- php4/Makefile.in Wed Apr 21 19:37:45 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.16 1999/04/21 23:27:59 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.17 1999/04/21 23:37:45 ssb Exp $ # prefix = @prefix@ *************** *** 69,75 **** php_ini.o FUNCTIONS_SOURCE = functions/fhttpd.c \ ! functions/crypt.c functions/db.c functions/dl.c \ functions/head.c functions/imap.c functions/mime.c \ functions/pgsql.c functions/post.c functions/sybase.c \ functions/sybase-ct.c functions/xml.c \ --- 69,75 ---- php_ini.o FUNCTIONS_SOURCE = functions/fhttpd.c \ ! functions/crypt.c functions/dl.c \ functions/head.c functions/imap.c functions/mime.c \ functions/pgsql.c functions/post.c functions/sybase.c \ functions/sybase-ct.c functions/xml.c \ Index: php4/acconfig.h.in diff -c php4/acconfig.h.in:1.7 php4/acconfig.h.in:1.8 *** php4/acconfig.h.in:1.7 Wed Apr 21 19:27:59 1999 --- php4/acconfig.h.in Wed Apr 21 19:37:46 1999 *************** *** 54,65 **** /* in GET/POST/Cookie data */ #define MAGIC_QUOTES 1 - /* Define if you have an ndbm compatible library (-ldbm). */ - #define NDBM 0 - - /* Define if you have the gdbm library (-lgdbm). */ - #define GDBM 0 - /* Define both of these if you want the bundled REGEX library */ #define REGEX 0 #define HSREGEX 0 --- 54,59 ---- Index: php4/acinclude.m4 diff -c php4/acinclude.m4:1.4 php4/acinclude.m4:1.5 *** php4/acinclude.m4:1.4 Wed Apr 21 18:49:13 1999 --- php4/acinclude.m4 Wed Apr 21 19:37:46 1999 *************** *** 1,4 **** ! dnl $Id: acinclude.m4,v 1.4 1999/04/21 22:49:13 ssb Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: acinclude.m4,v 1.5 1999/04/21 23:37:46 ssb Exp $ dnl dnl This file contains local autoconf functions. *************** *** 14,38 **** AC_DEFINE(MISSING_FCLOSE_DECL,1) AC_MSG_RESULT(missing) ]) - ]) - - # Checks for libraries. - # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order - AC_DEFUN(AC_PREFERRED_DB_LIB,[ - AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM) DBM_TYPE=gdbm; DBM_LIB=-lgdbm], - [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldb], - [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=], - [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM) DBM_TYPE=ndbm; DBM_LIB=-ldbm], - [DBM_TYPE=""])])])]) - AC_MSG_CHECKING([preferred dbm library]) - if test "a$DBM_TYPE" = a; then - AC_MSG_RESULT(none found) - AC_MSG_WARN(No dbm library found - using built-in flatfile support) - else - AC_MSG_RESULT($DBM_TYPE chosen) - fi - AC_SUBST(DBM_LIB) - AC_SUBST(DBM_TYPE) ]) dnl --- 14,19 ---- Index: php4/configure.in.in diff -c php4/configure.in.in:1.11 php4/configure.in.in:1.12 *** php4/configure.in.in:1.11 Wed Apr 21 19:27:59 1999 --- php4/configure.in.in Wed Apr 21 19:37:46 1999 *************** *** 1,4 **** ! dnl $Id: configure.in.in,v 1.11 1999/04/21 23:27:59 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. --- 1,4 ---- ! dnl $Id: configure.in.in,v 1.12 1999/04/21 23:37:46 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. *************** *** 150,157 **** INCLUDES="" AC_SUBST(INCLUDES) - AC_PREFERRED_DB_LIB - AC_CHECK_LIB(nsl, gethostname, [ LIBS="-lnsl $LIBS" AC_DEFINE(HAVE_LIBNSL) ], []) --- 150,155 ---- *************** *** 210,233 **** AC_MISSING_FCLOSE_DECL dnl QNX requires unix.h to allow functions in libunix to work properly AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h unix.h arpa/inet.h) - if test "$DBM_LIB" = "-lgdbm"; then - AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ - AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); - AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[ - AC_MSG_RESULT("Try /opt/local/include/gdbm.h"); - AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[ - dnl if in /usr/pkg/include, do not add anything. See above. - AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h"); - AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[ - AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere"); - exit - ]) - ]) - ]) - ]) - INCLUDES="$INCLUDES $GDBM_INCLUDES" - dnl## AC_SUBST(GDBM_INCLUDE) - fi dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM --- 208,213 ---- Index: php4/internal_functions.c diff -c php4/internal_functions.c:1.11 php4/internal_functions.c:1.12 *** php4/internal_functions.c:1.11 Wed Apr 21 19:27:59 1999 --- php4/internal_functions.c Wed Apr 21 19:37:46 1999 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.11 1999/04/21 23:27:59 ssb Exp $ */ #include "php.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.12 1999/04/21 23:37:46 ssb Exp $ */ #include "php.h" *************** *** 63,69 **** #include "functions/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" ! #include "functions/db.h" #include "dl/snmp/php3_snmp.h" #include "functions/php3_zlib.h" #include "ext/com/php3_COM.h" --- 63,69 ---- #include "functions/post.h" #include "ext/hyperwave/hw.h" #include "ext/filepro/filepro.h" ! #include "ext/db/db.h" #include "dl/snmp/php3_snmp.h" #include "functions/php3_zlib.h" #include "ext/com/php3_COM.h" -- PHP 4 Beta