diff options
| author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-16 16:05:36 +0000 |
|---|---|---|
| committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-16 16:05:36 +0000 |
| commit | 2fb6bfa39750e0e8d35e721b16f6b0b43f2c7227 (patch) | |
| tree | 46a9a764268e1a7368e41b0c036f269d799763a3 /apps | |
| parent | 809f4006657f24e49e9e8a382bb0fa06b949f42f (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.2@200948 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e668e831e..78de5066a 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>generic_odbc</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>openssl</use> <defaultenabled>no</defaultenabled> </member> |