Software / code / prosody
Changeset
9426:e290a60f1f09
configure: Replace use of '-o' with '||' [SC2166]
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2018 16:18:56 +0100 |
| parents | 9425:b741e9b9593b |
| children | 9427:460f08008521 |
| files | configure |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Oct 01 16:13:28 2018 +0100 +++ b/configure Mon Oct 01 16:18:56 2018 +0100 @@ -181,7 +181,7 @@ LUA_LIBDIR_SET=yes CFLAGS="$CFLAGS -ggdb" fi - if [ "$OSPRESET" = "freebsd" -o "$OSPRESET" = "openbsd" ]; then + if [ "$OSPRESET" = "freebsd" ] || [ "$OSPRESET" = "openbsd" ]; then LUA_INCDIR="/usr/local/include/lua51" LUA_INCDIR_SET=yes CFLAGS="-Wall -fPIC -I/usr/local/include" @@ -236,7 +236,7 @@ --lua-version|--with-lua-version) [ -n "$value" ] || die "Missing value in flag $key." LUA_VERSION="$value" - [ "$LUA_VERSION" = "5.1" -o "$LUA_VERSION" = "5.2" -o "$LUA_VERSION" = "5.3" ] || die "Invalid Lua version in flag $key." + [ "$LUA_VERSION" = "5.1" ] || [ "$LUA_VERSION" = "5.2" ] || [ "$LUA_VERSION" = "5.3" ] || die "Invalid Lua version in flag $key." LUA_VERSION_SET=yes ;; --with-lua) @@ -425,7 +425,7 @@ else interp="Lua"; fi - if [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ]; then + if [ "$LUA_DIR_SET" ] || [ "$LUA_BINDIR_SET" ]; then where="$LUA_BINDIR"; else where="\$PATH";
