Index: src/configure.ac
--- src/configure.ac.orig
+++ src/configure.ac
@@ -675,10 +675,10 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
 	AC_MSG_RESULT(yes)
       else
 	AC_MSG_RESULT(no)
-	AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
-	if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
+	AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua-$vi_cv_version_lua)
+	if test -f "$vi_cv_path_lua_pfx/include/lua-$vi_cv_version_lua/lua.h"; then
 	  AC_MSG_RESULT(yes)
-	  LUA_INC=/lua$vi_cv_version_lua
+	  LUA_INC=/lua-$vi_cv_version_lua
 	else
 	  AC_MSG_RESULT(no)
 
@@ -728,9 +728,9 @@ if test "$enable_luainterp" = "yes" -o "$enable_luaint
       fi
       if test "X$LUA_INC" != "X"; then
 	dnl Test alternate name including version
-	LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua$vi_cv_version_lua"
+	LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua$vi_cv_version_lua -lm"
       else
-	LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua"
+	LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua -lm"
       fi
     fi
     if test "$enable_luainterp" = "dynamic"; then