tony2001 Tue Nov 29 13:26:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/dba config.m4
/php-src/ext/gd config.m4
/php-src/ext/snmp config.m4
/php-src/ext/standard config.m4
/php-src/ext/xmlrpc config.m4
/php-src/sapi/caudium config.m4
/php-src/sapi/roxen config.m4
Log:
change "-o" to "||" (fixes potential problems on weird systems where test
doesn't support -o)
http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.70.2.1&r2=1.70.2.2&ty=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.70.2.1 php-src/ext/dba/config.m4:1.70.2.2
--- php-src/ext/dba/config.m4:1.70.2.1 Mon Aug 22 15:59:28 2005
+++ php-src/ext/dba/config.m4 Tue Nov 29 13:25:58 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.70.2.1 2005/08/22 19:59:28 iliaa Exp $
+dnl $Id: config.m4,v 1.70.2.2 2005/11/29 18:25:58 tony2001 Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -55,7 +55,7 @@
if test -n "$3"; then
AC_MSG_ERROR($3)
fi
- if test "$THIS_RESULT" = "yes" -o "$THIS_RESULT" = "builtin"; then
+ if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
HAVE_DBA=1
eval HAVE_$THIS_NAME=1
AC_MSG_RESULT($THIS_RESULT)
@@ -171,7 +171,7 @@
dnl parameters(version, library list, function)
AC_DEFUN([PHP_DBA_DB_CHECK],[
for LIB in $2; do
- if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a -o -f
$THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
+ if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f
$THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
AC_TRY_LINK([
#include "$THIS_INCLUDE"
@@ -306,7 +306,7 @@
[ --with-db2[=DIR] DBA: Include Berkeley DB2 support],[
if test "$withval" != "no"; then
PHP_DBA_STD_BEGIN
- if test "$HAVE_DB3" = "1" -o "$HAVE_DB4" = "1"; then
+ if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then
AC_DBA_STD_RESULT(db2,Berkeley DB2,You cannot combine --with-db2 with
--with-db3 or --with-db4)
fi
for i in $withval $withval/BerkeleyDB /usr/BerkeleyDB /usr/local /usr; do
@@ -354,7 +354,7 @@
THIS_LIBS=$DB2_LIBS
THIS_PREFIX=$DB2_PREFIX
fi
- if test "$HAVE_DB4" = "1" -o "$HAVE_DB3" = "1" -o "$HAVE_DB2" = "1"; then
+ if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" =
"1"; then
AC_DEFINE_UNQUOTED(DB1_VERSION, "Berkeley DB 1.85 emulation in
DB$THIS_VERSION", [ ])
for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h
include/db/db_185.h; do
if test -f "$THIS_PREFIX/$i"; then
@@ -463,7 +463,7 @@
AC_ARG_WITH(cdb,
[ --with-cdb[=DIR] DBA: Include CDB support],[
- if test "$withval" = "yes" -o "$HAVE_DBA" = "1"; then
+ if test "$withval" = "yes" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_CDB
elif test "$withval" != "no"; then
PHP_DBA_STD_BEGIN
@@ -493,7 +493,7 @@
PHP_DBA_STD_ATTACH
fi
],[
- if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_CDB
fi
])
@@ -511,7 +511,7 @@
PHP_DBA_BUILTIN_INI
fi
],[
- if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_INI
fi
])
@@ -532,7 +532,7 @@
PHP_DBA_BUILTIN_FLATFILE
fi
],[
- if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
+ if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
PHP_DBA_BUILTIN_FLATFILE
fi
])
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.154&r2=1.154.2.1&ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154 php-src/ext/gd/config.m4:1.154.2.1
--- php-src/ext/gd/config.m4:1.154 Sun May 29 19:16:41 2005
+++ php-src/ext/gd/config.m4 Tue Nov 29 13:25:59 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154 2005/05/29 23:16:41 sniper Exp $
+dnl $Id: config.m4,v 1.154.2.1 2005/11/29 18:25:59 tony2001 Exp $
dnl
dnl
@@ -51,7 +51,7 @@
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 || test -f
$i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
done
if test -z "$GD_JPEG_DIR"; then
@@ -76,7 +76,7 @@
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 || test -f
$i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
done
if test -z "$GD_PNG_DIR"; then
@@ -111,7 +111,7 @@
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 || test -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_FREETYPE1],[
if test "$PHP_TTF" != "no"; then
- if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
+ if test "$PHP_FREETYPE_DIR" = "no" || test "$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 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" || test -f
"$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
done
if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then
http://cvs.php.net/diff.php/php-src/ext/snmp/config.m4?r1=1.32&r2=1.32.2.1&ty=u
Index: php-src/ext/snmp/config.m4
diff -u php-src/ext/snmp/config.m4:1.32 php-src/ext/snmp/config.m4:1.32.2.1
--- php-src/ext/snmp/config.m4:1.32 Sun May 29 19:16:44 2005
+++ php-src/ext/snmp/config.m4 Tue Nov 29 13:26:00 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.32 2005/05/29 23:16:44 sniper Exp $
+dnl $Id: config.m4,v 1.32.2.1 2005/11/29 18:26:00 tony2001 Exp $
dnl
PHP_ARG_WITH(snmp,for SNMP support,
@@ -46,7 +46,7 @@
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 || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME
&& SNMP_LIBDIR=$i/lib
done
else
SNMP_INCDIR=$PHP_SNMP/include
http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.80.2.1&r2=1.80.2.2&ty=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80.2.1
php-src/ext/standard/config.m4:1.80.2.2
--- php-src/ext/standard/config.m4:1.80.2.1 Mon Nov 21 18:08:02 2005
+++ php-src/ext/standard/config.m4 Tue Nov 29 13:26:01 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.80.2.1 2005/11/21 23:08:02 sniper Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.80.2.2 2005/11/29 18:26:01 tony2001 Exp $ -*- autoconf
-*-
divert(3)dnl
@@ -304,7 +304,7 @@
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" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" =
"embed"; then
AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
fi
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/config.m4?r1=1.25.2.2&r2=1.25.2.3&ty=u
Index: php-src/ext/xmlrpc/config.m4
diff -u php-src/ext/xmlrpc/config.m4:1.25.2.2
php-src/ext/xmlrpc/config.m4:1.25.2.3
--- php-src/ext/xmlrpc/config.m4:1.25.2.2 Mon Sep 12 13:14:35 2005
+++ php-src/ext/xmlrpc/config.m4 Tue Nov 29 13:26:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.2 2005/09/12 17:14:35 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.3 2005/11/29 18:26:02 tony2001 Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -47,7 +47,7 @@
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 || test -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)
http://cvs.php.net/diff.php/php-src/sapi/caudium/config.m4?r1=1.14&r2=1.14.2.1&ty=u
Index: php-src/sapi/caudium/config.m4
diff -u php-src/sapi/caudium/config.m4:1.14
php-src/sapi/caudium/config.m4:1.14.2.1
--- php-src/sapi/caudium/config.m4:1.14 Sun May 29 19:16:46 2005
+++ php-src/sapi/caudium/config.m4 Tue Nov 29 13:26:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.14.2.1 2005/11/29 18:26:02 tony2001 Exp $
dnl
RESULT=no
@@ -26,7 +26,7 @@
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" || test -z "$PIKE_MODULE_DIR";
then
AC_MSG_ERROR(Failed to figure out Pike module and
include directories)
fi
AC_MSG_RESULT(yes)
http://cvs.php.net/diff.php/php-src/sapi/roxen/config.m4?r1=1.17&r2=1.17.2.1&ty=u
Index: php-src/sapi/roxen/config.m4
diff -u php-src/sapi/roxen/config.m4:1.17 php-src/sapi/roxen/config.m4:1.17.2.1
--- php-src/sapi/roxen/config.m4:1.17 Sun May 29 19:16:46 2005
+++ php-src/sapi/roxen/config.m4 Tue Nov 29 13:26:02 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.17.2.1 2005/11/29 18:26:02 tony2001 Exp $
dnl
RESULT=no
@@ -21,7 +21,7 @@
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" || test -z "$PIKE_MODULE_DIR";
then
AC_MSG_ERROR(Failed to figure out Pike module and
include directories)
fi
else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
