From 0c110a93d29248eda220ddccea5dabd6370a8ee8 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 29 Nov 2005 18:38:48 +0000 Subject: [PATCH] MF51: change "-o" to "||" to support weird systems with broken `test` --- ext/pcre/config0.m4 | 2 +- ext/zlib/config0.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 8293697f59..78ce14aa0c 100644 --- 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 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