remaining part of the fix (-o -> ||)

diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index e9c9b465ff9709da4848eccbc78ad65bbd23e2cb..94186491f04f4b843cb89fa83c892b3d1c106610 100644 (file)
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -9,7 +9,7 @@ if test "$PHP_MING" != "no"; then
   AC_CHECK_LIB(m, sin)
 
   for i in $PHP_MING /usr/local /usr; do
-    if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libming.a; then
+    if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libming.a; then
       MING_DIR=$i
       break
     fi

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)