[svn-commits] kpfleming: branch 1.4 r53780 - in /branches/1.4: apps/ funcs/ res/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb  9 17:51:41 2007
New Revision: 53780

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53780
Log:
add some inter-module dependencies

Modified:
    branches/1.4/apps/app_adsiprog.c
    branches/1.4/apps/app_voicemail.c
    branches/1.4/funcs/func_odbc.c
    branches/1.4/res/res_adsi.c
    branches/1.4/res/res_config_odbc.c

Modified: branches/1.4/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_adsiprog.c?view=diff&rev=53780&r1=53779&r2=53780
==============================================================================
--- branches/1.4/apps/app_adsiprog.c (original)
+++ branches/1.4/apps/app_adsiprog.c Fri Feb  9 17:51:41 2007
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<depend>res_adsi</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: branches/1.4/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=53780&r1=53779&r2=53780
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Fri Feb  9 17:51:41 2007
@@ -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>

Modified: branches/1.4/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/funcs/func_odbc.c?view=diff&rev=53780&r1=53779&r2=53780
==============================================================================
--- branches/1.4/funcs/func_odbc.c (original)
+++ branches/1.4/funcs/func_odbc.c Fri Feb  9 17:51:41 2007
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<depend>unixodbc</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"

Modified: branches/1.4/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_adsi.c?view=diff&rev=53780&r1=53779&r2=53780
==============================================================================
--- branches/1.4/res/res_adsi.c (original)
+++ branches/1.4/res/res_adsi.c Fri Feb  9 17:51:41 2007
@@ -1122,7 +1122,7 @@
 	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,

Modified: branches/1.4/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_config_odbc.c?view=diff&rev=53780&r1=53779&r2=53780
==============================================================================
--- branches/1.4/res/res_config_odbc.c (original)
+++ branches/1.4/res/res_config_odbc.c Fri Feb  9 17:51:41 2007
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<depend>unixodbc</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"