change -o to || to be more portable

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index f70799a5019f969435f68d8533b1326e34dd2c8b..d85d41c79c999c1ee4a54c5ab2a6dddfb4049b9b 100644 (file)
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -99,7 +99,7 @@ if test "$PHP_LDAP" != "no"; then
     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

diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index 0797fa60c8b40343b85e4af06219c09220500edd..1fc718024f54234b1ac4376c1b2ab18ed39fb02a 100644 (file)
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -46,7 +46,7 @@ if test "$PHP_SNMP" != "no"; then
         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

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 621a84785f362690652ffc27c112f2babb70d9e0..86ceb9d5be36f3a31eafed24e9b42f2e454f304f 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -304,7 +304,7 @@ dnl AC_CHECK_FUNCS(getopt_long getopt_long_only)
 
 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
 

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 34bfa919bdf15b4cc62bd685645239c5cb7ce476..7f7277d4df99506ffc205e82c17a817ffc822b0c 100644 (file)
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -47,7 +47,7 @@ if test "$PHP_XMLRPC" != "no"; then
   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)

diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index 60d607cff15d0ebc8a9b14574731c59eee27aa0c..88cdcd32c63dec0f148c9f50b0caa261434c8686 100644 (file)
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -26,7 +26,7 @@ AC_ARG_WITH(caudium,
     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)

diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index daf4f59a24f81ed7b9fe6c59c8fa0657deb5db1b..7f74707af25454c987c860e8c5c7b0e5b4e6e9b6 100644 (file)
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -21,7 +21,7 @@ AC_ARG_WITH(roxen,
     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