[asterisk-commits] oej: trunk r99596 - in /trunk: ./ apps/ channels/ res/

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Jan 22 11:46:43 2008
New Revision: 99596

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99596
Log:
Merged revisions 99594 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99594 | oej | 2008-01-22 18:41:57 +0100 (Tis, 22 Jan 2008) | 3 lines

Add more dependencies on chan_local and add a note to the description of chan_local
so that people don't disable it in menuselect just to clean up.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_followme.c
    trunk/channels/chan_agent.c
    trunk/channels/chan_local.c
    trunk/res/res_features.c

Change Statistics:
 0 files changed

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

Modified: trunk/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_followme.c?view=diff&rev=99596&r1=99595&r2=99596
==============================================================================
--- trunk/apps/app_followme.c (original)
+++ trunk/apps/app_followme.c Tue Jan 22 11:46:43 2008
@@ -27,6 +27,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=99596&r1=99595&r2=99596
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Tue Jan 22 11:46:43 2008
@@ -30,6 +30,9 @@
  *
  * \ingroup channel_drivers
  */
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
 
 #include "asterisk.h"
 

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=99596&r1=99595&r2=99596
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Tue Jan 22 11:46:43 2008
@@ -769,4 +769,4 @@
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Local Proxy Channel");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Local Proxy Channel (Note: used internally by other modules)");

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=99596&r1=99595&r2=99596
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Jan 22 11:46:43 2008
@@ -22,6 +22,10 @@
  *
  * \author Mark Spencer <markster at digium.com> 
  */
+
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
 
 #include "asterisk.h"