Merged revisions 284610 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284610 | tilghman | 2010-09-02 00:20:59 -0500 (Thu, 02 Sep 2010) | 10 lines
  
  When optional_api is non-optional, force dependent modules to be loaded.
  
  (closes issue #17707)
   Reported by: ira
   Patches: 
         20100819__issue17707__asterisk1.8.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
   
  Review: https://reviewboard.asterisk.org/r/876/
........


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

7 files changed, 25 insertions, 7 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 8af1473d1..c138f0429 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1591,4 +1591,8 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programming Application",
+		.load = load_module,
+		.unload = unload_module,
+		.nonoptreq = "res_adsi",
+		);
diff --git a/apps/app_followme.c b/apps/app_followme.c
index fcab992d3..b17d5252b 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/manager.h"
 #include "asterisk/config.h"
-#include "asterisk/monitor.h"
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astdb.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 93df1623a..220708156 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -132,4 +132,8 @@ static int load_module(void)
 	return ast_register_application_xml(app, cpeid_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Get ADSI CPE ID");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID",
+		.load = load_module,
+		.unload = unload_module,
+		.nonoptreq = "res_adsi",
+		);
diff --git a/apps/app_queue.c b/apps/app_queue.c
index ccdee7fb3..08167b463 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -57,7 +57,7 @@
  */
 
 /*** MODULEINFO
-	<depend>res_monitor</depend>
+	<use>res_monitor</use>
  ***/
 
 #include "asterisk.h"
@@ -8197,5 +8197,6 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
 		.unload = unload_module,
 		.reload = reload,
 		.load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
+		.nonoptreq = "res_monitor",
 	       );
 
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 60af43640..0323f7c47 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -955,4 +955,8 @@ static int load_module(void)
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialplan Speech Applications");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applications",
+		.load = load_module,
+		.unload = unload_module,
+		.nonoptreq = "res_speech",
+		);
diff --git a/apps/app_stack.c b/apps/app_stack.c
index dcf13a00d..29c37a20b 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -704,4 +704,8 @@ static int load_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialplan subroutines (Gosub, Return, etc)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan subroutines (Gosub, Return, etc)",
+		.load = load_module,
+		.unload = unload_module,
+		.nonoptreq = "res_agi",
+		);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4ff67e371..5b050e99d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -38,7 +38,8 @@
  */
 
 /*** MODULEINFO
-	<depend>res_smdi</depend>
+	<use>res_adsi</use>
+	<use>res_smdi</use>
  ***/
 
 /*** MAKEOPTS
@@ -13085,4 +13086,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.nonoptreq = "res_adsi,res_smdi",
 		);