# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1379803024 -7200
# Node ID 1a71069dcacf846cc0a674b5c5fb0f3f1cd2c7ce
# Parent  1b0c7e7c6be8821f2daf58899bde1371c4527752
Backout ae48bf828f21

diff -r 1b0c7e7c6be8 -r 1a71069dcacf prosody
--- a/prosody	Mon Feb 07 13:24:42 2011 +0100
+++ b/prosody	Sun Sep 22 00:37:04 2013 +0200
@@ -16,9 +16,6 @@
 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 1b0c7e7c6be8 -r 1a71069dcacf util/dependencies.lua
--- a/util/dependencies.lua	Mon Feb 07 13:24:42 2011 +0100
+++ b/util/dependencies.lua	Sun Sep 22 00:37:04 2013 +0200
@@ -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("");