aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-05 23:03:09 +0100
committerKim Alvefur <zash@zash.se>2016-12-05 23:03:09 +0100
commitdec1fd604cc7dedef23b3885013fa821492ef86b (patch)
tree4c6789585cf1e7ca711eb7c4253a5da0ef37a9b8 /util
parent08a58cfdb2f6fd438fe7a00430d14c03b7caa7cb (diff)
parent00e5c2d7d326e18232ac3188001f805fdab3836f (diff)
downloadprosody-dec1fd604cc7dedef23b3885013fa821492ef86b.tar.gz
prosody-dec1fd604cc7dedef23b3885013fa821492ef86b.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/dependencies.lua15
1 files changed, 13 insertions, 2 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua
index b093e6cf..11cd9486 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -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