From: Michiel van Baak <michiel@vanbaak.info>
Date: Tue, 16 Jun 2009 16:04:13 +0000 (+0000)
Subject: Merged revisions 200943 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12e5744655cb3df7cc2a4aa2172da299f21ce731;p=thirdparty%2Fasterisk.git

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 e2652246ac..1d7148adc0 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>