diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dba/config.m4 | 16 | ||||
-rw-r--r-- | ext/gd/config.m4 | 10 | ||||
-rw-r--r-- | ext/snmp/config.m4 | 2 | ||||
-rw-r--r-- | ext/standard/config.m4 | 2 | ||||
-rw-r--r-- | ext/xmlrpc/config.m4 | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 77a4a93b12..6af3551811 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -55,7 +55,7 @@ AC_DEFUN([AC_DBA_STD_RESULT],[ 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 Berkeley specific (library and version test) 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 @@ AC_ARG_WITH(db2, [ --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 @@ AC_ARG_WITH(db1, 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_DEFUN([PHP_DBA_BUILTIN_CDB],[ 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 @@ AC_ARG_WITH(cdb, 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 @@ AC_ARG_WITH(inifile, 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 @@ AC_ARG_WITH(flatfile, 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 ]) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 28a75386d7..85955b8731 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -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 || test -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 || test -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 || 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_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" || 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 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" || test -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" done if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 5561c7dc70..5e7b0a468b 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -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 || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib done else SNMP_INCDIR=$PHP_SNMP/include diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 621a84785f..86ceb9d5be 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -304,7 +304,7 @@ dnl AC_CHECK_FUNCS(getopt_long getopt_long_only) 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 diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index 34bfa919bd..7f7277d4df 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -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 || 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) |