X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdependencies.lua;h=5b07072f1350ab05b8663b869ac348e4bb2db360;hb=7cde004ab530110577c5107636bc010576f29df1;hp=d2b4a2f317c2c98be0b20410749c2da541b6d2f4;hpb=bb62eb333d4ff366ae040c3ac0967f6c0ae2c4cc;p=prosody.git

diff --git a/util/dependencies.lua b/util/dependencies.lua
index d2b4a2f3..5b07072f 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,6 +1,15 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+
 local fatal;
 
-local function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil; 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)
 	print("");
@@ -11,8 +20,9 @@ local function missingdep(name, sources, msg)
 	for k,v in pairs(sources) do
 		print("", k, v);
 	end
+	print("");
 	print(msg or (name.." is required for Prosody to run, so we will now exit."));
-	print("More help can be found on our website, at http://.../doc/depends");
+	print("More help can be found on our website, at http://prosody.im/doc/depends");
 	print("**************************");
 	print("");
 end
@@ -34,16 +44,45 @@ 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");
+	if config.get("*", "core", "run_without_ssl") then
+		log("warn", "Running without SSL support because run_without_ssl is defined in the config");
+	else
+		missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available");
+	end
 end
 
-
-local md5 = softreq "md5";
-
-if not md5 then
-	missingdep("MD5", { ["luarocks"] = "luarocks install md5"; ["Source"] = "http://luaforge.net/frs/?group_id=155" });	
+local encodings, err = softreq "util.encodings"
+if not encodings then
+	if err:match("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";
+	 			});
+	else
+		print "***********************************"
+		print("util/encodings couldn't be loaded. Check that you have a recent version of libidn");
+		print ""
+		print("The full error was:");
+		print(err)
+		print "***********************************"
+	end
 	fatal = true;
 end
 
+local hashes, err = softreq "util.hashes"
+if not hashes then
+	if err:match("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";
+	 			});
+ 	else
+		print "***********************************"
+		print("util/hashes couldn't be loaded. Check that you have a recent version of OpenSSL (libcrypto in particular)");
+		print ""
+		print("The full error was:");
+		print(err)
+		print "***********************************"
+	end
+	fatal = true;
+end
 
 if fatal then os.exit(1); end