diff options
Diffstat (limited to 'src/configure')
-rwxr-xr-x | src/configure | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/configure b/src/configure index fe013b1..ac27ca6 100755 --- a/src/configure +++ b/src/configure @@ -39,6 +39,7 @@ USE_CLANG=0 LUA_DIR='' LUA='' LUAC='' +LUA_VER='' PREFIX='/usr/local' BINDIR='' @@ -61,6 +62,7 @@ print_usage() { echo " --examplesdir=<DIR> the path to the examples files (default: $PREFIX/share/examples)" echo " --no-examples dont't install example files" echo " --with-lua=<DIR> use this lua tree instead of system default" + echo " --lua-version=nnn set fixed Lua version for automatic detection (501 -> 5.1, 502 -> 5.2)" echo " --use-clang use clang/llvm as compiler/linker" } @@ -100,6 +102,9 @@ do --with-lua=*) LUA_DIR=${arg#--with-lua=} ;; + --lua-version=*) + LUA_VER=${arg#--lua-version=} + ;; --ebuild-compat) EBUILD_COMPAT=1 ;; @@ -161,14 +166,32 @@ esac test_lua_version() { - LUA_VERSION=`cat $1 | grep "#define LUA_VERSION[ ]" | cut -f2- | tr -d '"' | sed -e 's/Lua \([0-9][0-9.]*\)/\1/'` + LUA_VERSION_MAJ=`cat $1 | grep "#define LUA_VERSION_MAJOR[ ]" | cut -f2- | tr -d '"'` + LUA_VERSION_MIN=`cat $1 | grep "#define LUA_VERSION_MINOR[ ]" | cut -f2- | tr -d '"'` + LUA_VERSION_REL=`cat $1 | grep "#define LUA_VERSION_RELEASE[ ]" | cut -f2- | tr -d '"'` + + LUA_VERSION="$LUA_VERSION_MAJ.$LUA_VERSION_MIN" + LUA_RELEASE="$LUA_VERSION_MAJ.$LUA_VERSION_MIN.$LUA_VERSION_REL" + + if [ -z "$LUA_VERSION_MAJ" ]; then + LUA_VERSION=`cat $1 | grep "#define LUA_VERSION[ ]" | cut -f2- | tr -d '"' | sed -e 's/Lua \([0-9][0-9.]*\)/\1/'` + LUA_RELEASE=`cat $1 | grep "#define LUA_RELEASE[ ]" | cut -f2- | tr -d '"' | sed -e 's/Lua //'` + fi + LUA_VERSION_NUM=`cat $1 | grep "#define LUA_VERSION_NUM" | awk '{ print $3 }'` - LUA_RELEASE=`cat $1 | grep "#define LUA_RELEASE[ ]" | cut -f2-` - if [ $LUA_VERSION_NUM -ge 501 ]; then - return 1; + if [ -n "$LUA_VER" ]; then + if [ "$LUA_VER" -eq $LUA_VERSION_NUM ]; then + return 1 + else + return 0 + fi else - return 0; + if [ $LUA_VERSION_NUM -ge 501 ]; then + return 1 + else + return 0 + fi fi } @@ -185,7 +208,7 @@ if [ -z "$LUA_DIR" ]; then break fi else - for dir in `ls -d $prefix/include/lua* 2> /dev/null`; do + for dir in `ls -r -d $prefix/include/lua* 2> /dev/null`; do if [ -e $dir/lua.h ]; then test_lua_version $dir/lua.h if [ $? -eq 1 ]; then |