# HG changeset patch
# User Tobias Markmann <tm@ayena.de>
# Date 1295279421 -3600
# Node ID ae48bf828f21ad93d2bfc3548a6a16bf81d52f31
# Parent  40c16475194e36ab1647fb4f5d9c3846da350489
Run with own LuaSec.

diff -r 40c16475194e -r ae48bf828f21 prosody
--- 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
diff -r 40c16475194e -r ae48bf828f21 util/dependencies.lua
--- 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("");