[svn-commits] kpfleming: trunk r53782 - in /trunk: ./ apps/ build_tools/ channels/ funcs/ res/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb  9 17:53:51 2007
New Revision: 53782

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53782
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_adsiprog.c
    trunk/apps/app_voicemail.c
    trunk/build_tools/get_makeopts
    trunk/build_tools/get_moduleinfo
    trunk/channels/chan_gtalk.c
    trunk/funcs/func_odbc.c
    trunk/res/res_adsi.c
    trunk/res/res_config_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Feb  9 17:53:51 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: trunk/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/get_makeopts?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/build_tools/get_makeopts (original)
+++ trunk/build_tools/get_makeopts Fri Feb  9 17:53:51 2007
@@ -1,3 +1,3 @@
 /\/\*\*\* MAKEOPTS/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}

Modified: trunk/build_tools/get_moduleinfo
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/get_moduleinfo?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/build_tools/get_moduleinfo (original)
+++ trunk/build_tools/get_moduleinfo Fri Feb  9 17:53:51 2007
@@ -1,3 +1,3 @@
 /\/\*\*\* MODULEINFO/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
 // {if (printit) print}

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Fri Feb  9 17:53:51 2007
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>iksemel</depend>
+	<depend>res_jabber</depend>
  ***/
 
 #include "asterisk.h"

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

Modified: trunk/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_adsi.c?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/res/res_adsi.c (original)
+++ trunk/res/res_adsi.c Fri Feb  9 17:53:51 2007
@@ -1144,7 +1144,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: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=53782&r1=53781&r2=53782
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Fri Feb  9 17:53:51 2007
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<depend>unixodbc</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"