Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

Conflicts:
	.gitignore
	conf/insideout/autoload_configs/modules.conf.xml
	conf/vanilla/autoload_configs/modules.conf.xml
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/switch_rtp.c
This commit is contained in:
David Yat Sin committed 2012-07-25 11:15:18 -04:00
commit 8b0fbe605c
798 files changed
+62919 -81329

No files matched your search

+9 -1
View File
@@ -1,4 +1,4 @@
# Copyright (c) 2007, Anthony Minessale II
# Copyright (c) 2007-2012, Anthony Minessale II
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -250,6 +250,14 @@ ftmod_r2_la_LDFLAGS = -shared -module -avoid-version -lopenr2
ftmod_r2_la_LIBADD = libfreetdm.la
endif
if HAVE_WAT
mod_LTLIBRARIES += ftmod_gsm.la
ftmod_gsm_la_SOURCES = $(SRC)/ftmod/ftmod_gsm/ftmod_gsm.c
ftmod_gsm_la_CFLAGS = $(FTDM_CFLAGS) $(AM_CFLAGS)
ftmod_gsm_la_LDFLAGS = -shared -module -avoid-version -lwat
ftmod_gsm_la_LIBADD = libfreetdm.la
endif
if HAVE_MISDN
mod_LTLIBRARIES += ftmod_misdn.la
ftmod_misdn_la_SOURCES = $(SRC)/ftmod/ftmod_misdn/ftmod_misdn.c