diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 18:25:31 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-07 18:25:31 +0000 |
| commit | a872994fcbb347608ad31c90d82bf88142bd9b0e (patch) | |
| tree | c9a8cdea153f3e193c94d38c7ddddabbb7c720d3 /configure.ac | |
| parent | 464dbba8f7fa9d652510fda0c8764afb6e857256 (diff) | |
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
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@136560 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index e5f6630c1..f7fe2a3f0 100644 --- a/configure.ac +++ b/configure.ac @@ -441,8 +441,8 @@ fi 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 "${PBX_ZAPTEL}" = 1 && test "x${PBX_DAHDI}" != "x1"; then 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 |