cvs: /php4/ext/odbc config.h.stub config.m4 php_odbc.c php_odbc.h setup.stub

lurcher Thu Sep 23 10:46:36 1999 EDT Modified files: /php4/ext/odbc config.h.stub config.m4 php_odbc.c php_odbc.h setup.stub Log: Added support for Easysoft ODBC-ODBC Bridge Fixed bug in odbc_setoption Index: php4/ext/odbc/config.h.stub diff -u php4/ext/odbc/config.h.stub:1.3 php4/ext/odbc/config.h.stub:1.4 --- php4/ext/odbc/config.h.stub:1.3 Sun Sep 5 09:01:42 1999 +++ php4/ext/odbc/config.h.stub Thu Sep 23 10:46:35 1999 @@ -1,5 +1,6 @@ #define HAVE_SOLID 0 #define HAVE_IODBC 0 +#define HAVE_ESOOB 0 #define HAVE_UNIXODBC 0 #define HAVE_OPENLINK 0 #define HAVE_ADABAS 0 Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.5 php4/ext/odbc/config.m4:1.6 --- php4/ext/odbc/config.m4:1.5 Thu Sep 16 11:35:49 1999 +++ php4/ext/odbc/config.m4 Thu Sep 23 10:46:35 1999 @@ -224,6 +224,33 @@ fi if test -z "$ODBC_TYPE"; then +AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) +AC_ARG_WITH(esoob, +[ --with-esoob[=DIR] Include Easysoft OOB support. DIR is the OOB base + install directory, + defaults to /usr/local/easysoft/oob/client.], +[ + if test "$withval" = "yes"; then + withval=/usr/local/easysoft/oob/client + fi + if test "$withval" != "no"; then + ODBC_INCDIR=$withval/include + ODBC_LIBDIR=$withval/lib + ODBC_LFLAGS=-L$ODBC_LIBDIR + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_LIBS=-lesoobclient + ODBC_TYPE=ESOOB + AC_DEFINE(HAVE_ESOOB) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) +fi + +if test -z "$ODBC_TYPE"; then AC_MSG_CHECKING(for unixODBC support) AC_ARG_WITH(unixODBC, [ --with-unixODBC[=DIR] Include unixODBC support. DIR is the unixODBC base Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.2 php4/ext/odbc/php_odbc.c:1.3 --- php4/ext/odbc/php_odbc.c:1.2 Wed Sep 22 17:14:02 1999 +++ php4/ext/odbc/php_odbc.c Thu Sep 23 10:46:35 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.2 1999/09/22 21:14:02 lurcher Exp $ */ +/* $Id: php_odbc.c,v 1.3 1999/09/23 14:46:35 lurcher Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -2082,7 +2082,7 @@ RETCODE rc; pval *arg1, *arg2, *arg3, *arg4; - if ( getParameters(ht, 3, &arg1, &arg2, &arg3, &arg4) == FAILURE) { + if ( getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; } Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.2 php4/ext/odbc/php_odbc.h:1.3 --- php4/ext/odbc/php_odbc.h:1.2 Wed Sep 22 17:14:03 1999 +++ php4/ext/odbc/php_odbc.h Thu Sep 23 10:46:35 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.2 1999/09/22 21:14:03 lurcher Exp $ */ +/* $Id: php_odbc.h,v 1.3 1999/09/23 14:46:35 lurcher Exp $ */ #ifndef _PHP_ODBC_H #define _PHP_ODBC_H @@ -80,6 +80,13 @@ #elif HAVE_UNIXODBC /* unixODBC library */ #define ODBC_TYPE "unixODBC" +#include <sql.h> +#include <sqlext.h> +#define HAVE_SQL_EXTENDED_FETCH 1 + +#elif HAVE_ESOOB /* Easysoft ODBC-ODBC Bridge library */ + +#define ODBC_TYPE "ESOOB" #include <sql.h> #include <sqlext.h> #define HAVE_SQL_EXTENDED_FETCH 1 Index: php4/ext/odbc/setup.stub diff -u php4/ext/odbc/setup.stub:1.2 php4/ext/odbc/setup.stub:1.3 --- php4/ext/odbc/setup.stub:1.2 Mon Aug 30 06:48:23 1999 +++ php4/ext/odbc/setup.stub Thu Sep 23 10:46:35 1999 @@ -1,4 +1,4 @@ -# $Id: setup.stub,v 1.2 1999/08/30 10:48:23 kara Exp $ -*- sh -*- +# $Id: setup.stub,v 1.3 1999/09/23 14:46:35 lurcher Exp $ -*- sh -*- # Solid define_option with-solid 'Solid support?' yesnodir \ @@ -39,6 +39,16 @@ the ODBC 3.5 specification.\n More info about unixODBC can be found on the unixODBC home page at \n http://www.unixodbc.org' +fi + +# ESOOB +if test "$option_value_with_solid" = "no" -a \ + "$option_value_with_empress" = "no"; then +define_option with-esoob 'Easysoft ODBC-ODBC Bridge support?' yesnodir \ + 'no /usr/local/easysoft/oob/client ESOOB install' \ +' Whether to build PHP with Easysoft ODBC-ODBC Bridge support.\n + More info about the Easysoft ODBC-ODBC Bridge can be found on the\n + Easysoft home page at http://www.easysoft.com' fi # OpenLink