diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-28 04:54:13 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-28 04:54:13 +0000 |
| commit | 049cfb2ffbebb8253697be46f55f9cd4d7d93b32 (patch) | |
| tree | 7e6766083f494c364b61ae498cfd99efe431cfeb /channels/chan_jingle.c | |
| parent | f5e117894b3b82d4969411a28f8bd664bb1b6623 (diff) | |
Merged revisions 114709 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114709 | tilghman | 2008-04-27 23:53:20 -0500 (Sun, 27 Apr 2008) | 13 lines
Merged revisions 114708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114708 | tilghman | 2008-04-27 23:47:39 -0500 (Sun, 27 Apr 2008) | 5 lines
When modules are embedded, they take on a different name, without the ".so"
extension. Specifically check for this name, when we're checking if a module
is loaded.
(Closes issue #12534)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114710 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 52a4693e0..610bda6e8 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1789,8 +1789,13 @@ static int load_module(void) char *jabber_loaded = ast_module_helper("", "res_jabber.so", 0, 0, 0, 0); free(jabber_loaded); if (!jabber_loaded) { - ast_log(LOG_ERROR, "chan_jingle.so depends upon res_jabber.so\n"); - return AST_MODULE_LOAD_DECLINE; + /* Dependency module has a different name, if embedded */ + jabber_loaded = ast_module_helper("", "res_jabber", 0, 0, 0, 0); + free(jabber_loaded); + if (!jabber_loaded) { + ast_log(LOG_ERROR, "chan_jingle.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } } ASTOBJ_CONTAINER_INIT(&jingle_list); |