diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-23 17:47:44 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-23 17:47:44 -0200 |
| commit | b45af8b9e4eac479bd1258720a20424e637ef06a (patch) | |
| tree | 0f1d24bb179d4685dd24bb5f178161867b75b964 | |
| parent | 6b398ff0e90dd6329a2431fb8270627903f6bb35 (diff) | |
| download | luarocks-b45af8b9e4eac479bd1258720a20424e637ef06a.tar.gz luarocks-b45af8b9e4eac479bd1258720a20424e637ef06a.tar.bz2 luarocks-b45af8b9e4eac479bd1258720a20424e637ef06a.zip | |
Try versioned "lua" names before the unversioned one.
Should improve on behavior mentioned at
http://stackoverflow.com/questions/20321560/how-do-install-libraries-for-both-lua5-2-and-5-1-using-luarocks/20359102?noredirect=1#comment30696438_20359102
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
| @@ -271,14 +271,14 @@ if [ "$LUA_SUFFIX_SET" != "yes" ] | |||
| 271 | then | 271 | then |
| 272 | if [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.1" ] | 272 | if [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.1" ] |
| 273 | then | 273 | then |
| 274 | suffixes="5.1 51" | 274 | suffixes="5.1 51 -5.1 -51" |
| 275 | elif [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.2" ] | 275 | elif [ "$LUA_VERSION_SET" = "yes" -a "$LUA_VERSION" = "5.2" ] |
| 276 | then | 276 | then |
| 277 | suffixes="5.2 52" | 277 | suffixes="5.2 52 -5.2 -52" |
| 278 | else | 278 | else |
| 279 | suffixes="5.2 52 5.1 51" | 279 | suffixes="5.2 52 -5.2 -52 5.1 51 -5.1 -51" |
| 280 | fi | 280 | fi |
| 281 | for suffix in "" `echo $suffixes` "" | 281 | for suffix in `echo $suffixes` "" |
| 282 | do | 282 | do |
| 283 | search_interpreter "$suffix" && break | 283 | search_interpreter "$suffix" && break |
| 284 | done | 284 | done |
| @@ -286,9 +286,9 @@ fi | |||
| 286 | 286 | ||
| 287 | if [ "$LUA_DIR_SET" != "yes" ] | 287 | if [ "$LUA_DIR_SET" != "yes" ] |
| 288 | then | 288 | then |
| 289 | echo_n "Looking for Lua... " | 289 | if [ -n "$find_lua" ] |
| 290 | if [ ! -n "$find_lua" ] | ||
| 291 | then | 290 | then |
| 291 | echo_n "Looking for Lua... " | ||
| 292 | find_lua=`find_program lua$LUA_SUFFIX` | 292 | find_lua=`find_program lua$LUA_SUFFIX` |
| 293 | fi | 293 | fi |
| 294 | 294 | ||
