MF51: change "-o" to "||" to support weird systems with broken `test`

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 8293697f597d09b2aff158368155100f7cec309c..78ce14aa0cdbf1ce7cdb9ff84b5cb43be63cd765 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -27,7 +27,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
     fi
 
     for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
-      test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
+      test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
     done
     
     if test -z "$PCRE_LIBDIR" ; then

diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index e083a2285c77c6697f692f3f2d67017351865db6..62e05fbd02da8cce7fa1e8fb9541afb83886e296 100644 (file)
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -8,7 +8,7 @@ PHP_ARG_WITH(zlib,for ZLIB support,
 PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
 [  --with-zlib-dir=<DIR>   Define the location of zlib install directory], no, no)
 
-if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
+if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared)
   PHP_SUBST(ZLIB_SHARED_LIBADD)