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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@200947 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e2652246ac1900d44e0f486774be68854d59c82a..1d7148adc02eba72d7d8dd2eb4e587ace0387aa0 100644 (file)
--- 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>