CVS update: php3

Date: Friday April 9, 1999 @ 4:26 Author: sas Update of /repository/php3 In directory asf:/u/temp/cvs-serv22504 Modified Files: acconfig.h aclocal.m4 config.h.in configure.in libphp3.module.in Log Message: Never noticed that GDBM has not only compat headers, but also correspondig functions. Should compile now with Apache (tested with static module). Index: php3/acconfig.h diff -c php3/acconfig.h:1.87 php3/acconfig.h:1.88 *** php3/acconfig.h:1.87 Fri Apr 9 03:04:29 1999 --- php3/acconfig.h Fri Apr 9 04:26:48 1999 *************** *** 11,16 **** --- 11,18 ---- #define DBA_DBM 0 #define DBA_CDB 0 + #define HAVE_GDBM_H 0 + /* Some global constants defined by conigure */ #undef PHP_BUILD_DATE #undef PHP_OS Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.32 php3/aclocal.m4:1.33 *** php3/aclocal.m4:1.32 Fri Apr 9 03:04:29 1999 --- php3/aclocal.m4 Fri Apr 9 04:26:48 1999 *************** *** 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. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.33 1999/04/09 08:26:48 sas Exp $ dnl dnl This file contains local autoconf functions. *************** *** 118,136 **** 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"]) --- 118,139 ---- dnl Check for concurrent available database libraries dnl AC_DEFUN(AC_AVAILABLE_DB_LIBS,[ ! dnl NDBM in -lc or -ldbm or -lndbm or -ldb1 or -lgdbm 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], ! [AC_CHECK_LIB(gdbm, dbm_open, [AC_DEFINE(DBA_NDBM, 1) DBA_LIBS=-lgdbm])])])])]) ! dnl DBM in -lc or -ldbm or -ldb1 or -lgdbm 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"], ! [AC_CHECK_LIB(gdbm, dbminit, ! [AC_DEFINE(DBA_DBM, 1) DBA_LIBS="$DBA_LIBS -lgdbm"])])])])]) dnl GDBM in -lgdbm AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) DBA_LIBS="$DBA_LIBS -lgdbm"]) Index: php3/config.h.in diff -c php3/config.h.in:1.148 php3/config.h.in:1.149 *** php3/config.h.in:1.148 Fri Apr 9 03:04:28 1999 --- php3/config.h.in Fri Apr 9 04:26:48 1999 *************** *** 76,81 **** --- 76,83 ---- #define DBA_DBM 0 #define DBA_CDB 0 + #define HAVE_GDBM_H 0 + /* Some global constants defined by conigure */ #undef PHP_BUILD_DATE #undef PHP_OS *************** *** 463,468 **** --- 465,473 ---- /* Define if you have the <db.h> header file. */ #undef HAVE_DB_H + + /* Define if you have the <dbm.h> header file. */ + #undef HAVE_DBM_H /* Define if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H Index: php3/configure.in diff -c php3/configure.in:1.337 php3/configure.in:1.338 *** php3/configure.in:1.337 Fri Apr 9 03:04:28 1999 --- php3/configure.in Fri Apr 9 04:26:48 1999 *************** *** 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) --- 1,4 ---- ! dnl $Id: configure.in,v 1.338 1999/04/09 08:26:48 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 148,154 **** fi 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/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h ndbm.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM --- 148,154 ---- fi 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/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h dbm.h ndbm.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_STRUCT_TM *************** *** 525,530 **** --- 525,531 ---- ]) ]) ]) + AC_DEFINE(HAVE_GDBM_H, 1) AC_SUBST(GDBM_INCLUDE) fi Index: php3/libphp3.module.in diff -c php3/libphp3.module.in:1.23 php3/libphp3.module.in:1.24 *** php3/libphp3.module.in:1.23 Mon Mar 8 20:31:05 1999 --- php3/libphp3.module.in Fri Apr 9 04:26:48 1999 *************** *** 1,7 **** Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@" RULE_HIDE=yes ConfigEnd --- 1,7 ---- Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ ! LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_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@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @DBA_LFLAGS@ @DBA_LIBS@" RULE_HIDE=yes ConfigEnd -- 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