util.pluginloader: Remove unnecessary return value suppressing the real load error

[prosody.git] / util / dependencies.lua

diff --git a/util/dependencies.lua b/util/dependencies.lua
index 3213a356976110513f6c1695dab9f1a2bdf8a16e..41e93b538f2b9b45adb9191dd17e3f6c3564cfe1 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,6 +1,15 @@
+-- Prosody IM v0.4
+-- 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,13 +51,38 @@ if not ssl then
        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