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 cb336e979aac7d9429545680a67c972c85cef3a2..41e93b538f2b9b45adb9191dd17e3f6c3564cfe1 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,15 +1,30 @@
+-- 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("");
+       print("**************************");
        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("");
        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://prosody.im/doc/depends");
+       print("**************************");
+       print("");
 end
 
 local lxp = softreq "lxp"
@@ -29,7 +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 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