[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 config.m4 /ext/pdo_oci config.m4

[Antony Dovgal]

tony2001                Tue Aug 14 12:15:04 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/oci8   config.m4 
    /php-src/ext/pdo_oci        config.m4 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.10&r2=1.55.2.3.2.11&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.10 
php-src/ext/oci8/config.m4:1.55.2.3.2.11
--- php-src/ext/oci8/config.m4:1.55.2.3.2.10    Fri Aug 10 07:02:33 2007
+++ php-src/ext/oci8/config.m4  Tue Aug 14 12:15:04 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55.2.3.2.10 2007/08/10 07:02:33 sixd Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.11 2007/08/14 12:15:04 tony2001 Exp $
 dnl
 
 if test -z "$SED"; then
@@ -36,11 +36,11 @@
   fi
 
   AC_MSG_CHECKING([OCI8 libraries dir])
-  if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then
+  if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=lib
-  elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
+  elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=lib32
-  elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then
+  elif test -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
   else
     AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.14.2.5.2.3&r2=1.14.2.5.2.4&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.3 
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.3  Fri Aug 10 07:01:47 2007
+++ php-src/ext/pdo_oci/config.m4       Tue Aug 14 12:15:04 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.5.2.3 2007/08/10 07:01:47 sixd Exp $
+dnl $Id: config.m4,v 1.14.2.5.2.4 2007/08/14 12:15:04 tony2001 Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -41,11 +41,11 @@
   fi
 
   AC_MSG_CHECKING([OCI8 libraries dir])
-  if test -d "$PDO_OCI_DIR/lib" -a ! -d "$PDO_OCI_DIR/lib32"; then
+  if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
-  elif ! test -d "$PDO_OCI_DIR/lib" -a -d "$PDO_OCI_DIR/lib32"; then
+  elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-  elif test -d "$PDO_OCI_DIR/lib" -a -d "$PDO_OCI_DIR/lib32"; then
+  elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR
   else
     AC_MSG_ERROR([Oracle (OCI8) required libraries not found])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php