diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:41:38 +0100 |
| commit | da820882348572de470a13a1a50f529a51243aa5 (patch) | |
| tree | 39ca42dddf3935546a0c3c37b2e2456a554899f1 /util/dependencies.lua | |
| parent | 618661cda2a68afbe445ce079c15af25bdaa177b (diff) | |
| parent | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff) | |
| download | prosody-da820882348572de470a13a1a50f529a51243aa5.tar.gz prosody-da820882348572de470a13a1a50f529a51243aa5.zip | |
Merge 0.9->0.10
Diffstat (limited to 'util/dependencies.lua')
| -rw-r--r-- | util/dependencies.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/util/dependencies.lua b/util/dependencies.lua index e55b2405..9d80d241 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- @@ -35,7 +35,7 @@ function missingdep(name, sources, msg) print(""); end --- COMPAT w/pre-0.8 Debian: The Debian config file used to use +-- COMPAT w/pre-0.8 Debian: The Debian config file used to use -- util.ztact, which has been removed from Prosody in 0.8. This -- is to log an error for people who still use it, so they can -- update their configs. @@ -50,9 +50,9 @@ end; function check_dependencies() local fatal; - + local lxp = softreq "lxp" - + if not lxp then missingdep("luaexpat", { ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0"; @@ -61,9 +61,9 @@ function check_dependencies() }); fatal = true; end - + local socket = softreq "socket" - + if not socket then missingdep("luasocket", { ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; @@ -72,7 +72,7 @@ function check_dependencies() }); fatal = true; end - + local lfs, err = softreq "lfs" if not lfs then missingdep("luafilesystem", { @@ -82,9 +82,9 @@ function check_dependencies() }); fatal = true; end - + local ssl = softreq "ssl" - + if not ssl then missingdep("LuaSec", { ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu"; @@ -92,7 +92,7 @@ function check_dependencies() ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; }, "SSL/TLS support will not be available"); end - + local encodings, err = softreq "util.encodings" if not encodings then if err:match("not found") then |