[PHP4BETA] CVS update: php4

Date: Monday April 19, 1999 @ 11:04 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv28782 Modified Files: Makefile.in configure.in.in internal_functions.c setup Log Message: moved odbc into ext/ Index: php4/Makefile.in diff -u php4/Makefile.in:1.7 php4/Makefile.in:1.8 --- php4/Makefile.in:1.7 Mon Apr 19 09:58:30 1999 +++ php4/Makefile.in Mon Apr 19 11:04:09 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.7 1999/04/19 13:58:30 ssb Exp $ +# $Id: Makefile.in,v 1.8 1999/04/19 15:04:09 ssb Exp $ # prefix = @prefix@ @@ -68,22 +68,21 @@ safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ php_ini.o -FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \ +FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ functions/head.c functions/imap.c functions/mime.c \ functions/msql.c functions/mysql.c \ functions/oracle.c functions/oci8.c functions/pgsql.c \ - functions/post.c functions/solid.c functions/sybase.c \ + functions/post.c functions/sybase.c \ functions/sybase-ct.c @BCMATH_SRC@ functions/xml.c \ - functions/unified_odbc.c functions/ldap.c functions/velocis.c \ - functions/zlib.c functions/COM.c functions/ifx.c \ + functions/ldap.c functions/zlib.c functions/COM.c functions/ifx.c \ functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \ functions/fdf.c functions/snmp.c functions/interbase.c \ functions/sysvsem.c functions/sysvshm.c functions/dav.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext -LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_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@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ +LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_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: php4/configure.in.in diff -u php4/configure.in.in:1.4 php4/configure.in.in:1.5 --- php4/configure.in.in:1.4 Mon Apr 19 09:58:31 1999 +++ php4/configure.in.in Mon Apr 19 11:04:09 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.4 1999/04/19 13:58:31 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.5 1999/04/19 15:04:09 ssb Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -1023,99 +1023,6 @@ AC_SUBST(ORACLE_VERSION) -AC_MSG_CHECKING(for iODBC support) -AC_ARG_WITH(iodbc, -[ --with-iodbc[=DIR] Include iODBC support. DIR is the iODBC base - install directory, defaults to /usr/local.], -[ - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - - IODBC_INCDIR=$withval/include - IODBC_LIBDIR=$withval/lib - IODBC_LFLAGS=-L$IODBC_LIBDIR - IODBC_INCLUDE=-I$IODBC_INCDIR - IODBC_LIBS=-liodbc - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_IODBC) - - AC_MSG_RESULT(yes) - - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(IODBC_LIBS) -AC_SUBST(IODBC_LFLAGS) -dnl## AC_SUBST(IODBC_INCLUDE) -INCLUDES="$INCLUDES $IODBC_INCLUDE" - - -AC_MSG_CHECKING(for OpenLink ODBC support) -AC_ARG_WITH(openlink, -[ --with-openlink[=DIR] Include OpenLink ODBC support. DIR is the - OpenLink base install directory, defaults to - /usr/local/openlink.], -[ - if test "$withval" = "yes"; then - withval=/usr/local/openlink - fi - if test "$withval" != "no"; then - - OPENLINK_INCDIR=$withval/odbcsdk/include - OPENLINK_LIBDIR=$withval/odbcsdk/lib - OPENLINK_LFLAGS=-L$OPENLINK_LIBDIR - OPENLINK_INCLUDE=-I$OPENLINK_INCDIR - OPENLINK_LIBS=-liodbc - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_OPENLINK) - - AC_MSG_RESULT(yes) - - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(OPENLINK_LIBS) -AC_SUBST(OPENLINK_LFLAGS) -dnl## AC_SUBST(OPENLINK_INCLUDE) -INCLUDES="$INCLUDES $OPENLINK_INCLUDE" - - -AC_MSG_CHECKING(for Adabas support) -AC_ARG_WITH(adabas, -[ --with-adabas[=DIR] Include Adabas D support. DIR is the Adabas base - install directory, defaults to /usr/local.], -[ - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - ADA_INCDIR=$withval/incl - ADA_LIBDIR=$withval/lib - ADA_LFLAGS=-L$ADA_LIBDIR - ADA_INCLUDE=-I$ADA_INCDIR - ADA_LIBS="${ADA_LIBDIR}/odbclib.a -lsqlrte -lsqlptc" - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_ADABAS) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(ADA_LIBS) -AC_SUBST(ADA_LFLAGS) -dnl## AC_SUBST(ADA_INCLUDE) -INCLUDES="$INCLUDES $ADA_INCLUDE" - - AC_MSG_CHECKING(for Sybase support) AC_ARG_WITH(sybase, [ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home @@ -1309,72 +1216,6 @@ INCLUDES="$INCLUDES $PGSQL_INCLUDE" -AC_MSG_CHECKING(for Solid support) -AC_ARG_WITH(solid, -[ --with-solid[=DIR] Include Solid support. DIR is the Solid base - install directory, defaults to /usr/local/solid], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - SOLID_INCDIR=/usr/local/solid/include - SOLID_LIBDIR=/usr/local/solid/lib - else - SOLID_INCDIR=$withval/include - SOLID_LIBDIR=$withval/lib - fi - SOLID_INCLUDE=-I$SOLID_INCDIR - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_SOLID) - - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) -if test "$SOLID_LIBDIR" != ""; then - AC_FIND_SOLID_LIBS($SOLID_LIBDIR) -fi -dnl## AC_SUBST(SOLID_INCLUDE) -AC_SUBST(SOLID_LIBS) -INCLUDES="$INCLUDES $SOLID_INCLUDE" - - -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_LIBS) -dnl## AC_SUBST(EMPRESS_INCLUDE) -INCLUDES="$INCLUDES $EMPRESS_INCLUDE" - - AC_MSG_CHECKING(for LDAP support) AC_ARG_WITH(ldap, [ --with-ldap[=DIR] Include LDAP support. DIR is the LDAP base @@ -1441,48 +1282,6 @@ INCLUDES="$INCLUDES $SNMP_INCLUDE" -AC_MSG_CHECKING(for Velocis support) -AC_ARG_WITH(velocis, -[ --with-velocis[=DIR] Include Velocis support. DIR is the Velocis - base install directory, defaults to /usr/local/velocis.], -[ - if test "$withval" != "no"; then - VELOCIS_OS=uname - if test "$withval" = "yes"; then - VELOCIS_INCDIR=/usr/local/velocis/include - VELOCIS_LIBDIR=/usr/local/velocis - else - VELOCIS_INCDIR=$withval/include - VELOCIS_LIBDIR=$withval - fi - VELOCIS_INCLUDE=-I$VELOCIS_INCDIR - VELOCIS_LIBDIR="$VELOCIS_LIBDIR/bin" - VELOCIS_LIBS="-l_rdbc -l_sql" - if test $VELOCIS_OS = "FreeBSD"; then - VELOCIS_LIBS="$VELOCIS_LIBDIR/../lib/rdscli.a -lcompat" - fi - if test $VELOCIS_OS = "BSD/OS"; then - VELOCIS_LIBS="$VELOCIS_LIBDIR/../lib/rdscli.a -lcompat" - fi - old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $VELOCIS_INCLUDE" - LDFLAGS="$LDFLAGS $VELOCIS_LIBS" - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_VELOCIS) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(VELOCIS_LIBS) -AC_SUBST(VELOCIS_LFLAGS) -dnl## AC_SUBST(VELOCIS_INCLUDE) -INCLUDES="$INCLUDES $VELOCIS_INCLUDE" - - AC_MSG_CHECKING(for Informix support) AC_ARG_WITH(informix, [ --with-informix[=DIR] Include Informix support. DIR is the Informix base @@ -1587,46 +1386,6 @@ INCLUDES="$INCLUDES $IBASE_INCLUDE" -AC_MSG_CHECKING(for a custom ODBC support) -AC_ARG_WITH(custom-odbc, -[ --with-custom-odbc[=DIR] Include a user defined ODBC support. - The DIR is ODBC install base directory, - which defaults to /usr/local. - Make sure to define CUSTOM_ODBC_LIBS and - have some odbc.h in your include dirs. - E.g., you should define following for - Sybase SQL Anywhere 5.5.00 on QNX, prior to - run configure script: - CFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix - CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\".], -[ - if test "$withval" = "yes"; then - withval=/usr/local - fi - if test "$withval" != "no"; then - - CODBC_INCDIR=$withval/include - CODBC_LIBDIR=$withval/lib - CODBC_LFLAGS=-L$CODBC_LIBDIR - CODBC_INCLUDE=-I$CODBC_INCDIR - CODBC_LIBS=$CUSTOM_ODBC_LIBS - UODBC_DEFAULT=yes - - AC_DEFINE(HAVE_CODBC) - - AC_MSG_RESULT(yes) - - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(CODBC_LIBS) -AC_SUBST(CODBC_LFLAGS) -dnl## AC_SUBST(CODBC_INCLUDE) -INCLUDES="$INCLUDES $CODBC_INCLUDE" - - AC_MSG_CHECKING(for Hyperwave support) AC_ARG_WITH(hyperwave, [ --with-hyperwave Include Hyperwave support], @@ -1803,43 +1562,6 @@ AC_DEFINE(HAVE_MOD_DAV, 0) ]) AC_SUBST(MOD_DAV_CFLAGS) - - -AC_MSG_CHECKING(whether to enable unified ODBC support) -AC_ARG_ENABLE(unified-odbc, -[ --disable-unified-odbc Disable unified ODBC support. Only applicable if - iODBC, Adabas, Solid, Velocis or a custom ODBC - interface is enabled.], -[ - if test "$enableval" = "no"; then - AC_DEFINE(HAVE_UODBC, 0) - AC_MSG_RESULT(no) - else - if test "$with_solid" != ""; then - UODBC_TYPE=solid - elif test "$with_iodbc" != ""; then - UODBC_TYPE=iodbc - elif test "$with_adabas" != ""; then - UODBC_TYPE=adabas - elif test "$with_velocis" != ""; then - UODBC_TYPE=velocis - elif test "$with_custom_odbc" != ""; then - UODBC_TYPE=custom - else - AC_MSG_ERROR([no ODBC library! Include Solid, iODBC, Velocis, Adabas D or a custom ODBC support.]) - fi - AC_DEFINE(HAVE_UODBC, 1) - AC_MSG_RESULT([yes, using $UODBC_TYPE]) - fi -],[ - if test "$UODBC_DEFAULT" = "yes"; then - AC_DEFINE(HAVE_UODBC, 1) - AC_MSG_RESULT(yes) - else - AC_DEFINE(HAVE_UODBC, 0) - AC_MSG_RESULT(no) - fi -]) AC_MSG_CHECKING(whether to enable System V semaphore support) Index: php4/internal_functions.c diff -u php4/internal_functions.c:1.4 php4/internal_functions.c:1.5 --- php4/internal_functions.c:1.4 Mon Apr 19 09:58:31 1999 +++ php4/internal_functions.c Mon Apr 19 11:04:09 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.4 1999/04/19 13:58:31 ssb Exp $ */ +/* $Id: internal_functions.c,v 1.5 1999/04/19 15:04:09 ssb Exp $ */ #include "php.h" @@ -43,6 +43,7 @@ #include "ext/standard/php3_standard.h" #include "ext/gd/php3_gd.h" #include "ext/dbase/dbase.h" +#include "ext/odbc/php3_odbc.h" #include "functions/php3_ifx.h" #include "functions/php3_ldap.h" @@ -52,19 +53,15 @@ #include "functions/php3_oci8.h" #include "functions/oracle.h" #include "functions/php3_pgsql.h" -#include "functions/php3_velocis.h" #include "functions/php3_sybase.h" #include "functions/php3_sybase-ct.h" #include "functions/imap.h" #include "functions/dl.h" #include "functions/head.h" #include "functions/post.h" -#include "functions/php3_solid.h" -#include "functions/adabasd.h" #include "functions/hw.h" #include "functions/filepro.h" #include "functions/db.h" -#include "functions/php3_unified_odbc.h" #include "dl/snmp/php3_snmp.h" #include "functions/php3_zlib.h" #include "functions/php3_COM.h" @@ -96,7 +93,6 @@ pgsql_module_ptr, ifx_module_ptr, ldap_module_ptr, - velocis_module_ptr, filepro_module_ptr, sybase_module_ptr, sybct_module_ptr, @@ -104,8 +100,6 @@ dbase_module_ptr, hw_module_ptr, regexp_module_ptr, - solid_module_ptr, - adabas_module_ptr, gd_module_ptr, oci8_module_ptr, oracle_module_ptr, Index: php4/setup diff -u php4/setup:1.3 php4/setup:1.4 --- php4/setup:1.3 Mon Apr 19 09:58:31 1999 +++ php4/setup Mon Apr 19 11:04:09 1999 @@ -29,7 +29,7 @@ # | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> | # +----------------------------------------------------------------------+ # -# $Id: setup,v 1.3 1999/04/19 13:58:31 ssb Exp $ +# $Id: setup,v 1.4 1999/04/19 15:04:09 ssb Exp $ if [ "$1" = "-q" ]; then quiet_mode=on @@ -246,24 +246,6 @@ Oracle environment, enter what $ORACLE_HOME is usually set to here.\n More info about Oracle can be found at http://www.oracle.com/.' -define_option with-iodbc 'iODBC support?' yesnodir \ - 'no /usr/local iODBC install' \ -' Whether to build PHP with iODBC support. This feature was first\n - developed for iODBC Driver Manager, a freely redistributable ODBC\n - driver manager which runs under many flavors of UNIX.\n - More info about iODBC can be found on the FreeODBC Pages at \n - http://users.ids.net/~bjepson/freeODBC/.' - -define_option with-openlink 'OpenLink ODBC support?' yesnodir \ - 'no /usr/local/openlink OpenLink install' \ -' Whether to build PHP with OpenLink ODBC support. See - http://www.openlinksw.com/ for more information.' - -define_option with-adabas 'Adabas D support?' yesnodir \ - 'no /usr/local Adabas D install root' \ -' Whether to build with Adabas D support.\n - More info about Adabas D can be found at http://www.adabas.com/.' - define_option with-sybase 'Sybase support?' yesnodir \ 'no /home/sybase Sybase install' \ ' Whether to build PHP with Sybase support (DBLib only).\n @@ -291,18 +273,6 @@ More info about PostgreSQL can be found at\n http://www.postgreSQL.org/.' -define_option with-solid 'Solid support?' yesnodir \ - 'no /usr/local/solid Solid install' \ -' 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 @@ -330,32 +300,6 @@ ' Whether to build with IMAP (Internet Message Access Protocol)\n support.\n More information about LDAP can be found in RFC1777 and RFC1778.' - -define_option with-velocis 'Velocis support?' yesnodir \ - 'no /usr/local/velocis Velocis install' \ -' Whether to build PHP with Velocis support.\n - More information about Velocis can be found at http://www.raima.com/.' - -define_option with-custom-odbc 'custom ODBC support?' yesnodir \ - 'no /usr/local CODBC install' \ -' Whether to build PHP with CODBC support. This feature was first - developed for Sybase SQL Anywhere 5.5 on QNX, but may be used for - any unknown ODBC driver on all flavors of UNIX.' - -if test "$option_value_with_iodbc" != "no" -o \ - "$option_value_with_solid" != "no" -o \ - "$option_value_with_adabas" != "no" -o \ - "$option_value_with_velocis" != "no" -o \ - "$option_value_with_custom_odbc" != "no" -then -define_option enable-unified-odbc 'Enable unified ODBC support?' yesno yes \ -' 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-filepro 'filePro support? ' yesno no \ ' Whether to use the bundled filePro library. Read-access only.' -- PHP 4 Beta