# HG changeset patch # User Matthew Wild # Date 1538407136 -3600 # Node ID e290a60f1f09251098dd0d793c61b6f9b25b3a54 # Parent b741e9b9593b25e425e5930a3063509b578dc0dd configure: Replace use of '-o' with '||' [SC2166] diff -r b741e9b9593b -r e290a60f1f09 configure --- 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";