diff options
| -rw-r--r-- | apps/app_adsiprog.c | 4 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 6 | ||||
| -rw-r--r-- | funcs/func_odbc.c | 1 | ||||
| -rw-r--r-- | res/res_adsi.c | 2 | ||||
| -rw-r--r-- | res/res_config_odbc.c | 1 |
5 files changed, 13 insertions, 1 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index c61f6bf3f..40330152b 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -25,6 +25,10 @@ * \ingroup applications */ +/*** MODULEINFO + <depend>res_adsi</depend> + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index f27fc6e48..4326dbc0f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -28,14 +28,20 @@ * \note This module requires res_adsi to load. */ +/*** MODULEINFO + <depend>res_adsi</depend> + ***/ + /*** MAKEOPTS <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o"> <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC"> <depend>unixodbc</depend> + <conflict>IMAP_STORAGE</conflict> <defaultenabled>no</defaultenabled> </member> <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4"> <depend>imap_tk</depend> + <conflict>ODBC_STORAGE</conflict> <use>ssl</use> <defaultenabled>no</defaultenabled> </member> diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index a03ccb184..78d3384b5 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -26,6 +26,7 @@ /*** MODULEINFO <depend>unixodbc</depend> + <depend>res_odbc</depend> ***/ #include "asterisk.h" diff --git a/res/res_adsi.c b/res/res_adsi.c index b87221237..950e4f865 100644 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -1122,7 +1122,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 3ef3edd33..a2cfa7cf5 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" |