diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-29 22:32:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-29 22:32:03 +0100 |
| commit | f01dafc6febdb8e36bfe475853f8e1d4b6ccf8cd (patch) | |
| tree | 7057f2f6ba6b58e5e7b483bba598fdc3f76f9a82 /util/dependencies.lua | |
| parent | c5c11c2e2e6d2383ad901d34d417794f65d41679 (diff) | |
| parent | ebd348e104a7678ed2a82fdc1ecce420e7f2a8d7 (diff) | |
| download | prosody-f01dafc6febdb8e36bfe475853f8e1d4b6ccf8cd.tar.gz prosody-f01dafc6febdb8e36bfe475853f8e1d4b6ccf8cd.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/dependencies.lua')
| -rw-r--r-- | util/dependencies.lua | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua index f213a5da..38aced70 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -82,10 +82,10 @@ local function check_dependencies() local lfs, err = softreq "lfs" if not lfs then missingdep("luafilesystem", { - ["luarocks"] = "luarocks install luafilesystem"; - ["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem"; - ["Source"] = "http://www.keplerproject.org/luafilesystem/"; - }); + ["luarocks"] = "luarocks install luafilesystem"; + ["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem"; + ["Source"] = "http://www.keplerproject.org/luafilesystem/"; + }); fatal = true; end @@ -112,9 +112,10 @@ local function check_dependencies() local encodings, err = softreq "util.encodings" if not encodings then if err:match("module '[^']*' not found") then - missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/"; - ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so"; - }); + missingdep("util.encodings", { + ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/"; + ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so"; + }); else print "***********************************" print("util/encodings couldn't be loaded. Check that you have a recent version of libidn"); @@ -129,10 +130,11 @@ local function check_dependencies() local hashes, err = softreq "util.hashes" if not hashes then if err:match("module '[^']*' not found") then - missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/"; - ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so"; - }); - else + missingdep("util.hashes", { + ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/"; + ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so"; + }); + else print "***********************************" print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)"); print "" |