From: Olle Johansson <oej@edvina.net>
Date: Tue, 22 Jan 2008 17:46:43 +0000 (+0000)
Subject: Merged revisions 99594 via svnmerge from
X-Git-Tag: 1.6.0-beta2~2^2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=949bb30d03c5bb0569aea5390321d07dff57503f;p=thirdparty%2Fasterisk.git

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.

........


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

diff --git a/apps/app_followme.c b/apps/app_followme.c
index f670d65c07..2586637fa4 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -28,6 +28,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 56bb5561c6..f95ad8a8b8 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -30,6 +30,9 @@
  *
  * \ingroup channel_drivers
  */
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 46051c3835..130068e6fa 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -769,4 +769,4 @@ static int unload_module(void)
 	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)");
diff --git a/res/res_features.c b/res/res_features.c
index d9e8ef55ff..c6f68124e8 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+        <depend>chan_local</depend>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")