From 07462b8d1b082a5659b36754739596fa1a326a64 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Fri, 9 Feb 2007 23:51:41 +0000
Subject: [PATCH] add some inter-module dependencies

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_adsiprog.c   | 4 ++++
 apps/app_voicemail.c  | 6 ++++++
 funcs/func_odbc.c     | 1 +
 res/res_adsi.c        | 2 +-
 res/res_config_odbc.c | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index c61f6bf3fb..40330152b0 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 f27fc6e48c..4326dbc0f8 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 a03ccb1847..78d3384b56 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 b872212375..950e4f8651 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 3ef3edd336..a2cfa7cf5c 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"