Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 05 Dec 2016 23:03:09 +0100
changeset 7771 57d0f2d3d5c5
parent 7768 4757c3644168 (current diff)
parent 7770 36bf9ed87ae1 (diff)
child 7783 dbd202e7c587
Merge 0.10->trunk
util/dependencies.lua
--- a/util/dependencies.lua	Mon Dec 05 12:29:21 2016 +0100
+++ b/util/dependencies.lua	Mon Dec 05 23:03:09 2016 +0100
@@ -63,7 +63,7 @@
 		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 @@
 		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 @@
 		end
 		fatal = true;
 	end
+
 	return not fatal;
 end