prosody
e290a60f1f09
configure

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

configure @ 9426:e290a60f1f09

configure: Replace use of '-o' with '||' [SC2166]
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Oct 2018 16:18:56 +0100
parent 9425:b741e9b9593b
child 9427:460f08008521
comparison
equal deleted inserted replaced
9425:b741e9b9593b 9426:e290a60f1f09
179 LUA_INCDIR_SET=yes 179 LUA_INCDIR_SET=yes
180 LUA_LIBDIR=/usr/local/lib 180 LUA_LIBDIR=/usr/local/lib
181 LUA_LIBDIR_SET=yes 181 LUA_LIBDIR_SET=yes
182 CFLAGS="$CFLAGS -ggdb" 182 CFLAGS="$CFLAGS -ggdb"
183 fi 183 fi
184 if [ "$OSPRESET" = "freebsd" -o "$OSPRESET" = "openbsd" ]; then 184 if [ "$OSPRESET" = "freebsd" ] || [ "$OSPRESET" = "openbsd" ]; then
185 LUA_INCDIR="/usr/local/include/lua51" 185 LUA_INCDIR="/usr/local/include/lua51"
186 LUA_INCDIR_SET=yes 186 LUA_INCDIR_SET=yes
187 CFLAGS="-Wall -fPIC -I/usr/local/include" 187 CFLAGS="-Wall -fPIC -I/usr/local/include"
188 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared" 188 LDFLAGS="-I/usr/local/include -L/usr/local/lib -shared"
189 LUA_SUFFIX="51" 189 LUA_SUFFIX="51"
234 LUA_SUFFIX_SET=yes 234 LUA_SUFFIX_SET=yes
235 ;; 235 ;;
236 --lua-version|--with-lua-version) 236 --lua-version|--with-lua-version)
237 [ -n "$value" ] || die "Missing value in flag $key." 237 [ -n "$value" ] || die "Missing value in flag $key."
238 LUA_VERSION="$value" 238 LUA_VERSION="$value"
239 [ "$LUA_VERSION" = "5.1" -o "$LUA_VERSION" = "5.2" -o "$LUA_VERSION" = "5.3" ] || die "Invalid Lua version in flag $key." 239 [ "$LUA_VERSION" = "5.1" ] || [ "$LUA_VERSION" = "5.2" ] || [ "$LUA_VERSION" = "5.3" ] || die "Invalid Lua version in flag $key."
240 LUA_VERSION_SET=yes 240 LUA_VERSION_SET=yes
241 ;; 241 ;;
242 --with-lua) 242 --with-lua)
243 [ -n "$value" ] || die "Missing value in flag $key." 243 [ -n "$value" ] || die "Missing value in flag $key."
244 LUA_DIR="$value" 244 LUA_DIR="$value"
423 if [ "$LUA_VERSION_SET" ]; then 423 if [ "$LUA_VERSION_SET" ]; then
424 interp="Lua $LUA_VERSION"; 424 interp="Lua $LUA_VERSION";
425 else 425 else
426 interp="Lua"; 426 interp="Lua";
427 fi 427 fi
428 if [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ]; then 428 if [ "$LUA_DIR_SET" ] || [ "$LUA_BINDIR_SET" ]; then
429 where="$LUA_BINDIR"; 429 where="$LUA_BINDIR";
430 else 430 else
431 where="\$PATH"; 431 where="\$PATH";
432 fi 432 fi
433 echo "$interp interpreter not found in $where" 433 echo "$interp interpreter not found in $where"