aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2011-01-17 16:50:21 +0100
committerTobias Markmann <tm@ayena.de>2011-01-17 16:50:21 +0100
commit1fbe88e5c40b9a48ea35aedaaaee9152991b8e65 (patch)
tree714d170349e492f379bf352ed361548a19402890
parent1e72875d5263b9478b257b27a3784dcd7fc4dcc3 (diff)
downloadprosody-1fbe88e5c40b9a48ea35aedaaaee9152991b8e65.tar.gz
prosody-1fbe88e5c40b9a48ea35aedaaaee9152991b8e65.zip
Run with own LuaSec.
-rwxr-xr-xprosody3
-rw-r--r--util/dependencies.lua6
2 files changed, 6 insertions, 3 deletions
diff --git a/prosody b/prosody
index 7c819214..c86eea42 100755
--- a/prosody
+++ b/prosody
@@ -16,6 +16,9 @@ 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 9371521c..9258be88 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("");