aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-11 13:41:10 +0100
committerKim Alvefur <zash@zash.se>2016-03-11 13:41:10 +0100
commitc12ebaa5ce7d55c66361757d773e67b62d2e719e (patch)
tree3731b00879faf7182108cc277a9a2c61e5fdc0d0 /util
parentb201dabbfdf598f0d300bc9682444bd435611063 (diff)
parent3cee8c1473a0938b58ec0ed93c266c33ec26a4a6 (diff)
downloadprosody-c12ebaa5ce7d55c66361757d773e67b62d2e719e.tar.gz
prosody-c12ebaa5ce7d55c66361757d773e67b62d2e719e.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/dependencies.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 9ab40765..b3f07257 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -101,7 +101,7 @@ local function check_dependencies()
local encodings, err = softreq "util.encodings"
if not encodings then
- if err:match("not found") 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";
});
@@ -118,7 +118,7 @@ local function check_dependencies()
local hashes, err = softreq "util.hashes"
if not hashes then
- if err:match("not found") 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";
});