diff options
| author | Nick Gorham <lurcher@php.net> | 1999-09-23 14:46:35 +0000 |
|---|---|---|
| committer | Nick Gorham <lurcher@php.net> | 1999-09-23 14:46:35 +0000 |
| commit | 7d759e6781a16990a85bf08edb0e10ff3b6921a7 (patch) | |
| tree | 127564139d7b42e54c7eea681156d5b21d5b75e8 /ext/odbc | |
| parent | 1e13eb646e0923b5d7678c7e198a7ef9083136a0 (diff) | |
| download | php-git-7d759e6781a16990a85bf08edb0e10ff3b6921a7.tar.gz | |
Added support for Easysoft ODBC-ODBC Bridge
Fixed bug in odbc_setoption
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/config.h.stub | 1 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 27 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.h | 7 | ||||
| -rw-r--r-- | ext/odbc/setup.stub | 10 |
5 files changed, 46 insertions, 1 deletions
diff --git a/ext/odbc/config.h.stub b/ext/odbc/config.h.stub index 9bc73bdb07..f892c5b7d0 100644 --- a/ext/odbc/config.h.stub +++ b/ext/odbc/config.h.stub @@ -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 diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 68fdd1be48..b57031b382 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -224,6 +224,33 @@ AC_ARG_WITH(iodbc, 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 diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 3da64ee6e4..06a84a62ff 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -2082,7 +2082,7 @@ PHP_FUNCTION(odbc_setoption) 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; } diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 4efa657990..831e718b83 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -84,6 +84,13 @@ PHP_FUNCTION(solid_fetch_prev); #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 + #elif HAVE_OPENLINK /* OpenLink ODBC drivers */ #define ODBC_TYPE "Openlink" diff --git a/ext/odbc/setup.stub b/ext/odbc/setup.stub index 5257797527..962a029c63 100644 --- a/ext/odbc/setup.stub +++ b/ext/odbc/setup.stub @@ -41,6 +41,16 @@ define_option with-unixODBC 'unixODBC support?' yesnodir \ 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 if test "$option_value_with_solid" = "no" -a \ "$option_value_with_empress" = "no" -a \ |