From 2627a5bc9ea6e08279389b543af35d486572aa31 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 22 Jan 2009 14:29:29 +0000 Subject: util.dependencies: Show useful messages when our own libraries are not found, too --- util/dependencies.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'util') diff --git a/util/dependencies.lua b/util/dependencies.lua index 6e78a138..601382df 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -62,5 +62,18 @@ if not ssl then end end +local encodings = softreq "util.encodings" +if not encodings 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"; + }); +end + +local encodings = softreq "util.hashes" +if not encodings 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"; + }); +end if fatal then os.exit(1); end -- cgit v1.2.3 From b20815e17becadec9ddb2f420bcec87773480190 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 22 Jan 2009 14:33:02 +0000 Subject: util.dependencies: Not finding our own libraries is fatal --- util/dependencies.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util') diff --git a/util/dependencies.lua b/util/dependencies.lua index 601382df..8fe6edba 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -67,6 +67,7 @@ if not encodings 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"; }); + fatal = true; end local encodings = softreq "util.hashes" @@ -74,6 +75,7 @@ if not encodings 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"; }); + fatal = true; end if fatal then os.exit(1); end -- cgit v1.2.3