Merged revisions 57556 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57556 | russell | 2007-03-02 17:03:01 -0600 (Fri, 02 Mar 2007) | 3 lines

Update the check that is used to determine whether zaptel transcoder support
is present.  The interface has changed.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57557 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 957637b..3485dea 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 53851 .
+# From configure.ac Revision: 55077 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -36051,8 +36051,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Check for transcode support
 
     if test "x${PBX_ZAPTEL_TRANSCODE}" != "x1" -a "${USE_ZAPTEL_TRANSCODE}" != "no"; then
-       { echo "$as_me:$LINENO: checking for ZT_TCOP_TRANSCODE in zaptel/zaptel.h" >&5
-echo $ECHO_N "checking for ZT_TCOP_TRANSCODE in zaptel/zaptel.h... $ECHO_C" >&6; }
+       { 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_TRANSCODE_DIR}" != "x"; then
            ZAPTEL_TRANSCODE_INCLUDE= "-I${ZAPTEL_TRANSCODE_DIR}/include"
@@ -36069,7 +36069,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-int foo = ZT_TCOP_TRANSCODE;
+int foo = ZT_TCOP_ALLOCATE;
   ;
   return 0;
 }

diff --git a/configure.ac b/configure.ac
index d0ddea5..721f7c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -926,7 +926,7 @@ AST_C_DEFINE_CHECK([ZAPTEL], [ZT_DIAL_OP_CANCEL], [zaptel/zaptel.h], [90])
 AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_TONE_DTMF_BASE], [zaptel/zaptel.h])
 
 # Check for transcode support
-AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_TRANSCODE], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h])
 
 # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf
 case "${host_os}" in