aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-16 16:04:13 +0000
committermvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-16 16:04:13 +0000
commit5cdb9619717d952111f0fc8e4ae38e329eb06295 (patch)
tree761dd172c732ea5b8fb96482fdcc392d9cb59a66 /apps
parent5b7ef2c274334d6ec7958bbf8b735370f75ca4fa (diff)
Merged revisions 200943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r200943 | mvanbaak | 2009-06-16 17:51:36 +0200 (Tue, 16 Jun 2009) | 9 lines add FILE_STORAGE to Voicemail Build Options Voicemail can only use one storage module at the moment. Because it's unclear that selecting one of the storage modules in menuselect will disable filesystem storage we now have a FILE_STORAGE option that conflicts with the other modules. (closes issue #15333) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@200947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e2652246a..1d7148adc 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -46,15 +46,22 @@ c-client (http://www.washington.edu/imap/
/*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so apps/app_directory.o apps/app_directory.so">
+ <member name="FILE_STORAGE" displayname="Storage of Voicemail using filesystem">
+ <conflict>ODBC_STORAGE</conflict>
+ <conflict>IMAP_STORAGE</conflict>
+ <defaultenabled>yes</defaultenabled>
+ </member>
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc</depend>
<depend>ltdl</depend>
<conflict>IMAP_STORAGE</conflict>
+ <conflict>FILE_STORAGE</conflict>
<defaultenabled>no</defaultenabled>
</member>
<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
<depend>imap_tk</depend>
<conflict>ODBC_STORAGE</conflict>
+ <conflict>FILE_STORAGE</conflict>
<use>ssl</use>
<defaultenabled>no</defaultenabled>
</member>