CVS update: php3

Date: Wednesday September 9, 1998 @ 8:38 Author: ssb Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv11020 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c Log Message: more OCI8 work Index: php3/Makefile.in diff -c php3/Makefile.in:1.253 php3/Makefile.in:1.254 *** php3/Makefile.in:1.253 Sat Aug 15 09:56:12 1998 --- php3/Makefile.in Wed Sep 9 08:38:04 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.253 1998/08/15 13:56:12 rasmus Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.254 1998/09/09 12:38:04 ssb Exp $ # prefix = @prefix@ *************** *** 77,83 **** functions/link.c functions/mail.c functions/math.c \ functions/md5.c functions/microtime.c functions/mime.c \ functions/msql.c functions/mysql.c \ ! functions/oracle.c functions/pack.c \ functions/pageinfo.c functions/pgsql.c \ functions/post.c functions/rand.c functions/reg.c \ functions/solid.c functions/soundex.c \ --- 77,83 ---- functions/link.c functions/mail.c functions/math.c \ functions/md5.c functions/microtime.c functions/mime.c \ functions/msql.c functions/mysql.c \ ! functions/oracle.c functions/oci8.c functions/pack.c \ functions/pageinfo.c functions/pgsql.c \ functions/post.c functions/rand.c functions/reg.c \ functions/solid.c functions/soundex.c \ Index: php3/acconfig.h diff -c php3/acconfig.h:1.62 php3/acconfig.h:1.63 *** php3/acconfig.h:1.62 Thu Aug 27 06:50:58 1998 --- php3/acconfig.h Wed Sep 9 08:38:04 1998 *************** *** 82,87 **** --- 82,90 ---- /* Define if you have the Oracle database client libraries */ #define HAVE_ORACLE 0 + /* Define if you have the Oracle version 8 database client libraries */ + #define HAVE_OCI8 0 + /* Define if you want to use the iODBC database driver */ #define HAVE_IODBC 0 Index: php3/config.h.in diff -c php3/config.h.in:1.112 php3/config.h.in:1.113 *** php3/config.h.in:1.112 Thu Aug 27 06:50:58 1998 --- php3/config.h.in Wed Sep 9 08:38:05 1998 *************** *** 128,133 **** --- 128,136 ---- /* Define if you have the Oracle database client libraries */ #define HAVE_ORACLE 0 + /* Define if you have the Oracle version 8 database client libraries */ + #define HAVE_OCI8 0 + /* Define if you want to use the iODBC database driver */ #define HAVE_IODBC 0 Index: php3/configure.in diff -c php3/configure.in:1.240 php3/configure.in:1.241 *** php3/configure.in:1.240 Mon Aug 31 03:03:01 1998 --- php3/configure.in Wed Sep 9 08:38:05 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.240 1998/08/31 07:03:01 sr Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.241 1998/09/09 12:38:05 ssb Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 544,553 **** if test -d "$ORACLEINST_TOP/rdbms/demo" then # V7.[0123] ! ORACLE_INCDIR=rdbms/demo ! ORACLE_INCLUDE=-I$ORACLEINST_TOP/$ORACLE_INCDIR fi # Need to know the version, otherwhise we will mixup nlsrtl AC_ORACLE_VERSION($ORACLEINST_TOP) --- 544,564 ---- if test -d "$ORACLEINST_TOP/rdbms/demo" then # V7.[0123] ! ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo fi + if test -d "$ORACLEINST_TOP/network/public" + then + # V8 + ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public" + fi + + if test -d "$ORACLEINST_TOP/plsql/public" + then + # V8 + ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/plsql/public" + fi + # Need to know the version, otherwhise we will mixup nlsrtl AC_ORACLE_VERSION($ORACLEINST_TOP) *************** *** 609,629 **** fi ;; 7.2|7.3) ! if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? ! then ! ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" ! else ! ORACLE_SHLIBS="$ORACLE_STLIBS" ! fi ! ;; 8.0) ! if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? ! then ! ORACLE_SHLIBS="-lclntsh -lpsa -lcore4 -lnlsrtl3 -lclntsh $ORA_SYSLIB" ! else ! ORACLE_SHLIBS="$ORACLE_STLIBS" ! fi ! ;; *) ORACLE_SHLIBS= ;; --- 620,641 ---- fi ;; 7.2|7.3) ! if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? ! then ! ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" ! else ! ORACLE_SHLIBS="$ORACLE_STLIBS" ! fi ! ;; 8.0) ! if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? ! then ! ORACLE_SHLIBS="-lclntsh -lpsa -lcore4 -lnlsrtl3 -lclntsh $ORA_SYSLIB" ! else ! ORACLE_SHLIBS="$ORACLE_STLIBS" ! fi ! AC_DEFINE(HAVE_OCI8) ! ;; *) ORACLE_SHLIBS= ;; Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.324 php3/internal_functions.c:1.325 *** php3/internal_functions.c:1.324 Wed Aug 12 05:21:40 1998 --- php3/internal_functions.c Wed Sep 9 08:38:05 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.324 1998/08/12 09:21:40 steinm Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.325 1998/09/09 12:38:05 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 54,59 **** --- 54,60 ---- #include "functions/basic_functions.h" #include "functions/phpmath.h" #include "functions/php3_string.h" + #include "functions/php3_oci8.h" #include "functions/oracle.h" #include "functions/base64.h" #include "functions/php3_dir.h" *************** *** 131,136 **** --- 132,138 ---- {"Solid", solid_module_ptr}, {"Adabas", adabas_module_ptr}, {"Image", gd_module_ptr}, + {"OCI8", oci8_module_ptr}, {"Oracle", oracle_module_ptr}, {"Apache", apache_module_ptr}, {"Crypt", crypt_module_ptr}, -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net