X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdependencies.lua;h=5b07072f1350ab05b8663b869ac348e4bb2db360;hb=115f82b6a68b43ae4b9661fb579a25a05f57225f;hp=682afd152e388d47e351eb40496f8ee09ab99ded;hpb=53054914f001a775ba8bb5d4c023d57281fdd8de;p=prosody.git

diff --git a/util/dependencies.lua b/util/dependencies.lua
index 682afd15..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("");
@@ -13,7 +22,7 @@ local function missingdep(name, sources, msg)
 	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
@@ -42,5 +51,38 @@ if not ssl then
 	end
 end
 
+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