Software / code / prosody
Comparison
prosodyctl @ 5442:e66973c81e89
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 08 Apr 2013 12:08:34 +0100 |
| parent | 5394:3d1de30fefec |
| parent | 5438:5032b3b5b556 |
| child | 5457:953888c31071 |
comparison
equal
deleted
inserted
replaced
| 5437:1994a4483b1c | 5442:e66973c81e89 |
|---|---|
| 49 events = require "util.events".new(); | 49 events = require "util.events".new(); |
| 50 platform = "posix"; | 50 platform = "posix"; |
| 51 lock_globals = function () end; | 51 lock_globals = function () end; |
| 52 unlock_globals = function () end; | 52 unlock_globals = function () end; |
| 53 installed = CFG_SOURCEDIR ~= nil; | 53 installed = CFG_SOURCEDIR ~= nil; |
| 54 core_post_stanza = function () end; -- TODO: mod_router! | |
| 54 }; | 55 }; |
| 55 _G.prosody = prosody; | 56 _G.prosody = prosody; |
| 56 | 57 |
| 57 local dependencies = require "util.dependencies"; | 58 local dependencies = require "util.dependencies"; |
| 58 if not dependencies.check_dependencies() then | 59 if not dependencies.check_dependencies() then |