From e758ef09b3f16ea2453a2d63852da694fa32d648 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Fri, 9 Feb 2007 23:53:51 +0000
Subject: [PATCH] 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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_adsiprog.c | 4 ++++
apps/app_voicemail.c | 6 ++++++
build_tools/get_makeopts | 2 +-
build_tools/get_moduleinfo | 2 +-
channels/chan_gtalk.c | 1 +
funcs/func_odbc.c | 1 +
res/res_adsi.c | 2 +-
res/res_config_odbc.c | 1 +
8 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index c61f6bf3fb..40330152b0 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -25,6 +25,10 @@
* \ingroup applications
*/
+/*** MODULEINFO
+ <depend>res_adsi</depend>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b79ba96286..3b8a8c34bc 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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>
diff --git a/build_tools/get_makeopts b/build_tools/get_makeopts
index 15ad97b750..e63622afd1 100644
--- a/build_tools/get_makeopts
+++ b/build_tools/get_makeopts
@@ -1,3 +1,3 @@
/\/\*\*\* MAKEOPTS/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
// {if (printit) print}
diff --git a/build_tools/get_moduleinfo b/build_tools/get_moduleinfo
index 08ae61cbfc..d17c28e063 100644
--- a/build_tools/get_moduleinfo
+++ b/build_tools/get_moduleinfo
@@ -1,3 +1,3 @@
/\/\*\*\* MODULEINFO/ {printit=1; next}
-/\*\*\*\// {exit}
+/\*\*\*\// {if (printit) exit}
// {if (printit) print}
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index fa1d216aa1..f84d6d896b 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -27,6 +27,7 @@
/*** MODULEINFO
<depend>iksemel</depend>
+ <depend>res_jabber</depend>
***/
#include "asterisk.h"
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 03876779c4..5506c31b5f 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -28,6 +28,7 @@
/*** MODULEINFO
<depend>unixodbc</depend>
+ <depend>res_odbc</depend>
***/
#include "asterisk.h"
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 62f838198d..a384ac962f 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -1144,7 +1144,7 @@ static int unload_module(void)
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,
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 5c725a0e12..0e317640f3 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -30,6 +30,7 @@
/*** MODULEINFO
<depend>unixodbc</depend>
+ <depend>res_odbc</depend>
***/
#include "asterisk.h"
--
GitLab