tony2001 Tue Aug 14 12:14:53 2007 UTC
Modified files:
/php-src/ext/oci8 config.m4
/php-src/ext/pdo_oci config.m4
Log:
fix lib/lib32 checks to work with broken Solaris shell
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.69&r2=1.70&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.69 php-src/ext/oci8/config.m4:1.70
--- php-src/ext/oci8/config.m4:1.69 Fri Aug 10 06:58:12 2007
+++ php-src/ext/oci8/config.m4 Tue Aug 14 12:14:53 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69 2007/08/10 06:58:12 sixd Exp $
+dnl $Id: config.m4,v 1.70 2007/08/14 12:14:53 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.20&r2=1.21&diff_format=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.20 php-src/ext/pdo_oci/config.m4:1.21
--- php-src/ext/pdo_oci/config.m4:1.20 Fri Aug 10 06:57:41 2007
+++ php-src/ext/pdo_oci/config.m4 Tue Aug 14 12:14:53 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.20 2007/08/10 06:57:41 sixd Exp $
+dnl $Id: config.m4,v 1.21 2007/08/14 12:14:53 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
