[asterisk-commits] mvanbaak: branch 1.6.1 r200947 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Tue Jun 16 11:04:13 2009
New Revision: 200947

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200947
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=200947&r1=200946&r2=200947
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Tue Jun 16 11:04:13 2009
@@ -46,15 +46,22 @@
 
 /*** 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>