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 | |
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
-rw-r--r-- | build_tools/menuselect-deps.in | 2 | ||||
-rwxr-xr-x | configure | 68 | ||||
-rw-r--r-- | configure.ac | 28 |
3 files changed, 8 insertions, 90 deletions
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 564a96731..c85144872 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -33,7 +33,7 @@ UNIXODBC=@PBX_UNIXODBC@ 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@ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 134536 . +# From configure.ac Revision: 134649 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -888,7 +888,7 @@ GC_CFLAGS GC_LDFLAGS AST_DECLARATION_AFTER_STATEMENT AST_NO_STRICT_OVERFLOW -PBX_ZAPTEL_TRANSCODE +PBX_DAHDI_TRANSCODE GSM_INTERNAL KDEINIT KDEDIR @@ -17224,7 +17224,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI}" = "x1" ; then - PBX_ZAPTEL_TRANSCODE=1 + PBX_DAHDI_TRANSCODE=1 fi fi @@ -30550,66 +30550,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "${ac_cv_zaptel_vldtmf}" = "yes"; then PBX_ZAPTEL_VLDTMF=1 fi - { echo "$as_me:$LINENO: checking for ZT_TCOP_ALLOCATE in zaptel/zaptel.h" >&5 -echo $ECHO_N "checking for ZT_TCOP_ALLOCATE in zaptel/zaptel.h... $ECHO_C" >&6; } - saved_cppflags="${CPPFLAGS}" - if test "x${ZAPTEL_DIR}" != "x"; then - CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include" - fi - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <zaptel/zaptel.h> -int -main () -{ -int foo = ZT_TCOP_ALLOCATE; - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - ac_cv_zaptel_transcode="yes" - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ac_cv_zaptel_transcode="no" - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - if test "${ac_cv_zaptel_transcode}" = "yes"; then - PBX_ZAPTEL_TRANSCODE=1 - fi fi @@ -32371,7 +32311,7 @@ GC_CFLAGS!$GC_CFLAGS$ac_delim GC_LDFLAGS!$GC_LDFLAGS$ac_delim AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim -PBX_ZAPTEL_TRANSCODE!$PBX_ZAPTEL_TRANSCODE$ac_delim +PBX_DAHDI_TRANSCODE!$PBX_DAHDI_TRANSCODE$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim KDEINIT!$KDEINIT$ac_delim KDEDIR!$KDEDIR$ac_delim 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 |