Software / code / prosody
Changeset
5830:ae48bf828f21
Run with own LuaSec.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Mon, 17 Jan 2011 16:50:21 +0100 |
| parents | 5829:40c16475194e |
| children | 5831:aa4bdabd3c0f |
| files | prosody util/dependencies.lua |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Sat Jan 15 17:59:15 2011 +0100 +++ b/prosody Mon Jan 17 16:50:21 2011 +0100 @@ -16,6 +16,9 @@ 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
--- a/util/dependencies.lua Sat Jan 15 17:59:15 2011 +0100 +++ b/util/dependencies.lua Mon Jan 17 16:50:21 2011 +0100 @@ -11,9 +11,9 @@ 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("");
