[svn-commits] kpfleming: branch 1.4 r136560 - in /branches/1.4: ./ build_tools/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Aug  7 13:25:31 2008
New Revision: 136560

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136560
Log:
change the required dependency for codec_dahdi to only be satisfied by DAHDI and not Zaptel, as the new transcoder interface is only in DAHDI


Modified:
    branches/1.4/build_tools/menuselect-deps.in
    branches/1.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/menuselect-deps.in?view=diff&rev=136560&r1=136559&r2=136560
==============================================================================
--- branches/1.4/build_tools/menuselect-deps.in (original)
+++ branches/1.4/build_tools/menuselect-deps.in Thu Aug  7 13:25:31 2008
@@ -33,7 +33,7 @@
 VORBIS=@PBX_VORBIS@
 VPBAPI=@PBX_VPB@
 ZAPTEL=@PBX_ZAPTEL@
-DAHDI_TRANSCODE=@PBX_ZAPTEL_TRANSCODE@
+DAHDI_TRANSCODE=@PBX_DAHDI_TRANSCODE@
 ZLIB=@PBX_ZLIB@
 ISDNNET=@PBX_ISDNNET@
 MISDN=@PBX_MISDN@

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=136560&r1=136559&r2=136560
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Aug  7 13:25:31 2008
@@ -441,8 +441,8 @@
 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)
+		PBX_DAHDI_TRANSCODE=1
+		AC_SUBST(PBX_DAHDI_TRANSCODE)
 	fi
 fi
 
@@ -1491,31 +1491,9 @@
    if test "${ac_cv_zaptel_vldtmf}" = "yes"; then
 	PBX_ZAPTEL_VLDTMF=1
    fi
-   AC_MSG_CHECKING(for ZT_TCOP_ALLOCATE in zaptel/zaptel.h)
-   saved_cppflags="${CPPFLAGS}"
-   if test "x${ZAPTEL_DIR}" != "x"; then
-      CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
-   fi
-   AC_COMPILE_IFELSE(
-	[
-	AC_LANG_PROGRAM(
-	[#include <zaptel/zaptel.h>],
-	[int foo = ZT_TCOP_ALLOCATE;])
-	],
-	[	AC_MSG_RESULT(yes) 
-		ac_cv_zaptel_transcode="yes" 
-	],
-	[	AC_MSG_RESULT(no) 
-		ac_cv_zaptel_transcode="no" 
-	]
-	)
-   CPPFLAGS="${saved_cppflags}"
-   if test "${ac_cv_zaptel_transcode}" = "yes"; then
-	PBX_ZAPTEL_TRANSCODE=1
-   fi
 fi
 AC_SUBST(PBX_ZAPTEL_VLDTMF)
-AC_SUBST(PBX_ZAPTEL_TRANSCODE)
+AC_SUBST(PBX_DAHDI_TRANSCODE)
 
 if test "x${PBX_ZAPTEL}" = "x1" ; then
 	PBX_DAHDI=1