From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 21 Jul 2019 23:27:22 +0000 (+0200)
Subject: Remove HAVE_OCILOBISTEMPORARY and HAVE_OCICOLLASSIGN
X-Git-Tag: php-7.4.0beta1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d827c89cf0aa14f51e57cbe4d4e1e90475899b6;p=php

Remove HAVE_OCILOBISTEMPORARY and HAVE_OCICOLLASSIGN

Symbols are not used in the current code.

Also remove not needed ocijdbc8 library addition and checks whcih were
removed also via b8e1d4d4e5af74a9d5a95d03adbe2b93e58301b7 so Oracle 8
is no longer supported.

Closes GH-4454
---

diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index ab8c7bfa66..1f5f436c32 100644
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -174,34 +174,6 @@ if test "$PHP_PDO_OCI" != "no"; then
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   ])
 
-  dnl
-  dnl Check if we need to add -locijdbc8
-  dnl
-  PHP_CHECK_LIBRARY(clntsh, OCILobIsTemporary,
-  [
-    AC_DEFINE(HAVE_OCILOBISTEMPORARY,1,[ ])
-  ], [
-    PHP_CHECK_LIBRARY(ocijdbc8, OCILobIsTemporary,
-    [
-      PHP_ADD_LIBRARY(ocijdbc8, 1, PDO_OCI_SHARED_LIBADD)
-      AC_DEFINE(HAVE_OCILOBISTEMPORARY,1,[ ])
-    ], [], [
-      -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-    ])
-  ], [
-    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-  ])
-
-  dnl
-  dnl Check if we have collections
-  dnl
-  PHP_CHECK_LIBRARY(clntsh, OCICollAssign,
-  [
-    AC_DEFINE(HAVE_OCICOLLASSIGN,1,[ ])
-  ], [], [
-    -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
-  ])
-
   dnl Scrollable cursors?
   PHP_CHECK_LIBRARY(clntsh, OCIStmtFetch2,
   [