- adapterized.

[packages/php.git] / php-oracle9.patch

diff --git a/php-oracle9.patch b/php-oracle9.patch
index bf96d7b55a06c2bb5c03504dffb042f38e70d751..8c115fccd1f6d50cd8ed266db3c97ab81c366959 100644 (file)
--- a/php-oracle9.patch
+++ b/php-oracle9.patch
@@ -1,27 +1,3 @@
-diff -ur php-4.0.6/ext/oci8/config.m4 php-4.0.6.ora/ext/oci8/config.m4
---- php-4.0.6/ext/oci8/config.m4       Sat May 12 11:29:07 2001
-+++ php-4.0.6.ora/ext/oci8/config.m4   Mon Sep 17 16:15:22 2001
-@@ -5,6 +5,8 @@
-   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
-       OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
-       test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
-+  elif test -f $OCI8_DIR/lib/libclntsh.s?.9.0; then
-+      OCI8_VERSION=9.0
-   elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then
-       OCI8_VERSION=8.1
-   elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then
-@@ -72,6 +74,11 @@
-         ;;
- 
-       8.1)
-+        PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-+        PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
-+        AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
-+        ;;
-+      9.0)
-         PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
-         PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
-         AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
 diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4
 --- php-4.0.6/ext/oracle/config.m4     Sat May 12 11:29:07 2001
 +++ php-4.0.6.ora/ext/oracle/config.m4 Mon Sep 17 16:16:43 2001
@@ -29,11 +5,11 @@ diff -ur php-4.0.6/ext/oracle/config.m4 php-4.0.6.ora/ext/oracle/config.m4
    if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
        ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
        test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-+  elif test -f $ORACLE_DIR/lib/libclntsh.s?.9.0; then
++  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
 +    ORACLE_VERSION=9.0
-   elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then
+   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
      ORACLE_VERSION=8.1
-   elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then
+   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
 @@ -148,6 +150,10 @@
          ;;