Mercurial > prosody-hg

diff util/dependencies.lua @ 7269:cde4ef90cf3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 11 Mar 2016 13:41:10 +0100
parents 6d97895c2bd7
children a5a080c12c96 589e27b47d56
line wrap: on
line diff
--- a/util/dependencies.lua	Thu Mar 10 17:55:40 2016 +0000
+++ b/util/dependencies.lua	Fri Mar 11 13:41:10 2016 +0100
@@ -101,7 +101,7 @@
 
 	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 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";
 		 			});