diff options
| author | Hisham <hisham@gobolinux.org> | 2016-10-15 10:19:34 -0700 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-10-15 10:19:34 -0700 |
| commit | 6f928845e8d167cf4caf4828a79069d9b71cffd8 (patch) | |
| tree | 98fabdaaf9f7ac6f6f0a5938c8b9a2d5d52a87fa /configure | |
| parent | a47f54bb139aa3b932d807e89a0691dfdfaa9723 (diff) | |
| parent | bcd4344e557476e00e10796f6f82927904c23c88 (diff) | |
| download | luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.tar.gz luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.tar.bz2 luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.zip | |
Merge branch 'master' into luarocks-3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -226,8 +226,8 @@ then | |||
| 226 | fi | 226 | fi |
| 227 | 227 | ||
| 228 | detect_lua_version() { | 228 | detect_lua_version() { |
| 229 | detected_lua=`$1 -e 'print(_VERSION:sub(5))' 2> /dev/null` | 229 | detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null` |
| 230 | if [ "$detected_lua" = "5.1" -o "$detected_lua" = "5.2" -o "$detected_lua" = "5.3" ] | 230 | if [ "$detected_lua" != "nil" ] |
| 231 | then | 231 | then |
| 232 | echo "Lua version detected: $detected_lua" | 232 | echo "Lua version detected: $detected_lua" |
| 233 | if [ "$LUA_VERSION_SET" != "yes" ] | 233 | if [ "$LUA_VERSION_SET" != "yes" ] |