mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-12-05 23:03:09 +01:00
commit dec1fd604c
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
util/dependencies.lua
View file

@ -63,7 +63,7 @@ local function check_dependencies()
missingdep("luaexpat", {
["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
["luarocks"] = "luarocks install luaexpat";
["Source"] = "http://www.keplerproject.org/luaexpat/";
["Source"] = "http://matthewwild.co.uk/projects/luaexpat/";
});
fatal = true;
end
@ -95,10 +95,20 @@ local function check_dependencies()
missingdep("LuaSec", {
["Debian/Ubuntu"] = "https://prosody.im/download/start#debian_and_ubuntu";
["luarocks"] = "luarocks install luasec";
["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/";
["Source"] = "https://github.com/brunoos/luasec";
}, "SSL/TLS support will not be available");
end
local bit = _G.bit32 or softreq"bit";
if not bit then
missingdep("lua-bitops", {
["Debian/Ubuntu"] = "sudo apt-get install lua-bitop";
["luarocks"] = "luarocks install luabitop";
["Source"] = "http://bitop.luajit.org/";
}, "WebSocket support will not be available");
end
local encodings, err = softreq "util.encodings"
if not encodings then
if err:match("module '[^']*' not found") then
@ -132,6 +142,7 @@ local function check_dependencies()
end
fatal = true;
end
return not fatal;
end