From 430ad26a152ad26f600fa36649441ee8be3ab64a Mon Sep 17 00:00:00 2001
From: mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 16 Jun 2009 16:02:08 +0000
Subject: 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.0@200945 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_voicemail.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'apps')

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3467b6c4a..d7f07793f 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>
-- 
cgit v1.2.3