]>
Commit | Line | Data |
---|---|---|
02c06e30 JR |
1 | diff -ur php-4.0.6/ext/oci8/config.m4 php-4.0.6.ora/ext/oci8/config.m4 |
2 | --- php-4.0.6/ext/oci8/config.m4 Sat May 12 11:29:07 2001 | |
3 | +++ php-4.0.6.ora/ext/oci8/config.m4 Mon Sep 17 16:15:22 2001 | |
4 | @@ -5,6 +5,8 @@ | |
5 | if test -s "$OCI8_DIR/orainst/unix.rgs"; then | |
6 | OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` | |
7 | test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 | |
8 | + elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then | |
9 | + OCI8_VERSION=9.0 | |
10 | elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then | |
11 | OCI8_VERSION=8.1 | |
12 | elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then | |
13 | @@ -72,6 +74,11 @@ | |
14 | ;; | |
15 | ||
16 | 8.1) | |
17 | + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) | |
18 | + PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) | |
19 | + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) | |
20 | + ;; | |
21 | + 9.0) | |
22 | PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) | |
23 | PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) | |
24 | AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) | |
25 | diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4 | |
26 | --- php-4.0.6/ext/oracle/config.m4 Sat May 12 11:29:07 2001 | |
27 | +++ php-4.0.6.ora/ext/oracle/config.m4 Mon Sep 17 16:16:43 2001 | |
28 | @@ -5,6 +5,8 @@ | |
29 | if test -s "$ORACLE_DIR/orainst/unix.rgs"; then | |
30 | ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` | |
31 | test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 | |
32 | + elif test -f $ORACLE_DIR/lib/libclntsh.s?.9.0; then | |
33 | + ORACLE_VERSION=9.0 | |
34 | elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then | |
35 | ORACLE_VERSION=8.1 | |
36 | elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then | |
37 | @@ -148,6 +150,10 @@ | |
38 | ;; | |
39 | ||
40 | 8.1) | |
41 | + PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) | |
42 | + PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) | |
43 | + ;; | |
44 | + 9.0) | |
45 | PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) | |
46 | PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) | |
47 | ;; |