change modules.conf to be a local-only file that is auto-generated

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@609 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-02-14 16:42:26 +00:00
parent cb463b4e52
commit d1f821478b
6 changed files with 39 additions and 40 deletions

View File

@ -135,6 +135,7 @@ depends:
modules: $(NAME) modules: $(NAME)
@if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
@echo making modules @echo making modules
@rm -f build/freeswitch.env @rm -f build/freeswitch.env
@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"

View File

@ -1010,6 +1010,7 @@ depends:
rm build/freeswitch.env rm build/freeswitch.env
modules: $(NAME) modules: $(NAME)
@if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
@echo making modules @echo making modules
@rm -f build/freeswitch.env @rm -f build/freeswitch.env
@./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"

View File

@ -1,24 +0,0 @@
event_handlers/mod_zeroconf
applications/mod_bridgecall
applications/mod_playback
applications/mod_ivrtest
#applications/mod_skel
codecs/mod_gsm
codecs/mod_g711
codecs/mod_l16
codecs/mod_speex
dialplans/mod_dialplan_demo
endpoints/mod_exosip
endpoints/mod_iax
#endpoints/mod_opal
#endpoints/mod_portaudio
#endpoints/mod_wanpipe
endpoints/mod_woomera
#event_handlers/mod_event_test
event_handlers/mod_xmpp_event
formats/mod_sndfile
timers/mod_softtimer
dialplans/mod_pcre
directories/mod_ldap
dialplans/mod_dialplan_directory

View File

@ -1,14 +1,23 @@
# list the modules to build applications/mod_bridgecall
mod_bridgecall applications/mod_playback
mod_dialplan_demo applications/mod_ivrtest
mod_softtimer #applications/mod_skel
#mod_zaptimer codecs/mod_gsm
#mod_rtctimer codecs/mod_g711
mod_woomerachan codecs/mod_l16
mod_playback codecs/mod_speex
#mod_wanchan dialplans/mod_dialplan_demo
#mod_speexcodec endpoints/mod_exosip
#mod_speextest endpoints/mod_iax
#mod_exosip #endpoints/mod_opal
mod_g711codec #endpoints/mod_portaudio
mod_rawaudio #endpoints/mod_wanpipe
endpoints/mod_woomera
#event_handlers/mod_event_test
event_handlers/mod_xmpp_event
formats/mod_sndfile
timers/mod_softtimer
dialplans/mod_pcre
directories/mod_ldap
dialplans/mod_dialplan_directory
event_handlers/mod_zeroconf

View File

@ -860,7 +860,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
int netfd; int netfd;
int refresh; int refresh;
struct iax_event *iaxevent = NULL; struct iax_event *iaxevent = NULL;
switch_event *s_event;
load_config(); load_config();
if (globals.debug) { if (globals.debug) {
@ -877,6 +877,12 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "IAX Ready Port %d\n", globals.port); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "IAX Ready Port %d\n", globals.port);
if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_iax2._udp");
switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", globals.port);
switch_event_fire(&s_event);
}
for (;;) { for (;;) {
if (running == -1) { if (running == -1) {

View File

@ -862,7 +862,7 @@ static void *pri_thread_run(switch_thread *thread, void *obj)
{ {
struct sangoma_pri *spri = obj; struct sangoma_pri *spri = obj;
struct channel_map chanmap; struct channel_map chanmap;
switch_event *s_event;
SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANY, on_anything); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANY, on_anything);
SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_ring); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_ring);
SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing);
@ -874,6 +874,12 @@ static void *pri_thread_run(switch_thread *thread, void *obj)
spri->on_loop = check_flags; spri->on_loop = check_flags;
spri->private = &chanmap; spri->private = &chanmap;
if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_pri._tcp");
switch_event_fire(&s_event);
}
sangoma_run_pri(spri); sangoma_run_pri(spri);
free(spri); free(spri);