Index: ext/xmlrpc/config.m4
===================================================================
RCS file: /repository/php-src/ext/xmlrpc/config.m4,v
retrieving revision 1.25.2.2
diff -u -p -d -r1.25.2.2 config.m4
--- ext/xmlrpc/config.m4	12 Sep 2005 17:14:35 -0000	1.25.2.2
+++ ext/xmlrpc/config.m4	24 Oct 2005 20:53:47 -0000
@@ -47,7 +47,7 @@ if test "$PHP_XMLRPC" != "no"; then
   else
     testval=no
     for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
-      if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/$PHP_LIBDIR/libexpat.a || -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
         AC_DEFINE(HAVE_LIBEXPAT,1,[ ])
         PHP_ADD_LIBRARY_WITH_PATH(expat, $i/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
         PHP_ADD_INCLUDE($i/include)
Index: sapi/roxen/config.m4
===================================================================
RCS file: /repository/php-src/sapi/roxen/config.m4,v
retrieving revision 1.17
diff -u -p -d -r1.17 config.m4
--- sapi/roxen/config.m4	29 May 2005 23:16:46 -0000	1.17
+++ sapi/roxen/config.m4	24 Oct 2005 20:53:47 -0000
@@ -21,7 +21,7 @@ AC_ARG_WITH(roxen, 
     if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then
 		PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
 	    PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`
-		if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
+		if test -z "$PIKE_INCLUDE_DIR" || -z "$PIKE_MODULE_DIR"; then
 			AC_MSG_ERROR(Failed to figure out Pike module and include directories)
 		fi
 	else
Index: sapi/caudium/config.m4
===================================================================
RCS file: /repository/php-src/sapi/caudium/config.m4,v
retrieving revision 1.14
diff -u -p -d -r1.14 config.m4
--- sapi/caudium/config.m4	29 May 2005 23:16:46 -0000	1.14
+++ sapi/caudium/config.m4	24 Oct 2005 20:53:48 -0000
@@ -26,7 +26,7 @@ AC_ARG_WITH(caudium, 
     if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
 		PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
 	    PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `
-		if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
+		if test -z "$PIKE_INCLUDE_DIR" || -z "$PIKE_MODULE_DIR"; then
 			AC_MSG_ERROR(Failed to figure out Pike module and include directories)
 		fi
 		AC_MSG_RESULT(yes)
Index: ext/standard/config.m4
===================================================================
RCS file: /repository/php-src/ext/standard/config.m4,v
retrieving revision 1.80
diff -u -p -d -r1.80 config.m4
--- ext/standard/config.m4	19 Jun 2005 22:15:25 -0000	1.80
+++ ext/standard/config.m4	24 Oct 2005 20:53:48 -0000
@@ -304,7 +304,7 @@ dnl AC_CHECK_FUNCS(getopt_long getopt_lo
 
 AC_CHECK_FUNCS(glob strfmon nice)
 
-if test "$PHP_SAPI" = "cgi" -o "$PHP_SAPI" = "cli" -o "$PHP_SAPI" = "embed"; then
+if test "$PHP_SAPI" = "cgi" || "$PHP_SAPI" = "cli" || "$PHP_SAPI" = "embed"; then
   AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 fi
 
Index: ext/snmp/config.m4
===================================================================
RCS file: /repository/php-src/ext/snmp/config.m4,v
retrieving revision 1.32
diff -u -p -d -r1.32 config.m4
--- ext/snmp/config.m4	29 May 2005 23:16:44 -0000	1.32
+++ ext/snmp/config.m4	24 Oct 2005 20:53:48 -0000
@@ -46,7 +46,7 @@ if test "$PHP_SNMP" != "no"; then
         test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
       done
       for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
-        test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
+        test -f $i/lib/libsnmp.a || -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
       done
     else
       SNMP_INCDIR=$PHP_SNMP/include
Index: ext/pdo_sqlite/config.m4
===================================================================
RCS file: /repository/php-src/ext/pdo_sqlite/config.m4,v
retrieving revision 1.26.2.5
diff -u -p -d -r1.26.2.5 config.m4
--- ext/pdo_sqlite/config.m4	25 Sep 2005 02:28:42 -0000	1.26.2.5
+++ ext/pdo_sqlite/config.m4	24 Oct 2005 20:53:48 -0000
@@ -94,7 +94,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
 
       touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 
-      if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
+      if test "$ext_shared" = "no" || "$ext_srcdir" != "$abs_srcdir"; then
         echo '#include <php_config.h>' > $ext_srcdir/sqlite/src/config.h
       else
         echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/sqlite/src/config.h
Index: ext/pdo_oci/config.m4
===================================================================
RCS file: /repository/php-src/ext/pdo_oci/config.m4,v
retrieving revision 1.14.2.1
diff -u -p -d -r1.14.2.1 config.m4
--- ext/pdo_oci/config.m4	24 Sep 2005 23:23:24 -0000	1.14.2.1
+++ ext/pdo_oci/config.m4	24 Oct 2005 20:53:48 -0000
@@ -35,7 +35,7 @@ PHP_ARG_WITH(pdo-oci, Oracle OCI support
 
 if test "$PHP_PDO_OCI" != "no"; then
   AC_MSG_CHECKING([Oracle Install-Dir])
-  if test "$PHP_PDO_OCI" = "yes" -o -z "$PHP_PDO_OCI"; then
+  if test "$PHP_PDO_OCI" = "yes" || -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
Index: ext/pcre/config.m4
===================================================================
RCS file: /repository/php-src/ext/pcre/config.m4,v
retrieving revision 1.36
diff -u -p -d -r1.36 config.m4
--- ext/pcre/config.m4	8 Aug 2005 23:58:57 -0000	1.36
+++ ext/pcre/config.m4	24 Oct 2005 20:53:48 -0000
@@ -26,7 +26,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 || -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
     done
     
     if test -z "$PCRE_LIBDIR" ; then
Index: ext/ming/config.m4
===================================================================
RCS file: /repository/php-src/ext/ming/config.m4,v
retrieving revision 1.22.2.2
diff -u -p -d -r1.22.2.2 config.m4
--- ext/ming/config.m4	26 Aug 2005 15:35:39 -0000	1.22.2.2
+++ ext/ming/config.m4	24 Oct 2005 20:53:48 -0000
@@ -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 || -f $i/$PHP_LIBDIR/libming.a; then
       MING_DIR=$i
       break
     fi
Index: ext/gd/config.m4
===================================================================
RCS file: /repository/php-src/ext/gd/config.m4,v
retrieving revision 1.154
diff -u -p -d -r1.154 config.m4
--- ext/gd/config.m4	29 May 2005 23:16:41 -0000	1.154
+++ ext/gd/config.m4	24 Oct 2005 20:53:48 -0000
@@ -51,7 +51,7 @@ AC_DEFUN([PHP_GD_JPEG],[
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
-      test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
+      test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
     done
 
     if test -z "$GD_JPEG_DIR"; then
@@ -76,7 +76,7 @@ AC_DEFUN([PHP_GD_PNG],[
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
-      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
     done
 
     if test -z "$GD_PNG_DIR"; then
@@ -111,7 +111,7 @@ AC_DEFUN([PHP_GD_XPM],[
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
-      test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+      test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
     done
 
     if test -z "$GD_XPM_DIR"; then
@@ -143,7 +143,7 @@ AC_DEFUN([PHP_GD_XPM],[
 
 AC_DEFUN([PHP_GD_FREETYPE1],[
   if test "$PHP_TTF" != "no"; then
-    if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
+    if test "$PHP_FREETYPE_DIR" = "no" || "$PHP_FREETYPE_DIR" = ""; then
       if test -n "$PHP_TTF"; then
         for i in $PHP_TTF /usr/local /usr; do
           if test -f "$i/include/freetype.h"; then
@@ -367,7 +367,7 @@ dnl Header path
 
 dnl Library path
   for i in $PHP_LIBDIR/gd1.3 $PHP_LIBDIR/gd $PHP_LIBDIR gd1.3 gd ""; do
-    test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
+    test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" || -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
   done
 
   if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then