util.dependencies, prosody, prosodyctl: Give util.dependencies a check_dependencies() function so the caller can decide what to do when dependencies aren't met - update prosody/prosodyctl for this change

prosody

@@ -114,7 +114,9 @@ function load_libraries()
 	require "core.loggingmanager"
 	
 	-- Check runtime dependencies
-	require "util.dependencies"
+	if not require "util.dependencies".check_dependencies() then
+		os.exit(1);
+	end
 	
 	-- Load socket framework
 	server = require "net.server"

prosodyctl

@@ -29,10 +29,13 @@ if CFG_DATADIR then
 	end
 end
 
+if not require "util.dependencies".check_dependencies() then
+	os.exit(1);
+end
+
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
 
-require "util.dependencies"
 
 config = require "core.configmanager"
 

util/dependencies.lua

@@ -6,12 +6,11 @@
 -- COPYING file in the source package for more information.
 --
 
+module("dependencies", package.seeall)
 
-local fatal;
+function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil, lib; end end
 
-local function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil, lib; end end
-
-local function missingdep(name, sources, msg)
+function missingdep(name, sources, msg)
 	print("");
 	print("**************************");
 	print("Prosody was unable to find "..tostring(name));
@@ -31,6 +30,9 @@ local function missingdep(name, sources, msg)
 	print("");
 end
 
+function check_dependencies()
+	local fatal;
+	
 	local lxp = softreq "lxp"
 	
 	if not lxp then
@@ -115,5 +117,8 @@ if not hashes then
 		end
 		fatal = true;
 	end
+	return not fatal;
+end
 
-if fatal then os.exit(1); end
+
+return _M;