sniper Mon Nov 21 14:06:04 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/odbc config.m4
/php-src/ext/ldap config.m4
Log:
test -e does not work with solaris
http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.78&r2=1.78.2.1&ty=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.78 php-src/ext/odbc/config.m4:1.78.2.1
--- php-src/ext/odbc/config.m4:1.78 Wed Jun 22 04:26:00 2005
+++ php-src/ext/odbc/config.m4 Mon Nov 21 14:06:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.78 2005/06/22 08:26:00 sniper Exp $
+dnl $Id: config.m4,v 1.78.2.1 2005/11/21 19:06:02 sniper Exp $
dnl
AC_DEFUN([PHP_ODBC_CHECK_HEADER],[
@@ -375,9 +375,9 @@
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi
-lutil"
- if test -e "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
+ if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32
-lCrdm32 -lCrpc32 -lutil"
- elif test -e "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
+ elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc
-lutil"
fi
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.5&r2=1.39.2.6&ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39.2.5 php-src/ext/ldap/config.m4:1.39.2.6
--- php-src/ext/ldap/config.m4:1.39.2.5 Thu Nov 3 15:41:13 2005
+++ php-src/ext/ldap/config.m4 Mon Nov 21 14:06:04 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.39.2.5 2005/11/03 20:41:13 sniper Exp $
+dnl $Id: config.m4,v 1.39.2.6 2005/11/21 19:06:04 sniper Exp $
dnl
AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -99,7 +99,7 @@
PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
- elif test -e $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f
$LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f
$LDAP_LIBDIR/libldap.3.dylib; then
+ elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f
$LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f
$LDAP_LIBDIR/libldap.3.dylib; then
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
elif test -f $LDAP_LIBDIR/libssldap50.$SHLIB_SUFFIX_NAME; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
