mirror of
https://github.com/php/php-src.git
synced 2025-01-26 21:54:16 +08:00
MF51: change "-o" to "||" to support weird systems with broken test
This commit is contained in:
parent
1ceacc89f7
commit
0c110a93d2
@ -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
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user