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: https://origsvn.digium.com/svn/asterisk/trunk@114709 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index ad70346..c633fbb 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -1964,8 +1964,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(&gtalk_list);

diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 39aa46c..290352c 100644 (file)
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -1793,8 +1793,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);