diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-09 23:53:51 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-09 23:53:51 +0000 |
| commit | f56e86c1e1d5e73fe3b5a49af15d01d3dbe1bce1 (patch) | |
| tree | 7ac3924b8461320812e28597155f6b5a8c41a79e /res | |
| parent | ff82f3cb2521e78725361e691ccec1a4b9a68d43 (diff) | |
Merged revisions 53779-53781 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53779 | kpfleming | 2007-02-09 17:51:29 -0600 (Fri, 09 Feb 2007) | 2 lines
fix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source file
........
r53780 | kpfleming | 2007-02-09 17:51:41 -0600 (Fri, 09 Feb 2007) | 2 lines
add some inter-module dependencies
........
r53781 | kpfleming | 2007-02-09 17:52:44 -0600 (Fri, 09 Feb 2007) | 2 lines
another dependency
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53782 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_adsi.c | 2 | ||||
| -rw-r--r-- | res/res_config_odbc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c index 62f838198..a384ac962 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -1144,7 +1144,7 @@ static int unload_module(void) return -1; } -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource (not optional)", +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource", .load = load_module, .unload = unload_module, .reload = reload, diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 5c725a0e1..0e317640f 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -30,6 +30,7 @@ /*** MODULEINFO <depend>unixodbc</depend> + <depend>res_odbc</depend> ***/ #include "asterisk.h" |