diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-12-22 11:02:51 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-12-22 11:02:51 +0000 |
| commit | ddf87742ecd791c678203db368bc0d01d8a9ee9d (patch) | |
| tree | 9837ea91457b34e87434eac42a289336aafc7d7d /sapi | |
| parent | 69200c9baf9d4c675356fa81b668b334566c6803 (diff) | |
| download | php-git-ddf87742ecd791c678203db368bc0d01d8a9ee9d.tar.gz | |
change -o to || to be more portable
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/caudium/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/roxen/config.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4 index 60d607cff1..88cdcd32c6 100644 --- a/sapi/caudium/config.m4 +++ b/sapi/caudium/config.m4 @@ -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" || test -z "$PIKE_MODULE_DIR"; then AC_MSG_ERROR(Failed to figure out Pike module and include directories) fi AC_MSG_RESULT(yes) diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4 index daf4f59a24..7f74707af2 100644 --- a/sapi/roxen/config.m4 +++ b/sapi/roxen/config.m4 @@ -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" || test -z "$PIKE_MODULE_DIR"; then AC_MSG_ERROR(Failed to figure out Pike module and include directories) fi else |