From: Christopher Jones <sixd@php.net>
Date: Fri, 17 Aug 2007 13:30:36 +0000 (+0000)
Subject: PDO_OCI: fix Instant Client build broken by logic correction during previous Solaris... 
X-Git-Tag: php-5.2.4RC3~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=440ed3da7f192e23d3ac394a00c9a0d3b3c3d687;p=php

PDO_OCI: fix Instant Client build broken by logic correction during previous Solaris lib/lib32 fix
---

diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 772b2e9cd3..0326a1ff76 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -78,8 +78,6 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME.
     AC_MSG_RESULT([yes])
   fi
 
-  AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
-
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
     PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
     PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
@@ -110,6 +108,8 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME.
     fi
     PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
   else
+    AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
+
     if test -d "$PDO_OCI_DIR/rdbms/public"; then
       PHP_ADD_INCLUDE($PDO_OCI_DIR/rdbms/public)
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"