tony2001 Tue Nov 29 13:35:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/ming config.m4
/php-src/ext/pcre config0.m4
/php-src/ext/zlib config0.m4
Log:
remaining part of the fix (-o -> ||)
http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22.2.4&r2=1.22.2.5&ty=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22.2.4 php-src/ext/ming/config.m4:1.22.2.5
--- php-src/ext/ming/config.m4:1.22.2.4 Sun Nov 27 18:22:42 2005
+++ php-src/ext/ming/config.m4 Tue Nov 29 13:35:24 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.22.2.4 2005/11/27 23:22:42 sniper Exp $
+dnl $Id: config.m4,v 1.22.2.5 2005/11/29 18:35:24 tony2001 Exp $
dnl
PHP_ARG_WITH(ming, for MING support,
@@ -9,7 +9,7 @@
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
http://cvs.php.net/diff.php/php-src/ext/pcre/config0.m4?r1=1.36.2.1&r2=1.36.2.2&ty=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.36.2.1
php-src/ext/pcre/config0.m4:1.36.2.2
--- php-src/ext/pcre/config0.m4:1.36.2.1 Wed Nov 16 17:14:32 2005
+++ php-src/ext/pcre/config0.m4 Tue Nov 29 13:35:26 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.36.2.1 2005/11/16 22:14:32 sniper Exp $
+dnl $Id: config0.m4,v 1.36.2.2 2005/11/29 18:35:26 tony2001 Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -27,7 +27,7 @@
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
http://cvs.php.net/diff.php/php-src/ext/zlib/config0.m4?r1=1.17&r2=1.17.2.1&ty=u
Index: php-src/ext/zlib/config0.m4
diff -u php-src/ext/zlib/config0.m4:1.17 php-src/ext/zlib/config0.m4:1.17.2.1
--- php-src/ext/zlib/config0.m4:1.17 Sun May 29 19:16:45 2005
+++ php-src/ext/zlib/config0.m4 Tue Nov 29 13:35:26 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.17 2005/05/29 23:16:45 sniper Exp $
+dnl $Id: config0.m4,v 1.17.2.1 2005/11/29 18:35:26 tony2001 Exp $
dnl
PHP_ARG_WITH(zlib,for ZLIB support,
@@ -8,7 +8,7 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
