# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1227579623 0
# Node ID eb1a0960cefbda6954735eedb24ac9f128577b89
# Parent  7ae008771391b00762def5d9732dfd19364cf3fe
Friendlier messages on missing dependencies

diff -r 7ae008771391 -r eb1a0960cefb main.lua
--- a/main.lua	Tue Nov 25 01:56:20 2008 +0000
+++ b/main.lua	Tue Nov 25 02:20:23 2008 +0000
@@ -1,11 +1,10 @@
 pcall(require, "luarocks.require")
 
 local server = require "net.server"
-require "lxp"
-require "socket"
-pcall(require,"ssl") -- Optional
 local config = require "core.configmanager"
 
+require "util.dependencies"
+
 log = require "util.logger".init("general");
 
 do
diff -r 7ae008771391 -r eb1a0960cefb util/dependencies.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util/dependencies.lua	Tue Nov 25 02:20:23 2008 +0000
@@ -0,0 +1,35 @@
+local fatal;
+
+local function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil; end end
+
+local function missingdep(name, sources, msg)
+	print("Prosody was unable to find "..tostring(name));
+	print("This package can be obtained in the following ways:");
+	print("");
+	for k,v in pairs(sources) do
+		print("", k, v);
+	end
+	print(msg or (name.." is required for Prosody to run, so we will now exit."));
+end
+
+local lxp = softreq "lxp"
+
+if not lxp then
+	missingdep("luaexpat", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-expat0"; ["luarocks"] = "luarocks install luaexpat"; });
+	fatal = true;
+end
+
+local socket = softreq "socket"
+
+if not socket then
+	missingdep("luasocket", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; });
+	fatal = true;
+end
+	
+local ssl = softreq "ssl"
+
+if not ssl then
+	missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available");
+end
+
+if fatal then os.exit(1); end