kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 53779-53781 via svnmerge from

Browse Source 
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
This commit is contained in:
Kevin P. Fleming
2007-02-09 23:53:51 +00:00
parent 32cd307d6f
commit e758ef09b3
8 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_adsiprog.c
View File

@@ -25,6 +25,10 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>res_adsi</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")

6
apps/app_voicemail.c
View File

@@ -28,14 +28,20 @@
* \note This module requires res_adsi to load. * \note This module requires res_adsi to load.
*/ */
/*** MODULEINFO
<depend>res_adsi</depend>
***/
/*** MAKEOPTS /*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o"> <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"> <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc</depend> <depend>unixodbc</depend>
<conflict>IMAP_STORAGE</conflict>
<defaultenabled>no</defaultenabled> <defaultenabled>no</defaultenabled>
</member> </member>
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4"> <member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
<depend>imap_tk</depend> <depend>imap_tk</depend>
<conflict>ODBC_STORAGE</conflict>
<use>ssl</use> <use>ssl</use>
<defaultenabled>no</defaultenabled> <defaultenabled>no</defaultenabled>
</member> </member>

2
build_tools/get_makeopts
View File

@@ -1,3 +1,3 @@
/\/\*\*\* MAKEOPTS/ {printit=1; next} /\/\*\*\* MAKEOPTS/ {printit=1; next}
/\*\*\*\// {exit} /\*\*\*\// {if (printit) exit}
// {if (printit) print} // {if (printit) print}

2
build_tools/get_moduleinfo
View File

@@ -1,3 +1,3 @@
/\/\*\*\* MODULEINFO/ {printit=1; next} /\/\*\*\* MODULEINFO/ {printit=1; next}
/\*\*\*\// {exit} /\*\*\*\// {if (printit) exit}
// {if (printit) print} // {if (printit) print}

1
channels/chan_gtalk.c
View File

@@ -27,6 +27,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>iksemel</depend> <depend>iksemel</depend>
<depend>res_jabber</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

1
funcs/func_odbc.c
View File

@@ -28,6 +28,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc</depend> <depend>unixodbc</depend>
<depend>res_odbc</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"

2
res/res_adsi.c
View File

@@ -1144,7 +1144,7 @@ static int unload_module(void)
return -1; 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, .load = load_module,
.unload = unload_module, .unload = unload_module,
.reload = reload, .reload = reload,

1
res/res_config_odbc.c
View File

@@ -30,6 +30,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>unixodbc</depend> <depend>unixodbc</depend>
<depend>res_odbc</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"