From 28dfe0dfd965f1000bdb1b7f939c9177961c7c02 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 29 Nov 2005 18:35:26 +0000 Subject: [PATCH] remaining part of the fix (-o -> ||) --- ext/ming/config.m4 | 2 +- ext/zlib/config0.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/ming/config.m4 b/ext/ming/config.m4 index e9c9b465ff..94186491f0 100644 --- 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 e083a2285c..62e05fbd02 100644 --- 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= 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) -- 2.40.0