Sync up trunk with changes from 2.5.x.

This commit is contained in:
brectanus
2008-03-28 17:06:44 +00:00
parent d797619fcb
commit 5f09dbb3ee
9 changed files with 458 additions and 426 deletions

View File

@@ -66,6 +66,14 @@ if test "${lua_path}" != "no"; then
with_lua_lib="${x}/lib"
lua_lib_name="lua5.1"
break
elif test -e "${x}/lib64/liblua5.1.a"; then
with_lua_lib="${x}/lib64"
lua_lib_name="lua5.1"
break
elif test -e "${x}/lib32/liblua5.1.a"; then
with_lua_lib="${x}/lib32"
lua_lib_name="lua5.1"
break
elif test -e "${x}/liblua.a"; then
with_lua_lib="${x}"
lua_lib_name="lua"
@@ -74,6 +82,14 @@ if test "${lua_path}" != "no"; then
with_lua_lib="${x}/lib"
lua_lib_name="lua"
break
elif test -e "${x}/lib64/liblua.a"; then
with_lua_lib="${x}/lib64"
lua_lib_name="lua"
break
elif test -e "${x}/lib32/liblua.a"; then
with_lua_lib="${x}/lib32"
lua_lib_name="lua"
break
else
with_lua_lib=""
lua_lib_name=""