[asterisk-commits] jpeeler: branch jpeeler/chan_dahdi14 r121802 - in /team/jpeeler/chan_dahdi14:...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jun 11 10:59:49 2008
New Revision: 121802

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121802
Log:
properly detect transcoding with either zaptel or dahdi

Modified:
    team/jpeeler/chan_dahdi14/build_tools/menuselect-deps.in
    team/jpeeler/chan_dahdi14/codecs/codec_zap.c
    team/jpeeler/chan_dahdi14/configure.ac

Modified: team/jpeeler/chan_dahdi14/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi14/build_tools/menuselect-deps.in?view=diff&rev=121802&r1=121801&r2=121802
==============================================================================
--- team/jpeeler/chan_dahdi14/build_tools/menuselect-deps.in (original)
+++ team/jpeeler/chan_dahdi14/build_tools/menuselect-deps.in Wed Jun 11 10:59:49 2008
@@ -33,8 +33,7 @@
 VORBIS=@PBX_VORBIS@
 VPBAPI=@PBX_VPB@
 ZAPTEL=@PBX_ZAPTEL@
-ZAPTEL_VLDTMF=@PBX_ZAPTEL_VLDTMF@
-ZAPTEL_TRANSCODE=@PBX_ZAPTEL_TRANSCODE@
+DAHDI_TRANSCODE=@PBX_ZAPTEL_TRANSCODE@
 ZLIB=@PBX_ZLIB@
 ISDNNET=@PBX_ISDNNET@
 MISDN=@PBX_MISDN@

Modified: team/jpeeler/chan_dahdi14/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi14/codecs/codec_zap.c?view=diff&rev=121802&r1=121801&r2=121802
==============================================================================
--- team/jpeeler/chan_dahdi14/codecs/codec_zap.c (original)
+++ team/jpeeler/chan_dahdi14/codecs/codec_zap.c Wed Jun 11 10:59:49 2008
@@ -27,6 +27,7 @@
  */
 
 /*** MODULEINFO
+	<depend>dahdi_transcode</depend>
 	<depend>dahdi</depend>
  ***/
 

Modified: team/jpeeler/chan_dahdi14/configure.ac
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi14/configure.ac?view=diff&rev=121802&r1=121801&r2=121802
==============================================================================
--- team/jpeeler/chan_dahdi14/configure.ac (original)
+++ team/jpeeler/chan_dahdi14/configure.ac Wed Jun 11 10:59:49 2008
@@ -438,6 +438,10 @@
 
 if test "${USE_DAHDI}" != "no" ; then
 	AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
+	if test "x${PBX_DAHDI}" = "x1" ; then
+		PBX_ZAPTEL_TRANSCODE=1
+		AC_SUBST(PBX_ZAPTEL_TRANSCODE)
+	fi
 fi
 
 AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h])