Comparison

util/dependencies.lua @ 7878:2fdb7b3648d8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 29 Jan 2017 22:32:03 +0100
parent 7820:8a9942086068
parent 7875:3fbfd7210d78
child 7999:980606856882
comparison
equal deleted inserted replaced
7874:de3c6fb74759 7878:2fdb7b3648d8
80 end 80 end
81 81
82 local lfs, err = softreq "lfs" 82 local lfs, err = softreq "lfs"
83 if not lfs then 83 if not lfs then
84 missingdep("luafilesystem", { 84 missingdep("luafilesystem", {
85 ["luarocks"] = "luarocks install luafilesystem"; 85 ["luarocks"] = "luarocks install luafilesystem";
86 ["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem"; 86 ["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem";
87 ["Source"] = "http://www.keplerproject.org/luafilesystem/"; 87 ["Source"] = "http://www.keplerproject.org/luafilesystem/";
88 }); 88 });
89 fatal = true; 89 fatal = true;
90 end 90 end
91 91
92 local ssl = softreq "ssl" 92 local ssl = softreq "ssl"
93 93
110 end 110 end
111 111
112 local encodings, err = softreq "util.encodings" 112 local encodings, err = softreq "util.encodings"
113 if not encodings then 113 if not encodings then
114 if err:match("module '[^']*' not found") then 114 if err:match("module '[^']*' not found") then
115 missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/"; 115 missingdep("util.encodings", {
116 ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so"; 116 ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/";
117 }); 117 ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so";
118 });
118 else 119 else
119 print "***********************************" 120 print "***********************************"
120 print("util/encodings couldn't be loaded. Check that you have a recent version of libidn"); 121 print("util/encodings couldn't be loaded. Check that you have a recent version of libidn");
121 print "" 122 print ""
122 print("The full error was:"); 123 print("The full error was:");
127 end 128 end
128 129
129 local hashes, err = softreq "util.hashes" 130 local hashes, err = softreq "util.hashes"
130 if not hashes then 131 if not hashes then
131 if err:match("module '[^']*' not found") then 132 if err:match("module '[^']*' not found") then
132 missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/"; 133 missingdep("util.hashes", {
133 ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so"; 134 ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/";
134 }); 135 ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so";
135 else 136 });
137 else
136 print "***********************************" 138 print "***********************************"
137 print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)"); 139 print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)");
138 print "" 140 print ""
139 print("The full error was:"); 141 print("The full error was:");
140 print(err) 142 print(err)