prosody
179a6f30694e
configure

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

Software / code / prosody

Comparison

configure @ 8088:179a6f30694e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 15 Apr 2017 02:15:15 +0200
parent 8087:eb38f3b919be
child 8129:69f8b22b0472
comparison
equal deleted inserted replaced
8085:7a13fa890472 8088:179a6f30694e
423 search_interpreter "$LUA_SUFFIX" && { 423 search_interpreter "$LUA_SUFFIX" && {
424 lua_interp_found=yes 424 lua_interp_found=yes
425 } 425 }
426 fi 426 fi
427 427
428 if [ "$lua_interp_found" != "yes" ] 428 if [ "$lua_interp_found" != "yes" -a "$RUNWITH_SET" != "yes" ]
429 then 429 then
430 [ "$LUA_VERSION_SET" ] && { interp="Lua $LUA_VERSION" ;} || { interp="Lua" ;} 430 [ "$LUA_VERSION_SET" ] && { interp="Lua $LUA_VERSION" ;} || { interp="Lua" ;}
431 [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ] && { where="$LUA_BINDIR" ;} || { interp="\$PATH" ;} 431 [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ] && { where="$LUA_BINDIR" ;} || { where="\$PATH" ;}
432 echo "$interp interpreter not found in $where" 432 echo "$interp interpreter not found in $where"
433 die "You may want to use the flags --with-lua, --with-lua-bin and/or --lua-suffix. See --help." 433 die "You may want to use the flags --with-lua, --with-lua-bin and/or --lua-suffix. See --help."
434 fi 434 fi
435 435
436 if [ "$LUA_VERSION_SET" = "yes" ] 436 if [ "$LUA_VERSION_SET" = "yes" -a "$RUNWITH_SET" != "yes" ]
437 then 437 then
438 echo_n "Checking if $LUA_BINDIR/lua$LUA_SUFFIX is Lua version $LUA_VERSION... " 438 echo_n "Checking if $LUA_BINDIR/lua$LUA_SUFFIX is Lua version $LUA_VERSION... "
439 if detect_lua_version "$LUA_BINDIR/lua$LUA_SUFFIX" 439 if detect_lua_version "$LUA_BINDIR/lua$LUA_SUFFIX"
440 then 440 then
441 echo "yes" 441 echo "yes"
479 die "You may want to use the flag --with-lua or --with-lua-include. See --help." 479 die "You may want to use the flag --with-lua or --with-lua-include. See --help."
480 fi 480 fi
481 fi 481 fi
482 fi 482 fi
483 483
484 echo_n "Checking if Lua header version matches that of the interpreter... " 484 if [ "$lua_interp_found" = "yes" ]
485 header_version=$(sed -n 's/.*LUA_VERSION_NUM.*5.\(.\).*/5.\1/p' "$lua_h") 485 then
486 if [ "$header_version" = "$LUA_VERSION" ] 486 echo_n "Checking if Lua header version matches that of the interpreter... "
487 then 487 header_version=$(sed -n 's/.*LUA_VERSION_NUM.*5.\(.\).*/5.\1/p' "$lua_h")
488 echo "yes" 488 if [ "$header_version" = "$LUA_VERSION" ]
489 else 489 then
490 echo "no" 490 echo "yes"
491 echo "lua.h version mismatch (interpreter: $LUA_VERSION; lua.h: $header_version)." 491 else
492 die "You may want to use the flag --with-lua or --with-lua-include. See --help." 492 echo "no"
493 echo "lua.h version mismatch (interpreter: $LUA_VERSION; lua.h: $header_version)."
494 die "You may want to use the flag --with-lua or --with-lua-include. See --help."
495 fi
493 fi 496 fi
494 497
495 echo_n "Configuring for system... " 498 echo_n "Configuring for system... "
496 if uname -s 499 if uname -s
497 then 500 then