CVS update: php3

Date: Sunday May 9, 1999 @ 13:35 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv25955 Modified Files: acconfig.h config.h.in configure.in Log Message: - better autoconf checking for db2 - db2 compile fix - correcter cast in file.c - dba_sync fix Index: php3/acconfig.h diff -u php3/acconfig.h:1.90 php3/acconfig.h:1.91 --- php3/acconfig.h:1.90 Sun Apr 25 18:24:08 1999 +++ php3/acconfig.h Sun May 9 13:35:44 1999 @@ -7,6 +7,10 @@ /* define if you have the specific db library */ +#define DB2_DB2_DB_H 0 +#define DB2_DB_DB2_H 0 +#define DB2_DB_H 0 +#define DB2_DB2_H 0 #define HAVE_DBA 0 #define DBA_GDBM 0 #define DBA_NDBM 0 Index: php3/config.h.in diff -u php3/config.h.in:1.151 php3/config.h.in:1.152 --- php3/config.h.in:1.151 Sun Apr 25 18:24:08 1999 +++ php3/config.h.in Sun May 9 13:35:44 1999 @@ -72,6 +72,10 @@ #define CONFIGURATION_FILE_PATH "php3.ini" #define USE_CONFIG_FILE 1 +#define DB2_DB2_DB_H 0 +#define DB2_DB_DB2_H 0 +#define DB2_DB_H 0 +#define DB2_DB2_H 0 #define HAVE_DBA 0 #define DBA_GDBM 0 #define DBA_NDBM 0 Index: php3/configure.in diff -u php3/configure.in:1.349 php3/configure.in:1.350 --- php3/configure.in:1.349 Sun May 9 12:54:33 1999 +++ php3/configure.in Sun May 9 13:35:44 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.349 1999/05/09 16:54:33 sas Exp $ +dnl $Id: configure.in,v 1.350 1999/05/09 17:35:44 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2342,9 +2342,23 @@ for i in /usr/local /usr $withval; do if test -f "$i/include/db.h" ; then THIS_PREFIX="$i" + DB2_EXTRA="DB2_DB_H" + elif test -f "$i/include/db2/db.h"; then + THIS_PREFIX="$i" + DB2_EXTRA="DB2_DB2_DB_H" + elif test -f "$i/include/db/db2.h"; then + THIS_PREFIX="$i" + DB2_EXTRA="DB2_DB_DB2_H" + elif test -f "$i/include/db2.h"; then + THIS_PREFIX="$i" + DB2_EXTRA="DB2_DB2_H" fi done + if test "$DB2_EXTRA" != ""; then + eval "AC_DEFINE($DB2_EXTRA, 1)" + fi + for LIB in db db2 c; do old_LFLAGS="$LFLAGS" LFLAGS="-L$THIS_PREFIX/lib $LFLAGS" -- 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