diff options
| -rwxr-xr-x | prosody | 3 | ||||
| -rw-r--r-- | util/dependencies.lua | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -16,9 +16,6 @@ CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR"); CFG_DATADIR=os.getenv("PROSODY_DATADIR"); -package.path = "/Users/tfar/share/lua/5.1/?.lua;"..package.path; -package.cpath = "/Users/tfar/lib/lua/5.1/?.so;"..package.cpath; - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Tell Lua where to find our libraries diff --git a/util/dependencies.lua b/util/dependencies.lua index 9258be88..9371521c 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -11,9 +11,9 @@ module("dependencies", package.seeall) function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end -- Required to be able to find packages installed with luarocks ---if not softreq "luarocks.loader" then -- LuaRocks 2.x --- softreq "luarocks.require"; -- LuaRocks <1.x ---end +if not softreq "luarocks.loader" then -- LuaRocks 2.x + softreq "luarocks.require"; -- LuaRocks <1.x +end function missingdep(name, sources, msg) print(""); |