diff options
author | Matthew Wild <mwild1@gmail.com> | 2018-10-01 16:18:56 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2018-10-01 16:18:56 +0100 |
commit | 1fce0454899c298d74440c946dbcdea53e618cee (patch) | |
tree | e9d264f4f6028c5f1d70ed99b2dfa26908103ea6 | |
parent | 8d68f9c4ebc40acd4995156217d5ed73bd7edb1d (diff) | |
download | prosody-1fce0454899c298d74440c946dbcdea53e618cee.tar.gz prosody-1fce0454899c298d74440c946dbcdea53e618cee.zip |
configure: Replace use of '-o' with '||' [SC2166]
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -181,7 +181,7 @@ do 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 @@ do --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 @@ then 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"; |