cvs: /php3 acconfig.h config.h.in configure.in /php3/functions php3_unified_odbc.h unified_odbc.c

rasmus Thu Jul 15 17:55:41 1999 EDT Modified files: /php3 acconfig.h config.h.in configure.in /php3/functions php3_unified_odbc.h unified_odbc.c Log: IBM DB2 support should compile now. Only tested the compile on AIX-4.3.2 so far and have not actually tested how well it works yet. If someone has a DB2 setup on an AIX box, please give this a whirl. Index: php3/acconfig.h diff -u php3/acconfig.h:1.105 php3/acconfig.h:1.106 --- php3/acconfig.h:1.105 Mon Jul 12 21:13:45 1999 +++ php3/acconfig.h Thu Jul 15 17:55:40 1999 @@ -144,6 +144,9 @@ /* Define if you want Solid database support */ #define HAVE_SOLID 0 +/* Define if you want IBM DB2 database support */ +#define HAVE_IBMDB2 0 + /* Define if you want to use the supplied dbase library */ #define DBASE 0 Index: php3/config.h.in diff -u php3/config.h.in:1.182 php3/config.h.in:1.183 --- php3/config.h.in:1.182 Mon Jul 12 21:13:45 1999 +++ php3/config.h.in Thu Jul 15 17:55:40 1999 @@ -194,6 +194,9 @@ /* Define if you want Solid database support */ #define HAVE_SOLID 0 +/* Define if you want IBM DB2 database support */ +#define HAVE_IBMDB2 0 + /* Define if you want to use the supplied dbase library */ #define DBASE 0 Index: php3/configure.in diff -u php3/configure.in:1.439 php3/configure.in:1.440 --- php3/configure.in:1.439 Wed Jul 14 17:23:43 1999 +++ php3/configure.in Thu Jul 15 17:55:40 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.439 1999/07/14 15:23:43 rasmus Exp $ +dnl $Id: configure.in,v 1.440 1999/07/15 15:55:40 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -283,7 +283,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@EXTRA_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @DBASE_LIBS@ @PCRE_LIB@" + APXS_LDFLAGS="@EXTRA_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @IBMDB2_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @DBASE_LIBS@ @PCRE_LIB@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so @@ -1376,6 +1376,34 @@ CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS else AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) + +AC_MSG_CHECKING(for IBM DB2 support) +AC_ARG_WITH(ibm-db2, +[ --with-solid[=DIR] Include IBM DB2 support. DIR is the DB2 base + install directory, defaults to /home/db2inst1/sqllib], +[ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + IBMDB2_INCDIR=/home/db2inst1/sqllib/include + IBMDB2_LIBDIR=/home/db2inst1/sqllib/lib + else + IBMDB2_INCDIR=$withval/include + IBMDB2_LIBDIR=$withval/lib + fi + IBMDB2_INCLUDE=-I$IBMDB2_INCDIR + UODBC_DEFAULT=yes + AC_ADD_LIBRARY_WITH_PATH(db2, $IBMDB2_LIBDIR) + AC_ADD_INCLUDE($IBMDB2_INCDIR) + + AC_DEFINE(HAVE_IBMDB2) + + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) Index: php3/functions/php3_unified_odbc.h diff -u php3/functions/php3_unified_odbc.h:1.51 php3/functions/php3_unified_odbc.h:1.52 --- php3/functions/php3_unified_odbc.h:1.51 Fri May 28 14:36:52 1999 +++ php3/functions/php3_unified_odbc.h Thu Jul 15 17:55:40 1999 @@ -29,14 +29,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_unified_odbc.h,v 1.51 1999/05/28 12:36:52 kara Exp $ */ +/* $Id: php3_unified_odbc.h,v 1.52 1999/07/15 15:55:40 rasmus Exp $ */ #ifndef _UNIFIED_ODBC_H #define _UNIFIED_ODBC_H /* * Support for IBM DB/2 UDB on Windows NT, OS/2 and AIX - * define HAVE_DB2 in config.h or config.w32.h + * define HAVE_IBMDB2 in config.h or config.w32.h * add sqllib/include to the include path (IBM files) * link with db2cli.lib */ @@ -213,7 +213,7 @@ # define codbc_module_ptr &UODBC_MODULE_ENTRY # endif -#elif HAVE_DB2 +#elif HAVE_IBMDB2 # define HAVE_SQL_EXTENDED_FETCH 1 # include <sqlcli1.h> # ifdef DB268K @@ -444,7 +444,7 @@ int UODBC_ADD_CONN(HashTable *list, HDBC conn); UODBC_CONNECTION *UODBC_GET_CONN(HashTable *list, int count); void UODBC_DEL_CONN(HashTable *list, int ind); -#if HAVE_DB2 +#if HAVE_IBMDB2 void UODBC_SQL_ERROR(SQLHANDLE conn, SQLHANDLE stmt, char *func); #else void UODBC_SQL_ERROR(HDBC conn, HSTMT stmt, char *func); @@ -457,7 +457,7 @@ #else # define uodbc_module_ptr NULL -#endif /* HAVE_UODBC || HAVE_DB2 */ +#endif /* HAVE_UODBC || HAVE_IBMDB2 */ #endif /* _UNIFIED_ODBC_H */ Index: php3/functions/unified_odbc.c diff -u php3/functions/unified_odbc.c:1.107 php3/functions/unified_odbc.c:1.108 --- php3/functions/unified_odbc.c:1.107 Fri Jun 11 13:23:46 1999 +++ php3/functions/unified_odbc.c Thu Jul 15 17:55:40 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unified_odbc.c,v 1.107 1999/06/11 11:23:46 swilliam Exp $ */ +/* $Id: unified_odbc.c,v 1.108 1999/07/15 15:55:40 rasmus Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. @@ -190,7 +190,7 @@ (UWORD)SQL_COMMIT); #endif SQLFreeStmt(res->stmt,SQL_DROP); -#if !HAVE_DB2 +#if !HAVE_IBMDB2 res->stmt = NULL; #endif } @@ -206,7 +206,7 @@ UODBC_CONNECTION *conn = ((UODBC_RESULT *) le->ptr)->conn_ptr; if (!conn->open && ((UODBC_RESULT *) le->ptr)->stmt){ SQLFreeStmt(((UODBC_RESULT *) le->ptr)->stmt,SQL_DROP); -#if !HAVE_DB2 +#if !HAVE_IBMDB2 ((UODBC_RESULT *) le->ptr)->stmt = NULL; #endif } @@ -403,7 +403,7 @@ php3_printf("Unified ODBC Support active (compiled with iODBC)"); #elif HAVE_VELOCIS php3_printf("Unified ODBC Support active (compiled with Velocis)"); -#elif HAVE_DB2 +#elif HAVE_IBMDB2 php3_printf("Unified ODBC Support active (compiled with IBM DB2)"); #elif WIN32|WINNT php3_printf("Unified ODBC Support active (compiled with win32 ODBC)"); @@ -512,7 +512,7 @@ return NULL; } -#if HAVE_DB2 +#if HAVE_IBMDB2 void UODBC_SQL_ERROR(SQLHANDLE conn, SQLHANDLE stmt, char *func) #else void UODBC_SQL_ERROR(HDBC conn, HSTMT stmt, char *func)