cvs: php-src(PHP_5_2) /ext/pdo_oci config.m4

sixd Fri Aug 17 13:30:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo_oci config.m4 Log: PDO_OCI: fix Instant Client build broken by logic correction during previous Solaris lib/lib32 fix http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.14.2.5.2.4&r2=1.14.2.5.2.5&diff_format=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.14.2.5.2.4 php-src/ext/pdo_oci/config.m4:1.14.2.5.2.5 --- php-src/ext/pdo_oci/config.m4:1.14.2.5.2.4 Tue Aug 14 12:15:04 2007 +++ php-src/ext/pdo_oci/config.m4 Fri Aug 17 13:30:36 2007 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14.2.5.2.4 2007/08/14 12:15:04 tony2001 Exp $ +dnl $Id: config.m4,v 1.14.2.5.2.5 2007/08/17 13:30:36 sixd Exp $ if test "$PHP_PDO" != "no"; then @@ -78,8 +78,6 @@ 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 @@ 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"