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

kara Mon Aug 30 06:48:24 1999 EDT Modified files: /php4/ext/odbc config.h.stub config.m4 php3_odbc.h setup.stub Log: Add support for unixODBC Index: php4/ext/odbc/config.h.stub diff -u php4/ext/odbc/config.h.stub:1.1 php4/ext/odbc/config.h.stub:1.2 --- php4/ext/odbc/config.h.stub:1.1 Mon Apr 19 21:23:32 1999 +++ php4/ext/odbc/config.h.stub Mon Aug 30 06:48:23 1999 @@ -1,5 +1,6 @@ #define HAVE_SOLID 0 #define HAVE_IODBC 0 +#define HAVE_UNIXODBC 0 #define HAVE_OPENLINK 0 #define HAVE_ADABAS 0 #define HAVE_CODBC 0 Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.3 php4/ext/odbc/config.m4:1.4 --- php4/ext/odbc/config.m4:1.3 Sun Aug 8 12:26:26 1999 +++ php4/ext/odbc/config.m4 Mon Aug 30 06:48:23 1999 @@ -223,6 +223,32 @@ 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 + install directory, defaults to /usr/local.], +[ + if test "$withval" = "yes"; then + withval=/usr/local + 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=-lodbc + ODBC_TYPE=unixODBC + AC_DEFINE(HAVE_UNIXODBC) + 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 OpenLink ODBC support) AC_ARG_WITH(openlink, [ --with-openlink[=DIR] Include OpenLink ODBC support. DIR is the Index: php4/ext/odbc/php3_odbc.h diff -u php4/ext/odbc/php3_odbc.h:1.6 php4/ext/odbc/php3_odbc.h:1.7 --- php4/ext/odbc/php3_odbc.h:1.6 Sun Aug 8 12:26:26 1999 +++ php4/ext/odbc/php3_odbc.h Mon Aug 30 06:48:23 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_odbc.h,v 1.6 1999/08/08 16:26:26 kara Exp $ */ +/* $Id: php3_odbc.h,v 1.7 1999/08/30 10:48:23 kara Exp $ */ #ifndef _PHP_ODBC_H #define _PHP_ODBC_H @@ -76,6 +76,13 @@ #define SQL_SO_DYNAMIC 0x00000004L #define SQL_LEN_DATA_AT_EXEC_OFFSET (-100) #define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET) + +#elif HAVE_UNIXODBC /* unixODBC library */ + +#define ODBC_TYPE "unixODBC" +#include <sql.h> +#include <sqlext.h> +#define HAVE_SQL_EXTENDED_FETCH 1 #elif HAVE_OPENLINK /* OpenLink ODBC drivers */ Index: php4/ext/odbc/setup.stub diff -u php4/ext/odbc/setup.stub:1.1 php4/ext/odbc/setup.stub:1.2 --- php4/ext/odbc/setup.stub:1.1 Mon Apr 19 11:04:11 1999 +++ php4/ext/odbc/setup.stub Mon Aug 30 06:48:23 1999 @@ -1,4 +1,4 @@ -# $Id: setup.stub,v 1.1 1999/04/19 15:04:11 ssb Exp $ -*- sh -*- +# $Id: setup.stub,v 1.2 1999/08/30 10:48:23 kara Exp $ -*- sh -*- # Solid define_option with-solid 'Solid support?' yesnodir \ @@ -24,8 +24,21 @@ ' 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/.' + More info about iODBC can be found on the iODBC page at \n + http://www.iodbc.org' +fi + +# unixODBC +if test "$option_value_with_solid" = "no" -a \ + "$option_value_with_empress" = "no"; then +define_option with-unixODBC 'unixODBC support?' yesnodir \ + 'no /usr/local unixODBC install' \ +' Whether to build PHP with unixODBC support. This feature was first\n + developed for unixODBC Driver Manager, a freely redistributable ODBC\n + driver manager which runs under many flavors of UNIX and conforms to\n + 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 # OpenLink