tony2001 Thu Dec 22 11:02:52 2005 EDT
Modified files:
/php-src/ext/ldap config.m4
/php-src/ext/snmp config.m4
/php-src/ext/standard config.m4
/php-src/ext/xmlrpc config.m4
/php-src/sapi/caudium config.m4
/php-src/sapi/roxen config.m4
Log:
change -o to || to be more portable
http://cvs.php.net/viewcvs.cgi/php-src/ext/ldap/config.m4?r1=1.42&r2=1.43&diff_format=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.42 php-src/ext/ldap/config.m4:1.43
--- php-src/ext/ldap/config.m4:1.42 Thu Nov 3 20:41:05 2005
+++ php-src/ext/ldap/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.42 2005/11/03 20:41:05 sniper Exp $
+dnl $Id: config.m4,v 1.43 2005/12/22 11:02:51 tony2001 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 -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 -o -f
$LDAP_LIBDIR/libldap.3.dylib; then
+ elif 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
http://cvs.php.net/viewcvs.cgi/php-src/ext/snmp/config.m4?r1=1.33&r2=1.34&diff_format=u
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.33 php-src/ext/snmp/config.m4:1.34
--- php-src/ext/snmp/config.m4:1.33 Thu Nov 10 08:00:43 2005
+++ php-src/ext/snmp/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.33 2005/11/10 08:00:43 sniper Exp $
+dnl $Id: config.m4,v 1.34 2005/12/22 11:02:51 tony2001 Exp $
dnl
PHP_ARG_WITH(snmp,for SNMP support,
@@ -46,7 +46,7 @@
test -f $i/snmp/include/ucd-snmp/snmp.h &&
SNMP_INCDIR=$i/snmp/include/ucd-snmp
done
for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
- test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME &&
SNMP_LIBDIR=$i/lib
+ test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME
&& SNMP_LIBDIR=$i/lib
done
else
SNMP_INCDIR=$PHP_SNMP/include
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/config.m4?r1=1.81&r2=1.82&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.81 php-src/ext/standard/config.m4:1.82
--- php-src/ext/standard/config.m4:1.81 Mon Nov 21 23:07:35 2005
+++ php-src/ext/standard/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.81 2005/11/21 23:07:35 sniper Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.82 2005/12/22 11:02:51 tony2001 Exp $ -*- autoconf -*-
divert(3)dnl
@@ -304,7 +304,7 @@
AC_CHECK_FUNCS(glob strfmon nice)
-if test "$PHP_SAPI" = "cgi" -o "$PHP_SAPI" = "cli" -o "$PHP_SAPI" = "embed";
then
+if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" =
"embed"; then
AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
fi
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlrpc/config.m4?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/xmlrpc/config.m4
diff -u php-src/ext/xmlrpc/config.m4:1.27 php-src/ext/xmlrpc/config.m4:1.28
--- php-src/ext/xmlrpc/config.m4:1.27 Mon Sep 12 17:14:20 2005
+++ php-src/ext/xmlrpc/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2005/09/12 17:14:20 sniper Exp $
+dnl $Id: config.m4,v 1.28 2005/12/22 11:02:51 tony2001 Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -47,7 +47,7 @@
else
testval=no
for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
- if test -f $i/$PHP_LIBDIR/libexpat.a -o -f
$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
+ if test -f $i/$PHP_LIBDIR/libexpat.a || test -f
$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
AC_DEFINE(HAVE_LIBEXPAT,1,[ ])
PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
PHP_ADD_INCLUDE($i/include)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/caudium/config.m4?r1=1.14&r2=1.15&diff_format=u
Index: php-src/sapi/caudium/config.m4
diff -u php-src/sapi/caudium/config.m4:1.14 php-src/sapi/caudium/config.m4:1.15
--- php-src/sapi/caudium/config.m4:1.14 Sun May 29 23:16:46 2005
+++ php-src/sapi/caudium/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.15 2005/12/22 11:02:51 tony2001 Exp $
dnl
RESULT=no
@@ -26,7 +26,7 @@
if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v,
rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed
-e 's/.*: //'`
PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e
's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `
- if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
+ if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR";
then
AC_MSG_ERROR(Failed to figure out Pike module and
include directories)
fi
AC_MSG_RESULT(yes)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/roxen/config.m4?r1=1.17&r2=1.18&diff_format=u
Index: php-src/sapi/roxen/config.m4
diff -u php-src/sapi/roxen/config.m4:1.17 php-src/sapi/roxen/config.m4:1.18
--- php-src/sapi/roxen/config.m4:1.17 Sun May 29 23:16:46 2005
+++ php-src/sapi/roxen/config.m4 Thu Dec 22 11:02:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.18 2005/12/22 11:02:51 tony2001 Exp $
dnl
RESULT=no
@@ -21,7 +21,7 @@
if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v <
0.7079) exit(1); exit(0);'; then
PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed
-e 's/.*: //'`
PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e
's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`
- if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
+ if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR";
then
AC_MSG_ERROR(Failed to figure out Pike module and
include directories)
fi
else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
