diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-03 00:21:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-03 00:21:04 +0000 |
| commit | 53f34e94feaeb9a03d3044ede5c013be806ad038 (patch) | |
| tree | 8d4cd157db2cea718a12e3272b3ed2cf94c70113 /apps | |
| parent | ee246d0e0519c6aa7cb0aea17ea92c9a5c2dc16f (diff) | |
Merged revision 153709 from trunk
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines
instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.
------------------------------------------------------------------------
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@153711 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_stack.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 1398555cc..9888571a9 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -26,7 +26,7 @@ */ /*** MODULEINFO - <depend>res_agi</depend> + <use>res_agi</use> ***/ #include "asterisk.h" @@ -38,9 +38,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/app.h" #include "asterisk/manager.h" #include "asterisk/channel.h" + +/* usage of AGI is optional, so indicate that to the header file */ +#define ASTERISK_AGI_OPTIONAL #include "asterisk/agi.h" -static int agi_loaded = 0; static const char *app_gosub = "Gosub"; static const char *app_gosubif = "GosubIf"; @@ -492,7 +494,7 @@ static int unload_module(void) { struct ast_context *con; - if (agi_loaded) { + if (ast_agi_unregister) { ast_agi_unregister(ast_module_info->self, &gosub_agi_command); if ((con = ast_context_find("app_stack_gosub_virtual_context"))) { @@ -514,15 +516,10 @@ static int load_module(void) { struct ast_context *con; - if (!ast_module_check("res_agi.so")) { - if (ast_load_resource("res_agi.so") == AST_MODULE_LOAD_SUCCESS) { - agi_loaded = 1; - } - } else { - agi_loaded = 1; - } - - if (agi_loaded) { + /* usage of AGI is optional, so check to see if the ast_agi_register() + function is available; if so, use it. + */ + if (ast_agi_register) { con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack"); if (!con) { ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n"); |