- Add notes about voicemail depending on res_adsi

- Remove obsolete modules from modules.conf.sample
  (make install will warn if those exist on the machine)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36979 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 8f399f7fa02d5ca8ca26e503422d934608fab305..8c09889e2ab479752a906e7241f24b4e4852ab8e 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -25,6 +25,7 @@
  * \par See also
  * \arg \ref Config_vm
  * \ingroup applications
+ * \note This module requires res_adsi to load.
  */
 
 /*

diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
index 37d99b94089aee34705efe9a51e639e85987c7c6..48138e2847cc566c8795d126f04217c8647ddf48 100644 (file)
--- a/configs/modules.conf.sample
+++ b/configs/modules.conf.sample
@@ -29,19 +29,6 @@ noload => pbx_gtkconsole.so
 ;load => pbx_gtkconsole.so
 noload => pbx_kdeconsole.so
 ;
-; Intercom application is obsoleted by
-; chan_oss.  Don't load it.
-;
-noload => app_intercom.so
-;
-; The 'modem' channel driver and its subdrivers are
-; obsolete, don't load them.
-;
-noload => chan_modem.so
-noload => chan_modem_aopen.so
-noload => chan_modem_bestdata.so
-noload => chan_modem_i4l.so
-;
 load => res_musiconhold.so
 ;
 ; Load either OSS or ALSA, not both

diff --git a/res/res_adsi.c b/res/res_adsi.c
index 6d88f0d112fc9e8b2a42304f19fba5d0653e3da0..2d6273876f53a1e76624eb6706b109a1a612ed26 100644 (file)
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -23,6 +23,11 @@
  * \brief ADSI support 
  *
  * \author Mark Spencer <markster@digium.com> 
+ *
+ * \note this module is required by app_voicemail and app_getcpeid
+ * \todo Move app_getcpeid into this module
+ * \todo Create a core layer so that app_voicemail does not require
+ *     res_adsi to load
  */
 
 #include "asterisk.h"