add some inter-module dependencies

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53780 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index c61f6bf3fb657736a0c78ae8a441c4f1403359d5..40330152b03d79078657cb5cb2800ef310001b93 100644 (file)
--- 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 f27fc6e48c632a08d469d892655bf3180e8ac7e5..4326dbc0f8b0a98237d1a84823953f7c6a161797 100644 (file)
--- 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 a03ccb1847ad5f1b43db68b2c8ba5541f947367c..78d3384b56bcf7ab3b0db9fa20a3dc61fe400244 100644 (file)
--- 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 b8722123757c1d7b5f0d81392f565339ae6c9b8d..950e4f8651e211eadaba82fecf6e1faef8313b5e 100644 (file)
--- 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 3ef3edd33601bca3dc0bb992e7acb25b7dc71b09..a2cfa7cf5cd612bcea87597a92281ad11aafbb26 100644 (file)
--- 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"