diff options
| -rw-r--r-- | channels/chan_gtalk.c | 9 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index fb58aa490..d8e8c819d 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1952,8 +1952,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_gtalk.so depends upon res_jabber.so\n"); - return AST_MODULE_LOAD_DECLINE; + /* If embedded, check for a different module name */ + jabber_loaded = ast_module_helper("", "res_jabber", 0, 0, 0, 0); + free(jabber_loaded); + if (!jabber_loaded) { + ast_log(LOG_ERROR, "chan_gtalk.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } } ASTOBJ_CONTAINER_INIT(>alk_list); 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); |