mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@114708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1961,8 +1961,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;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
|
Reference in New Issue
Block a user