CVS update: php3

Date: Thursday December 10, 1998 @ 13:36 Author: swilliam Update of /repository/php3 In directory asf:/u/temp/cvs-serv3160/php3 Modified Files: Makefile.in aclocal.m4 build-defs.h.in config.h.in configure.in setup Log Message: Added configuration information for Empress RDBMS. Note that there are still outstanding problems with multiple connections to Empress that I am investigating. I am committing the config information because it should not affect the rest of the system and I won't have to keep re-applying the info everytime someone updates the cvs tree. Index: php3/Makefile.in diff -c php3/Makefile.in:1.277 php3/Makefile.in:1.278 *** php3/Makefile.in:1.277 Fri Dec 4 11:40:55 1998 --- php3/Makefile.in Thu Dec 10 13:36:25 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.277 1998/12/04 16:40:55 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.278 1998/12/10 18:36:25 swilliam 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@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_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@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ *************** *** 96,102 **** FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) --- 96,102 ---- FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) ! LIBS = $(PHPLIBS) @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@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) Index: php3/aclocal.m4 diff -c php3/aclocal.m4:1.29 php3/aclocal.m4:1.30 *** php3/aclocal.m4:1.29 Tue Oct 27 12:05:34 1998 --- php3/aclocal.m4 Thu Dec 10 13:36:30 1998 *************** *** 1,4 **** ! dnl $Id: aclocal.m4,v 1.29 1998/10/27 17:05:34 ssb Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: aclocal.m4,v 1.30 1998/12/10 18:36:30 swilliam Exp $ dnl dnl This file contains local autoconf functions. *************** *** 66,71 **** --- 66,84 ---- fi AC_MSG_RESULT(echo $SOLID_LIBS | sed -e 's!.*/!!') ]) + + dnl + dnl Figure out which library file to link with for the Empress support. + dnl + AC_DEFUN(AC_FIND_EMPRESS_LIBS,[ + AC_MSG_CHECKING([Empress library file]) + EMPRESS_LIBS=echo $1/empodbc.so | cut -d' ' -f1 + if test ! -f $EMPRESS_LIBS; then + EMPRESS_LIBS=echo $1/empodbc.a | cut -d' ' -f1 + fi + AC_MSG_RESULT(echo $EMPRESS_LIBS | sed -e 's!.*/!!') + ]) + dnl dnl See if we have broken header files like SunOS has. Index: php3/build-defs.h.in diff -c php3/build-defs.h.in:1.19 php3/build-defs.h.in:1.20 *** php3/build-defs.h.in:1.19 Tue Oct 6 09:51:37 1998 --- php3/build-defs.h.in Thu Dec 10 13:36:30 1998 *************** *** 71,76 **** --- 71,78 ---- #define PHP_REGEX_LIB "@REGEX_LIB@" #define PHP_SOLID_INCLUDE "@SOLID_INCLUDE@" #define PHP_SOLID_LIBS "@SOLID_LIBS@" + #define PHP_EMPRESS_INCLUDE "@EMPRESS_INCLUDE@" + #define PHP_EMPRESS_LIBS "@EMPRESS_LIBS@" #define PHP_SYBASE_INCLUDE "@SYBASE_INCLUDE@" #define PHP_SYBASE_LFLAGS "@SYBASE_LFLAGS@" #define PHP_SYBASE_LIBS "@SYBASE_LIBS@" Index: php3/config.h.in diff -c php3/config.h.in:1.123 php3/config.h.in:1.124 *** php3/config.h.in:1.123 Fri Dec 4 11:45:03 1998 --- php3/config.h.in Thu Dec 10 13:36:30 1998 *************** *** 131,136 **** --- 131,139 ---- /* Define if you want Solid database support */ #define HAVE_SOLID 0 + /* Define if you want Empress database support */ + #define HAVE_EMPRESS 0 + /* Define if you want to use the supplied dbase library */ #define DBASE 0 *************** *** 243,248 **** --- 246,252 ---- #define MSQL1 0 #define HAVE_FILEPRO 0 #define HAVE_SOLID 0 + #define HAVE_EMPRESS 0 #define DEBUG 0 /* Define if you want to enable the PHP TCP/IP debugger (experimental) */ Index: php3/configure.in diff -c php3/configure.in:1.283 php3/configure.in:1.284 *** php3/configure.in:1.283 Thu Dec 10 01:50:21 1998 --- php3/configure.in Thu Dec 10 13:36:31 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.283 1998/12/10 06:50:21 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.284 1998/12/10 18:36:31 swilliam Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 240,246 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@DBASE_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@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" --- 240,246 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@DBASE_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_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" *************** *** 1050,1055 **** --- 1050,1087 ---- fi AC_SUBST(SOLID_INCLUDE) AC_SUBST(SOLID_LIBS) + + + AC_MSG_CHECKING(for Empress support) + AC_ARG_WITH(empress, + [ --with-empress[=DIR] Include Empress support. DIR is the Empress base + install directory, defaults to \$EMPRESSPATH], + [ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + EMPRESS_INCDIR=$EMPRESSPATH/odbccl/include + EMPRESS_LIBDIR=$EMPRESSPATH/odbccl/lib + else + EMPRESS_INCDIR=$withval/include + EMPRESS_LIBDIR=$withval/lib + fi + EMPRESS_INCLUDE=-I$EMPRESS_INCDIR + UODBC_DEFAULT=yes + + AC_DEFINE(HAVE_EMPRESS) + + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ],[ + AC_MSG_RESULT(no) + ]) + if test "$EMPRESS_LIBDIR" != ""; then + AC_FIND_EMPRESS_LIBS($EMPRESS_LIBDIR) + fi + AC_SUBST(EMPRESS_INCLUDE) + AC_SUBST(EMPRESS_LIBS) AC_MSG_CHECKING(for LDAP support) Index: php3/setup diff -c php3/setup:1.47 php3/setup:1.48 *** php3/setup:1.47 Wed Dec 2 11:16:16 1998 --- php3/setup Thu Dec 10 13:36:33 1998 *************** *** 29,35 **** # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.47 1998/12/02 16:16:16 steinm Exp $ if [ "$1" = "-q" ]; then quiet_mode=on --- 29,35 ---- # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # ! # $Id: setup,v 1.48 1998/12/10 18:36:33 swilliam Exp $ if [ "$1" = "-q" ]; then quiet_mode=on *************** *** 295,300 **** --- 295,307 ---- ' Whether to build PHP with Solid support.\n More information about Solid can be found at http://www.solidtech.com/.' + define_option with-empress 'Empress support?' yesnodir \ + "no $EMPRESSPATH Empress home" \ + ' Whether to build PHP with Empress support. Has been confirmed to + work with Empress Version 8.10. If you have not set up your + Empress environment, enter what $EMPRESSPATH is usually set to here. + More info about Empress can be found at http://www.empress.com/.' + define_option with-informix 'Informix support?' yesnodir \ "no $INFORMIXDIR Informix home" \ ' Whether to build PHP with Informix support. If you have not set up your\n *************** *** 339,346 **** ' Whether to enabled the unified ODBC support. This is a database\n module that compiles with the C API of several DBMSes that happen to\n use ODBC as their C-API. Has been tested with iODBC, Solid, Adabas D,\n ! and Sybase SQL Anywhere. Requires that some one (and only one) specific\n ! ODBC module is enabled, or some custom ODBC library specified instead.' fi define_option with-dbase 'dBase support? ' yesno no \ --- 346,354 ---- ' Whether to enabled the unified ODBC support. This is a database\n module that compiles with the C API of several DBMSes that happen to\n use ODBC as their C-API. Has been tested with iODBC, Solid, Adabas D,\n ! Empress, and Sybase SQL Anywhere. Requires that some one (and only one)\n ! specific ODBC module is enabled, or some custom ODBC library specified\n ! instead.' fi define_option with-dbase 'dBase support? ' yesno no \ -- 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