Merge Tobias->trunk

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index e0d4b85a971e6131c74d7fd7d872d95c917eb180..1c1a63a4743651ea6120a582dd070a584cdb8233 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -6,7 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
-local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent");
+local use_luaevent = prosody and require "core.configmanager".get("*", "core", "use_libevent");
 
 if use_luaevent then
        use_luaevent = pcall(require, "luaevent.core");