From 1c652e0883116320d34bdf198d6829df78d45e0b Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 5 Dec 2016 21:43:09 +0100 Subject: util.dependencies: Update links for LuaExpat and LuaSec which have moved to new locations --- util/dependencies.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/dependencies.lua b/util/dependencies.lua index ca97afb5..a070807d 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,7 +95,7 @@ local function check_dependencies() missingdep("LuaSec", { ["Debian/Ubuntu"] = "http://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 -- cgit v1.2.3 From 00e5c2d7d326e18232ac3188001f805fdab3836f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 5 Dec 2016 21:46:06 +0100 Subject: util.dependencies: Add check and info about lua-bitops (for mod_websockets) --- util/dependencies.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/util/dependencies.lua b/util/dependencies.lua index a070807d..d2024c4f 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -99,6 +99,16 @@ local function check_dependencies() }, "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 -- cgit v1.2.3