[asterisk-commits] russell: trunk r57557 - in /trunk: ./ configure configure.ac

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Mar  2 17:05:25 2007
New Revision: 57557

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57557
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=57557&r1=57556&r2=57557
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri Mar  2 17:05:25 2007
@@ -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 @@
 # 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 @@
 int
 main ()
 {
-int foo = ZT_TCOP_TRANSCODE;
+int foo = ZT_TCOP_ALLOCATE;
   ;
   return 0;
 }

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=57557&r1=57556&r2=57557
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar  2 17:05:25 2007
@@ -926,7 +926,7 @@
 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