make new lua version the default and fixed version detection

1 files changed, 13 insertions, 3 deletions

diff --git a/src/configure b/src/configure
index 54c202d..4551aba 100755
--- a/src/configure
+++ b/src/configure
@@ -115,9 +115,19 @@ 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-`
+  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;
@@ -139,7 +149,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