diff options
| author | Kim Alvefur <zash@zash.se> | 2016-12-05 23:03:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-12-05 23:03:09 +0100 |
| commit | 4688968fe15623c69158d4ceef63d83e3ef2ddb2 (patch) | |
| tree | 4c6789585cf1e7ca711eb7c4253a5da0ef37a9b8 | |
| parent | 0031f4db2cd964b2f0bec5c6292a30107ee68c60 (diff) | |
| parent | 7b00ac62089347c7c20f744ba115ab7ee683be88 (diff) | |
| download | prosody-4688968fe15623c69158d4ceef63d83e3ef2ddb2.tar.gz prosody-4688968fe15623c69158d4ceef63d83e3ef2ddb2.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/dependencies.lua | 15 |
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 |