diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2007-02-09 23:53:51 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-02-09 23:53:51 +0000 |
commit | e758ef09b3f16ea2453a2d63852da694fa32d648 (patch) | |
tree | 7ac3924b8461320812e28597155f6b5a8c41a79e /apps | |
parent | 32cd307d6f1d7f55dbc045e5a2ab5cfb55e8c293 (diff) |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_adsiprog.c | 4 | ||||
-rw-r--r-- | apps/app_voicemail.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index c61f6bf3f..40330152b 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 b79ba9628..3b8a8c34b 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> |