Comparison

util/dependencies.lua @ 7768:57d0f2d3d5c5

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 05 Dec 2016 23:03:09 +0100
parent 7723:488fddf88ffd
parent 7767:36bf9ed87ae1
child 7780:dbd202e7c587
comparison
equal deleted inserted replaced
7765:4757c3644168 7768:57d0f2d3d5c5
61 61
62 if not lxp then 62 if not lxp then
63 missingdep("luaexpat", { 63 missingdep("luaexpat", {
64 ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0"; 64 ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0";
65 ["luarocks"] = "luarocks install luaexpat"; 65 ["luarocks"] = "luarocks install luaexpat";
66 ["Source"] = "http://www.keplerproject.org/luaexpat/"; 66 ["Source"] = "http://matthewwild.co.uk/projects/luaexpat/";
67 }); 67 });
68 fatal = true; 68 fatal = true;
69 end 69 end
70 70
71 local socket = softreq "socket" 71 local socket = softreq "socket"
93 93
94 if not ssl then 94 if not ssl then
95 missingdep("LuaSec", { 95 missingdep("LuaSec", {
96 ["Debian/Ubuntu"] = "https://prosody.im/download/start#debian_and_ubuntu"; 96 ["Debian/Ubuntu"] = "https://prosody.im/download/start#debian_and_ubuntu";
97 ["luarocks"] = "luarocks install luasec"; 97 ["luarocks"] = "luarocks install luasec";
98 ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; 98 ["Source"] = "https://github.com/brunoos/luasec";
99 }, "SSL/TLS support will not be available"); 99 }, "SSL/TLS support will not be available");
100 end
101
102 local bit = _G.bit32 or softreq"bit";
103
104 if not bit then
105 missingdep("lua-bitops", {
106 ["Debian/Ubuntu"] = "sudo apt-get install lua-bitop";
107 ["luarocks"] = "luarocks install luabitop";
108 ["Source"] = "http://bitop.luajit.org/";
109 }, "WebSocket support will not be available");
100 end 110 end
101 111
102 local encodings, err = softreq "util.encodings" 112 local encodings, err = softreq "util.encodings"
103 if not encodings then 113 if not encodings then
104 if err:match("module '[^']*' not found") then 114 if err:match("module '[^']*' not found") then
130 print(err) 140 print(err)
131 print "***********************************" 141 print "***********************************"
132 end 142 end
133 fatal = true; 143 fatal = true;
134 end 144 end
145
135 return not fatal; 146 return not fatal;
136 end 147 end
137 148
138 local function log_warnings() 149 local function log_warnings()
139 if _VERSION > "Lua 5.2" then 150 if _VERSION > "Lua 5.2" then