Remove warning of already-loaded modules at startup

[prosody.git] / util / dependencies.lua

diff --git a/util/dependencies.lua b/util/dependencies.lua
index c597f98a75b599fde56c7f8f72711ac9b7c39d6c..6e78a13865f41bd9d09678f043a1fc4a997cb05c 100644 (file)
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -1,3 +1,23 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 local fatal;
 
 local function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil; end end
@@ -13,7 +33,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
@@ -35,15 +55,11 @@ 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
-
-
-local md5 = softreq "md5";
-
-if not md5 then
-       missingdep("MD5", { ["luarocks"] = "luarocks install md5"; ["Source"] = "http://luaforge.net/frs/?group_id=155" });     
-       fatal = true;
+       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