backport chan_modem fixes from v1-2
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
59fe845c6c
commit
522544442b
|
@ -1,3 +1,7 @@
|
||||||
|
2005-11-16 Kevin P. Fleming <kpfleming@digium.com>
|
||||||
|
|
||||||
|
* Asterisk 1.2.0 released.
|
||||||
|
|
||||||
2005-11-16 Jeremy McNamara <jj@nufone.net>
|
2005-11-16 Jeremy McNamara <jj@nufone.net>
|
||||||
|
|
||||||
* apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
|
* apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
|
||||||
|
@ -10,6 +14,7 @@
|
||||||
2005-11-16 Kevin P. Fleming <kpfleming@digium.com>
|
2005-11-16 Kevin P. Fleming <kpfleming@digium.com>
|
||||||
|
|
||||||
* channels/Makefile: don't build chan_modem and sub-modules by default
|
* channels/Makefile: don't build chan_modem and sub-modules by default
|
||||||
|
* configs/modules.conf.sample: explicitly 'noload' chan_modem.so and submodules, in case old versions exist
|
||||||
|
|
||||||
* res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
|
* res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,9 @@ endif
|
||||||
ifneq (${OSARCH},Darwin)
|
ifneq (${OSARCH},Darwin)
|
||||||
ifneq (${OSARCH},SunOS)
|
ifneq (${OSARCH},SunOS)
|
||||||
ifneq (${OSARCH},CYGWIN)
|
ifneq (${OSARCH},CYGWIN)
|
||||||
CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
|
# the ISDN4Linux channel driver is probably broken on all modern kernels,
|
||||||
|
# but if you wish to try to use it, uncomment the line below
|
||||||
|
# CHANNEL_LIBS+=chan_oss.so chan_modem_i4l.so
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -31,10 +31,14 @@ noload => pbx_kdeconsole.so
|
||||||
;
|
;
|
||||||
noload => app_intercom.so
|
noload => app_intercom.so
|
||||||
;
|
;
|
||||||
; Explicitly load the chan_modem.so early on to be sure
|
; The 'modem' channel driver and its subdrivers are
|
||||||
; it loads before any of the chan_modem_* 's afte rit
|
; 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 => chan_modem.so
|
|
||||||
load => res_musiconhold.so
|
load => res_musiconhold.so
|
||||||
;
|
;
|
||||||
; Load either OSS or ALSA, not both
|
; Load either OSS or ALSA, not both
|
||||||
|
@ -47,4 +51,3 @@ noload => chan_alsa.so
|
||||||
; exported to modules loaded after them.
|
; exported to modules loaded after them.
|
||||||
;
|
;
|
||||||
[global]
|
[global]
|
||||||
;chan_modem.so=yes
|
|
||||||
|
|
Loading…
Reference in New Issue