From 2e0da1e8f75d8cc9be8b8a1169226a245ece95c5 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Fri, 5 May 2006 16:03:15 +0000
Subject: [PATCH] update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1372 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
libs/libspeakup/Makefile | 20 +-
libs/libspeakup/config.log | 852 +++++++++---------
libs/libspeakup/config.status | 20 +-
libs/libspeakup/libtool | 325 ++++++-
.../endpoints/mod_dingaling/mod_dingaling.c | 13 +-
src/switch_rtp.c | 69 +-
6 files changed, 801 insertions(+), 498 deletions(-)
diff --git a/libs/libspeakup/Makefile b/libs/libspeakup/Makefile
index 21d387e040..cda0f7b5d9 100644
--- a/libs/libspeakup/Makefile
+++ b/libs/libspeakup/Makefile
@@ -99,14 +99,14 @@ DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run aclocal-1.9
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run tar
+AMTAR = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run automake-1.9
+AUTOCONF = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run automake-1.9
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -126,8 +126,8 @@ ECHO_N = -n
ECHO_T =
EGREP = grep -E
EXEEXT =
-F77 =
-FFLAGS =
+F77 = g77
+FFLAGS = -g -O2
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
@@ -138,7 +138,7 @@ LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run makeinfo
OBJEXT = o
PACKAGE = libspeakup
PACKAGE_BUGREPORT = BUG-REPORT-ADDRESS
@@ -155,7 +155,7 @@ VERSION = 0.1
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
-ac_ct_F77 =
+ac_ct_F77 = g77
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
@@ -182,7 +182,7 @@ host_os = linux-gnu
host_vendor = pc
includedir = ${prefix}/include
infodir = ${prefix}/info
-install_sh = /usr/src/freeswitch.trunk/libs/libspeakup/install-sh
+install_sh = /usr/src/SVN/freeswitch/libs/libspeakup/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
diff --git a/libs/libspeakup/config.log b/libs/libspeakup/config.log
index 9639d7208d..e8cbdc44e2 100644
--- a/libs/libspeakup/config.log
+++ b/libs/libspeakup/config.log
@@ -4,17 +4,17 @@ running configure, to aid debugging if configure makes a mistake.
It was created by FULL-PACKAGE-NAME configure VERSION, which was
generated by GNU Autoconf 2.59. Invocation command line was
- $ ./configure --prefix=/usr/local/freeswitch --no-create --no-recursion
+ $ ./configure --prefix=/usr/local/freeswitch
## --------- ##
## Platform. ##
## --------- ##
-hostname = agentbox3
+hostname = sipxchange.pingtel-demo.vw
uname -m = i686
-uname -r = 2.6.9-r1
+uname -r = 2.6.9-34.EL
uname -s = Linux
-uname -v = #4 SMP Tue Mar 21 23:08:10 UTC 2006
+uname -v = #1 Fri Feb 24 16:44:51 EST 2006
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -27,6 +27,8 @@ hostinfo = unknown
/usr/bin/oslevel = unknown
/bin/universe = unknown
+PATH: /usr/kerberos/sbin
+PATH: /usr/kerberos/bin
PATH: /sbin
PATH: /usr/sbin
PATH: /bin
@@ -46,26 +48,26 @@ configure:1606: result: /usr/bin/install -c
configure:1617: checking whether build environment is sane
configure:1660: result: yes
configure:1725: checking for gawk
-configure:1741: found /usr/bin/gawk
+configure:1741: found /bin/gawk
configure:1751: result: gawk
-configure:1761: checking whether make sets $(MAKE)
+configure:1761: checking whether /usr/bin/gmake sets $(MAKE)
configure:1781: result: yes
configure:1999: checking for gcc
configure:2015: found /usr/bin/gcc
configure:2025: result: gcc
configure:2269: checking for C compiler version
configure:2272: gcc --version </dev/null >&5
-gcc (GCC) 3.3.4 (AsterLinux)
-Copyright (C) 2003 Free Software Foundation, Inc.
+gcc (GCC) 3.4.5 20051201 (Red Hat 3.4.5-2)
+Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
configure:2275: $? = 0
configure:2277: gcc -v </dev/null >&5
-Reading specs from /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/specs
-Configured with: ../gcc-3.3.4/configure --prefix=/usr --enable-languages=c,c++,objc --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --enable-shared --disable-nls
+Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.5/specs
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux
Thread model: posix
-gcc version 3.3.4 (AsterLinux)
+gcc version 3.4.5 20051201 (Red Hat 3.4.5-2)
configure:2280: $? = 0
configure:2282: gcc -V </dev/null >&5
gcc: `-V' option must have argument
@@ -116,17 +118,17 @@ configure:2705: test -s conftest.o
configure:2708: $? = 0
configure:2726: result: none needed
configure:2744: gcc -c -g -O2 conftest.c >&5
-conftest.c:2: error: parse error before "me"
+conftest.c:2: error: syntax error before "me"
configure:2750: $? = 1
configure: failed program was:
| #ifndef __cplusplus
| choke me
| #endif
-configure:2894: checking for style of include used by make
+configure:2894: checking for style of include used by /usr/bin/gmake
configure:2922: result: GNU
configure:2950: checking dependency style of gcc
configure:3040: result: gcc3
-configure:3057: checking whether make sets $(MAKE)
+configure:3057: checking whether /usr/bin/gmake sets $(MAKE)
configure:3077: result: yes
configure:3164: checking build system type
configure:3182: result: i686-pc-linux-gnu
@@ -192,158 +194,156 @@ configure:4124: test -z
configure:4127: $? = 0
configure:4130: test -s conftest.o
configure:4133: $? = 0
-configure:4219: gcc -o conftest -g -O2 conftest.c >&5
-configure:4222: $? = 0
-configure:4224: ./conftest
-configure:4227: $? = 0
-configure:4242: result: yes
-configure:4266: checking for sys/types.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4222: gcc -o conftest -g -O2 conftest.c >&5
+configure:4225: $? = 0
+configure:4227: ./conftest
+configure:4230: $? = 0
+configure:4245: result: yes
+configure:4269: checking for sys/types.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for sys/stat.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for sys/stat.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for stdlib.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for stdlib.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for string.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for string.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for memory.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for memory.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for strings.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for strings.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for inttypes.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for inttypes.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for stdint.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for stdint.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4266: checking for unistd.h
-configure:4282: gcc -c -g -O2 conftest.c >&5
-configure:4288: $? = 0
-configure:4292: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4269: checking for unistd.h
+configure:4285: gcc -c -g -O2 conftest.c >&5
+configure:4291: $? = 0
+configure:4295: test -z
|| test ! -s conftest.err
-configure:4295: $? = 0
-configure:4298: test -s conftest.o
-configure:4301: $? = 0
-configure:4312: result: yes
-configure:4338: checking dlfcn.h usability
-configure:4350: gcc -c -g -O2 conftest.c >&5
-configure:4356: $? = 0
-configure:4360: test -z
+configure:4298: $? = 0
+configure:4301: test -s conftest.o
+configure:4304: $? = 0
+configure:4315: result: yes
+configure:4341: checking dlfcn.h usability
+configure:4353: gcc -c -g -O2 conftest.c >&5
+configure:4359: $? = 0
+configure:4363: test -z
|| test ! -s conftest.err
-configure:4363: $? = 0
-configure:4366: test -s conftest.o
-configure:4369: $? = 0
-configure:4379: result: yes
-configure:4383: checking dlfcn.h presence
-configure:4393: gcc -E conftest.c
-configure:4399: $? = 0
-configure:4419: result: yes
-configure:4454: checking for dlfcn.h
-configure:4461: result: yes
-configure:4526: checking for g++
-configure:4542: found /usr/bin/g++
-configure:4552: result: g++
-configure:4568: checking for C++ compiler version
-configure:4571: g++ --version </dev/null >&5
-g++ (GCC) 3.3.4 (AsterLinux)
-Copyright (C) 2003 Free Software Foundation, Inc.
+configure:4366: $? = 0
+configure:4369: test -s conftest.o
+configure:4372: $? = 0
+configure:4382: result: yes
+configure:4386: checking dlfcn.h presence
+configure:4396: gcc -E conftest.c
+configure:4402: $? = 0
+configure:4422: result: yes
+configure:4457: checking for dlfcn.h
+configure:4464: result: yes
+configure:4529: checking for g++
+configure:4545: found /usr/bin/g++
+configure:4555: result: g++
+configure:4571: checking for C++ compiler version
+configure:4574: g++ --version </dev/null >&5
+g++ (GCC) 3.4.5 20051201 (Red Hat 3.4.5-2)
+Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:4574: $? = 0
-configure:4576: g++ -v </dev/null >&5
-Reading specs from /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/specs
-Configured with: ../gcc-3.3.4/configure --prefix=/usr --enable-languages=c,c++,objc --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --enable-shared --disable-nls
+configure:4577: $? = 0
+configure:4579: g++ -v </dev/null >&5
+Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.5/specs
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux
Thread model: posix
-gcc version 3.3.4 (AsterLinux)
-configure:4579: $? = 0
-configure:4581: g++ -V </dev/null >&5
+gcc version 3.4.5 20051201 (Red Hat 3.4.5-2)
+configure:4582: $? = 0
+configure:4584: g++ -V </dev/null >&5
g++: `-V' option must have argument
-configure:4584: $? = 1
-configure:4587: checking whether we are using the GNU C++ compiler
-configure:4611: g++ -c conftest.cc >&5
-configure:4617: $? = 0
-configure:4621: test -z
+configure:4587: $? = 1
+configure:4590: checking whether we are using the GNU C++ compiler
+configure:4614: g++ -c conftest.cc >&5
+configure:4620: $? = 0
+configure:4624: test -z
|| test ! -s conftest.err
-configure:4624: $? = 0
-configure:4627: test -s conftest.o
-configure:4630: $? = 0
-configure:4643: result: yes
-configure:4649: checking whether g++ accepts -g
-configure:4670: g++ -c -g conftest.cc >&5
-configure:4676: $? = 0
-configure:4680: test -z
+configure:4627: $? = 0
+configure:4630: test -s conftest.o
+configure:4633: $? = 0
+configure:4646: result: yes
+configure:4652: checking whether g++ accepts -g
+configure:4673: g++ -c -g conftest.cc >&5
+configure:4679: $? = 0
+configure:4683: test -z
|| test ! -s conftest.err
-configure:4683: $? = 0
-configure:4686: test -s conftest.o
-configure:4689: $? = 0
-configure:4700: result: yes
-configure:4742: g++ -c -g -O2 conftest.cc >&5
-configure:4748: $? = 0
-configure:4752: test -z
+configure:4686: $? = 0
+configure:4689: test -s conftest.o
+configure:4692: $? = 0
+configure:4703: result: yes
+configure:4745: g++ -c -g -O2 conftest.cc >&5
+configure:4751: $? = 0
+configure:4755: test -z
|| test ! -s conftest.err
-configure:4755: $? = 0
-configure:4758: test -s conftest.o
-configure:4761: $? = 0
-configure:4787: g++ -c -g -O2 conftest.cc >&5
+configure:4758: $? = 0
+configure:4761: test -s conftest.o
+configure:4764: $? = 0
+configure:4790: g++ -c -g -O2 conftest.cc >&5
conftest.cc: In function `int main()':
-conftest.cc:26: error: `exit' undeclared (first use this function)
-conftest.cc:26: error: (Each undeclared identifier is reported only once for
- each function it appears in.)
-configure:4793: $? = 1
+conftest.cc:26: error: `exit' was not declared in this scope
+configure:4796: $? = 1
configure: failed program was:
| /* confdefs.h. */
|
@@ -374,28 +374,28 @@ configure: failed program was:
| ;
| return 0;
| }
-configure:4742: g++ -c -g -O2 conftest.cc >&5
-configure:4748: $? = 0
-configure:4752: test -z
+configure:4745: g++ -c -g -O2 conftest.cc >&5
+configure:4751: $? = 0
+configure:4755: test -z
|| test ! -s conftest.err
-configure:4755: $? = 0
-configure:4758: test -s conftest.o
-configure:4761: $? = 0
-configure:4787: g++ -c -g -O2 conftest.cc >&5
-configure:4793: $? = 0
-configure:4797: test -z
+configure:4758: $? = 0
+configure:4761: test -s conftest.o
+configure:4764: $? = 0
+configure:4790: g++ -c -g -O2 conftest.cc >&5
+configure:4796: $? = 0
+configure:4800: test -z
|| test ! -s conftest.err
-configure:4800: $? = 0
-configure:4803: test -s conftest.o
-configure:4806: $? = 0
-configure:4831: checking dependency style of g++
-configure:4921: result: gcc3
-configure:4948: checking how to run the C++ preprocessor
-configure:4979: g++ -E conftest.cc
-configure:4985: $? = 0
-configure:5017: g++ -E conftest.cc
+configure:4803: $? = 0
+configure:4806: test -s conftest.o
+configure:4809: $? = 0
+configure:4834: checking dependency style of g++
+configure:4924: result: gcc3
+configure:4951: checking how to run the C++ preprocessor
+configure:4982: g++ -E conftest.cc
+configure:4988: $? = 0
+configure:5020: g++ -E conftest.cc
conftest.cc:25:28: ac_nonexistent.h: No such file or directory
-configure:5023: $? = 1
+configure:5026: $? = 1
configure: failed program was:
| /* confdefs.h. */
|
@@ -422,12 +422,12 @@ configure: failed program was:
| #endif
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5062: result: g++ -E
-configure:5086: g++ -E conftest.cc
-configure:5092: $? = 0
-configure:5124: g++ -E conftest.cc
+configure:5065: result: g++ -E
+configure:5089: g++ -E conftest.cc
+configure:5095: $? = 0
+configure:5127: g++ -E conftest.cc
conftest.cc:25:28: ac_nonexistent.h: No such file or directory
-configure:5130: $? = 1
+configure:5133: $? = 1
configure: failed program was:
| /* confdefs.h. */
|
@@ -454,258 +454,271 @@ configure: failed program was:
| #endif
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5227: checking for g77
-configure:5256: result: no
-configure:5227: checking for f77
-configure:5256: result: no
-configure:5227: checking for xlf
-configure:5256: result: no
-configure:5227: checking for frt
-configure:5256: result: no
-configure:5227: checking for pgf77
-configure:5256: result: no
-configure:5227: checking for fort77
-configure:5256: result: no
-configure:5227: checking for fl32
-configure:5256: result: no
-configure:5227: checking for af77
-configure:5256: result: no
-configure:5227: checking for f90
-configure:5256: result: no
-configure:5227: checking for xlf90
-configure:5256: result: no
-configure:5227: checking for pgf90
-configure:5256: result: no
-configure:5227: checking for epcf90
-configure:5256: result: no
-configure:5227: checking for f95
-configure:5256: result: no
-configure:5227: checking for fort
-configure:5256: result: no
-configure:5227: checking for xlf95
-configure:5256: result: no
-configure:5227: checking for ifc
-configure:5256: result: no
-configure:5227: checking for efc
-configure:5256: result: no
-configure:5227: checking for pgf95
-configure:5256: result: no
-configure:5227: checking for lf95
-configure:5256: result: no
-configure:5227: checking for gfortran
-configure:5256: result: no
+configure:5230: checking for g77
+configure:5246: found /usr/bin/g77
+configure:5256: result: g77
configure:5271: checking for Fortran 77 compiler version
-configure:5271: --version </dev/null >&5
-./configure: line 1: --version: command not found
-configure:5274: $? = 127
-configure:5276: -v </dev/null >&5
-./configure: line 1: -v: command not found
-configure:5279: $? = 127
-configure:5281: -V </dev/null >&5
-./configure: line 1: -V: command not found
-configure:5284: $? = 127
-configure:5292: checking whether we are using the GNU Fortran 77 compiler
-configure:5306: -c conftest.F >&5
-./configure: line 1: -c: command not found
-configure:5312: $? = 127
-configure: failed program was:
-| program main
-| #ifndef __GNUC__
-| choke me
-| #endif
-|
-| end
-configure:5338: result: no
-configure:5344: checking whether accepts -g
-configure:5356: -c -g conftest.f >&5
-./configure: line 1: -c: command not found
-configure:5362: $? = 127
-configure: failed program was:
-| program main
-|
-| end
-configure:5387: result: no
-configure:5417: checking the maximum length of command line arguments
-configure:5509: result: 32768
-configure:5520: checking command to parse /usr/bin/nm -B output from gcc object
-configure:5616: gcc -c -g -O2 conftest.c >&5
-configure:5619: $? = 0
-configure:5623: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:5626: $? = 0
-configure:5678: gcc -o conftest -g -O2 conftest.c conftstm.o >&5
-configure:5681: $? = 0
-configure:5719: result: ok
-configure:5723: checking for objdir
-configure:5738: result: .libs
-configure:5828: checking for ar
-configure:5844: found /usr/bin/ar
-configure:5855: result: ar
-configure:5908: checking for ranlib
-configure:5924: found /usr/bin/ranlib
-configure:5935: result: ranlib
-configure:5988: checking for strip
-configure:6004: found /usr/bin/strip
-configure:6015: result: strip
-configure:6302: checking if gcc static flag works
-configure:6330: result: yes
-configure:6348: checking if gcc supports -fno-rtti -fno-exceptions
+configure:5274: g77 --version </dev/null >&5
+GNU Fortran (GCC) 3.4.5 20051201 (Red Hat 3.4.5-2)
+Copyright (C) 2004 Free Software Foundation, Inc.
+
+GNU Fortran comes with NO WARRANTY, to the extent permitted by law.
+You may redistribute copies of GNU Fortran
+under the terms of the GNU General Public License.
+For more information about these matters, see the file named COPYING
+or type the command `info -f g77 Copying'.
+configure:5277: $? = 0
+configure:5279: g77 -v </dev/null >&5
+Reading specs from /usr/lib/gcc/i386-redhat-linux/3.4.5/specs
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-java-awt=gtk --host=i386-redhat-linux
+Thread model: posix
+gcc version 3.4.5 20051201 (Red Hat 3.4.5-2)
+configure:5282: $? = 0
+configure:5284: g77 -V </dev/null >&5
+g77: `-V' option must have argument
+configure:5287: $? = 1
+configure:5295: checking whether we are using the GNU Fortran 77 compiler
+configure:5309: g77 -c conftest.F >&5
+configure:5315: $? = 0
+configure:5319: test -z
+ || test ! -s conftest.err
+configure:5322: $? = 0
+configure:5325: test -s conftest.o
+configure:5328: $? = 0
+configure:5341: result: yes
+configure:5347: checking whether g77 accepts -g
+configure:5359: g77 -c -g conftest.f >&5
+configure:5365: $? = 0
+configure:5369: test -z
+ || test ! -s conftest.err
+configure:5372: $? = 0
+configure:5375: test -s conftest.o
+configure:5378: $? = 0
+configure:5390: result: yes
+configure:5420: checking the maximum length of command line arguments
+configure:5512: result: 32768
+configure:5523: checking command to parse /usr/bin/nm -B output from gcc object
+configure:5619: gcc -c -g -O2 conftest.c >&5
+configure:5622: $? = 0
+configure:5626: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
+configure:5629: $? = 0
+configure:5681: gcc -o conftest -g -O2 conftest.c conftstm.o >&5
+configure:5684: $? = 0
+configure:5722: result: ok
+configure:5726: checking for objdir
+configure:5741: result: .libs
+configure:5831: checking for ar
+configure:5847: found /usr/bin/ar
+configure:5858: result: ar
+configure:5911: checking for ranlib
+configure:5927: found /usr/bin/ranlib
+configure:5938: result: ranlib
+configure:5991: checking for strip
+configure:6007: found /usr/bin/strip
+configure:6018: result: strip
+configure:6305: checking if gcc static flag works
+configure:6333: result: yes
+configure:6351: checking if gcc supports -fno-rtti -fno-exceptions
configure:6369: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
-cc1: warning: "-fno-rtti" is valid for C++ but not for C/ObjC
+cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
configure:6373: $? = 0
-configure:6383: result: no
-configure:6398: checking for gcc option to produce PIC
-configure:6602: result: -fPIC
-configure:6610: checking if gcc PIC flag -fPIC works
+configure:6386: result: no
+configure:6401: checking for gcc option to produce PIC
+configure:6605: result: -fPIC
+configure:6613: checking if gcc PIC flag -fPIC works
configure:6631: gcc -c -g -O2 -fPIC -DPIC conftest.c >&5
configure:6635: $? = 0
-configure:6645: result: yes
-configure:6669: checking if gcc supports -c -o file.o
+configure:6648: result: yes
+configure:6672: checking if gcc supports -c -o file.o
configure:6693: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5
configure:6697: $? = 0
-configure:6716: result: yes
-configure:6742: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:7638: result: yes
-configure:7664: checking whether -lc should be explicitly linked in
-configure:7669: gcc -c -g -O2 conftest.c >&5
-configure:7672: $? = 0
-configure:7686: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep -lc \>/dev/null 2\>\&1
-configure:7689: $? = 0
-configure:7701: result: no
-configure:7709: checking dynamic linker characteristics
-configure:8255: result: GNU/Linux ld.so
-configure:8259: checking how to hardcode library paths into programs
-configure:8284: result: immediate
-configure:8298: checking whether stripping libraries is possible
-configure:8303: result: yes
-configure:9133: checking if libtool supports shared libraries
-configure:9135: result: yes
-configure:9138: checking whether to build shared libraries
-configure:9159: result: yes
-configure:9162: checking whether to build static libraries
-configure:9166: result: yes
-configure:9258: creating libtool
-configure:9836: checking for ld used by g++
-configure:9903: result: /usr/bin/ld
-configure:9912: checking if the linker (/usr/bin/ld) is GNU ld
-configure:9927: result: yes
-configure:9978: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:10865: result: yes
-configure:10883: g++ -c -g -O2 conftest.cc >&5
-configure:10886: $? = 0
-configure:10982: checking for g++ option to produce PIC
-configure:11250: result: -fPIC
-configure:11258: checking if g++ PIC flag -fPIC works
+configure:6719: result: yes
+configure:6745: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
+configure:7641: result: yes
+configure:7667: checking whether -lc should be explicitly linked in
+configure:7672: gcc -c -g -O2 conftest.c >&5
+configure:7675: $? = 0
+configure:7689: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep -lc \>/dev/null 2\>\&1
+configure:7692: $? = 0
+configure:7704: result: no
+configure:7712: checking dynamic linker characteristics
+configure:8258: result: GNU/Linux ld.so
+configure:8262: checking how to hardcode library paths into programs
+configure:8287: result: immediate
+configure:8301: checking whether stripping libraries is possible
+configure:8306: result: yes
+configure:9136: checking if libtool supports shared libraries
+configure:9138: result: yes
+configure:9141: checking whether to build shared libraries
+configure:9162: result: yes
+configure:9165: checking whether to build static libraries
+configure:9169: result: yes
+configure:9261: creating libtool
+configure:9839: checking for ld used by g++
+configure:9906: result: /usr/bin/ld
+configure:9915: checking if the linker (/usr/bin/ld) is GNU ld
+configure:9930: result: yes
+configure:9981: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:10868: result: yes
+configure:10886: g++ -c -g -O2 conftest.cc >&5
+configure:10889: $? = 0
+configure:10985: checking for g++ option to produce PIC
+configure:11253: result: -fPIC
+configure:11261: checking if g++ PIC flag -fPIC works
configure:11279: g++ -c -g -O2 -fPIC -DPIC conftest.cc >&5
configure:11283: $? = 0
-configure:11293: result: yes
-configure:11317: checking if g++ supports -c -o file.o
+configure:11296: result: yes
+configure:11320: checking if g++ supports -c -o file.o
configure:11341: g++ -c -g -O2 -o out/conftest2.o conftest.cc >&5
configure:11345: $? = 0
-configure:11364: result: yes
-configure:11390: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:11415: result: yes
-configure:11486: checking dynamic linker characteristics
-configure:12032: result: GNU/Linux ld.so
-configure:12036: checking how to hardcode library paths into programs
-configure:12061: result: immediate
-configure:12075: checking whether stripping libraries is possible
-configure:12080: result: yes
-configure:19599: checking for a BSD-compatible install
-configure:19654: result: /usr/bin/install -c
-configure:19675: checking for dirent.h that defines DIR
-configure:19699: gcc -c -g -O2 conftest.c >&5
-configure:19705: $? = 0
-configure:19709: test -z
+configure:11367: result: yes
+configure:11393: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:11418: result: yes
+configure:11489: checking dynamic linker characteristics
+configure:12035: result: GNU/Linux ld.so
+configure:12039: checking how to hardcode library paths into programs
+configure:12064: result: immediate
+configure:12078: checking whether stripping libraries is possible
+configure:12083: result: yes
+configure:13419: checking if libtool supports shared libraries
+configure:13421: result: yes
+configure:13424: checking whether to build shared libraries
+configure:13444: result: yes
+configure:13447: checking whether to build static libraries
+configure:13451: result: yes
+configure:13463: checking for g77 option to produce PIC
+configure:13667: result: -fPIC
+configure:13675: checking if g77 PIC flag -fPIC works
+configure:13693: g77 -c -g -O2 -fPIC conftest.f >&5
+configure:13697: $? = 0
+configure:13710: result: yes
+configure:13734: checking if g77 supports -c -o file.o
+configure:13755: g77 -c -g -O2 -o out/conftest2.o conftest.f >&5
+configure:13759: $? = 0
+configure:13781: result: yes
+configure:13807: checking whether the g77 linker (/usr/bin/ld) supports shared libraries
+configure:14683: result: yes
+configure:14754: checking dynamic linker characteristics
+configure:15300: result: GNU/Linux ld.so
+configure:15304: checking how to hardcode library paths into programs
+configure:15329: result: immediate
+configure:15343: checking whether stripping libraries is possible
+configure:15348: result: yes
+configure:19602: checking for a BSD-compatible install
+configure:19657: result: /usr/bin/install -c
+configure:19678: checking for dirent.h that defines DIR
+configure:19702: gcc -c -g -O2 conftest.c >&5
+configure:19708: $? = 0
+configure:19712: test -z
|| test ! -s conftest.err
-configure:19712: $? = 0
-configure:19715: test -s conftest.o
-configure:19718: $? = 0
-configure:19729: result: yes
-configure:19742: checking for library containing opendir
-configure:19772: gcc -o conftest -g -O2 conftest.c >&5
-configure:19778: $? = 0
-configure:19782: test -z
+configure:19715: $? = 0
+configure:19718: test -s conftest.o
+configure:19721: $? = 0
+configure:19732: result: yes
+configure:19745: checking for library containing opendir
+configure:19775: gcc -o conftest -g -O2 conftest.c >&5
+configure:19781: $? = 0
+configure:19785: test -z
|| test ! -s conftest.err
-configure:19785: $? = 0
-configure:19788: test -s conftest
-configure:19791: $? = 0
-configure:19861: result: none required
-configure:19997: checking for ANSI C header files
-configure:20150: result: yes
-configure:20163: checking for an ANSI C-conforming const
-configure:20230: gcc -c -g -O2 conftest.c >&5
-configure:20236: $? = 0
-configure:20240: test -z
+configure:19788: $? = 0
+configure:19791: test -s conftest
+configure:19794: $? = 0
+configure:19864: result: none required
+configure:20000: checking for ANSI C header files
+configure:20156: result: yes
+configure:20169: checking for an ANSI C-conforming const
+configure:20236: gcc -c -g -O2 conftest.c >&5
+configure:20242: $? = 0
+configure:20246: test -z
|| test ! -s conftest.err
-configure:20243: $? = 0
-configure:20246: test -s conftest.o
configure:20249: $? = 0
-configure:20260: result: yes
-configure:20270: checking for inline
-configure:20291: gcc -c -g -O2 conftest.c >&5
-configure:20297: $? = 0
-configure:20301: test -z
+configure:20252: test -s conftest.o
+configure:20255: $? = 0
+configure:20266: result: yes
+configure:20276: checking for inline
+configure:20297: gcc -c -g -O2 conftest.c >&5
+configure:20303: $? = 0
+configure:20307: test -z
|| test ! -s conftest.err
-configure:20304: $? = 0
-configure:20307: test -s conftest.o
configure:20310: $? = 0
-configure:20322: result: inline
-configure:20341: checking for size_t
-configure:20365: gcc -c -g -O2 conftest.c >&5
-configure:20371: $? = 0
-configure:20375: test -z
+configure:20313: test -s conftest.o
+configure:20316: $? = 0
+configure:20328: result: inline
+configure:20347: checking for size_t
+configure:20371: gcc -c -g -O2 conftest.c >&5
+configure:20377: $? = 0
+configure:20381: test -z
|| test ! -s conftest.err
-configure:20378: $? = 0
-configure:20381: test -s conftest.o
configure:20384: $? = 0
-configure:20395: result: yes
-configure:20407: checking whether time.h and sys/time.h may both be included
-configure:20432: gcc -c -g -O2 conftest.c >&5
-configure:20438: $? = 0
-configure:20442: test -z
+configure:20387: test -s conftest.o
+configure:20390: $? = 0
+configure:20401: result: yes
+configure:20413: checking whether time.h and sys/time.h may both be included
+configure:20438: gcc -c -g -O2 conftest.c >&5
+configure:20444: $? = 0
+configure:20448: test -z
|| test ! -s conftest.err
-configure:20445: $? = 0
-configure:20448: test -s conftest.o
configure:20451: $? = 0
-configure:20462: result: yes
-configure:20472: checking whether struct tm is in sys/time.h or time.h
-configure:20495: gcc -c -g -O2 conftest.c >&5
-configure:20501: $? = 0
-configure:20505: test -z
+configure:20454: test -s conftest.o
+configure:20457: $? = 0
+configure:20468: result: yes
+configure:20478: checking whether struct tm is in sys/time.h or time.h
+configure:20501: gcc -c -g -O2 conftest.c >&5
+configure:20507: $? = 0
+configure:20511: test -z
|| test ! -s conftest.err
-configure:20508: $? = 0
-configure:20511: test -s conftest.o
configure:20514: $? = 0
-configure:20525: result: time.h
-configure:20538: checking whether gcc needs -traditional
-configure:20580: result: no
-configure:20592: checking for stdlib.h
-configure:20597: result: yes
-configure:20737: checking for GNU libc compatible malloc
-configure:20766: gcc -o conftest -g -O2 conftest.c >&5
-configure:20769: $? = 0
-configure:20771: ./conftest
-configure:20774: $? = 0
-configure:20788: result: yes
-configure:20818: checking return type of signal handlers
-configure:20849: gcc -c -g -O2 conftest.c >&5
-configure:20855: $? = 0
-configure:20859: test -z
+configure:20517: test -s conftest.o
+configure:20520: $? = 0
+configure:20531: result: time.h
+configure:20544: checking whether gcc needs -traditional
+configure:20586: result: no
+configure:20598: checking for stdlib.h
+configure:20603: result: yes
+configure:20743: checking for GNU libc compatible malloc
+configure:20772: gcc -o conftest -g -O2 conftest.c >&5
+configure:20775: $? = 0
+configure:20777: ./conftest
+configure:20780: $? = 0
+configure:20794: result: yes
+configure:20824: checking return type of signal handlers
+configure:20855: gcc -c -g -O2 conftest.c >&5
+configure:20861: $? = 0
+configure:20865: test -z
|| test ! -s conftest.err
-configure:20862: $? = 0
-configure:20865: test -s conftest.o
configure:20868: $? = 0
-configure:20879: result: void
-configure:20891: checking for strftime
-configure:20948: gcc -o conftest -g -O2 conftest.c >&5
-configure:20954: $? = 0
-configure:20958: test -z
+configure:20871: test -s conftest.o
+configure:20874: $? = 0
+configure:20885: result: void
+configure:20897: checking for strftime
+configure:20954: gcc -o conftest -g -O2 conftest.c >&5
+conftest.c:55: warning: conflicting types for built-in function 'strftime'
+configure:20960: $? = 0
+configure:20964: test -z
|| test ! -s conftest.err
-configure:20961: $? = 0
-configure:20964: test -s conftest
configure:20967: $? = 0
-configure:20979: result: yes
-configure:21215: creating ./config.status
+configure:20970: test -s conftest
+configure:20973: $? = 0
+configure:20985: result: yes
+configure:21221: creating ./config.status
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FULL-PACKAGE-NAME config.status VERSION, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+
+ CONFIG_FILES =
+ CONFIG_HEADERS =
+ CONFIG_LINKS =
+ CONFIG_COMMANDS =
+ $ ./config.status
+
+on sipxchange.pingtel-demo.vw
+
+config.status:706: creating Makefile
+config.status:889: executing depfiles commands
## ---------------- ##
## Cache variables. ##
@@ -744,7 +757,7 @@ ac_cv_env_host_alias_value=
ac_cv_env_target_alias_set=
ac_cv_env_target_alias_value=
ac_cv_exeext=
-ac_cv_f77_compiler_gnu=no
+ac_cv_f77_compiler_gnu=yes
ac_cv_func_malloc_0_nonnull=yes
ac_cv_func_strftime=yes
ac_cv_header_dirent_dirent_h=yes
@@ -770,15 +783,16 @@ ac_cv_prog_CXXCPP='g++ -E'
ac_cv_prog_ac_ct_AR=ar
ac_cv_prog_ac_ct_CC=gcc
ac_cv_prog_ac_ct_CXX=g++
+ac_cv_prog_ac_ct_F77=g77
ac_cv_prog_ac_ct_RANLIB=ranlib
ac_cv_prog_ac_ct_STRIP=strip
ac_cv_prog_cc_g=yes
ac_cv_prog_cc_stdc=
ac_cv_prog_cxx_g=yes
ac_cv_prog_egrep='grep -E'
-ac_cv_prog_f77_g=no
+ac_cv_prog_f77_g=yes
ac_cv_prog_gcc_traditional=no
-ac_cv_prog_make_make_set=yes
+ac_cv_prog_make__usr_bin_gmake_set=yes
ac_cv_search_opendir='none required'
ac_cv_struct_tm=time.h
ac_cv_type_signal=void
@@ -796,6 +810,7 @@ lt_cv_path_NM='/usr/bin/nm -B'
lt_cv_path_SED=/bin/sed
lt_cv_prog_compiler_c_o=yes
lt_cv_prog_compiler_c_o_CXX=yes
+lt_cv_prog_compiler_c_o_F77=yes
lt_cv_prog_compiler_rtti_exceptions=no
lt_cv_prog_gnu_ld=yes
lt_cv_prog_gnu_ldcxx=yes
@@ -805,6 +820,7 @@ lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p
lt_cv_sys_max_cmd_len=32768
lt_lt_cv_prog_compiler_c_o='"yes"'
lt_lt_cv_prog_compiler_c_o_CXX='"yes"'
+lt_lt_cv_prog_compiler_c_o_F77='"yes"'
lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'\''"'
lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'\''"'
lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"'
@@ -813,15 +829,15 @@ lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern in
## Output variables. ##
## ----------------- ##
-ACLOCAL='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run aclocal-1.9'
+ACLOCAL='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run aclocal-1.9'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
-AMTAR='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run tar'
+AMTAR='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run tar'
AR='ar'
-AUTOCONF='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoconf'
-AUTOHEADER='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoheader'
-AUTOMAKE='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run automake-1.9'
+AUTOCONF='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoconf'
+AUTOHEADER='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoheader'
+AUTOMAKE='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run automake-1.9'
AWK='gawk'
CC='gcc'
CCDEPMODE='depmode=gcc3'
@@ -841,8 +857,8 @@ ECHO_N='-n'
ECHO_T=''
EGREP='grep -E'
EXEEXT=''
-F77=''
-FFLAGS=''
+F77='g77'
+FFLAGS='-g -O2'
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
@@ -853,7 +869,7 @@ LIBS=''
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
LN_S='ln -s'
LTLIBOBJS=''
-MAKEINFO='${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run makeinfo'
+MAKEINFO='${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run makeinfo'
OBJEXT='o'
PACKAGE='libspeakup'
PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
@@ -870,7 +886,7 @@ VERSION='0.1'
ac_ct_AR='ar'
ac_ct_CC='gcc'
ac_ct_CXX='g++'
-ac_ct_F77=''
+ac_ct_F77='g77'
ac_ct_RANLIB='ranlib'
ac_ct_STRIP='strip'
am__fastdepCC_FALSE='#'
@@ -897,7 +913,7 @@ host_os='linux-gnu'
host_vendor='pc'
includedir='${prefix}/include'
infodir='${prefix}/info'
-install_sh='/usr/src/freeswitch.trunk/libs/libspeakup/install-sh'
+install_sh='/usr/src/SVN/freeswitch/libs/libspeakup/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localstatedir='${prefix}/var'
@@ -945,21 +961,3 @@ target_alias=''
extern "C" void std::exit (int) throw (); using std::exit;
configure: exit 0
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by FULL-PACKAGE-NAME config.status VERSION, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES =
- CONFIG_HEADERS =
- CONFIG_LINKS =
- CONFIG_COMMANDS =
- $ ./config.status
-
-on agentbox3
-
-config.status:706: creating Makefile
-config.status:889: executing depfiles commands
diff --git a/libs/libspeakup/config.status b/libs/libspeakup/config.status
index 0131bca586..46abaf38b3 100755
--- a/libs/libspeakup/config.status
+++ b/libs/libspeakup/config.status
@@ -480,12 +480,12 @@ s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
s,@CYGPATH_W@,echo,;t t
s,@PACKAGE@,libspeakup,;t t
s,@VERSION@,0.1,;t t
-s,@ACLOCAL@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run makeinfo,;t t
-s,@install_sh@,/usr/src/freeswitch.trunk/libs/libspeakup/install-sh,;t t
+s,@ACLOCAL@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run aclocal-1.9,;t t
+s,@AUTOCONF@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoconf,;t t
+s,@AUTOMAKE@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run automake-1.9,;t t
+s,@AUTOHEADER@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run autoheader,;t t
+s,@MAKEINFO@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run makeinfo,;t t
+s,@install_sh@,/usr/src/SVN/freeswitch/libs/libspeakup/install-sh,;t t
s,@STRIP@,strip,;t t
s,@ac_ct_STRIP@,strip,;t t
s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
@@ -493,7 +493,7 @@ s,@mkdir_p@,mkdir -p --,;t t
s,@AWK@,gawk,;t t
s,@SET_MAKE@,,;t t
s,@am__leading_dot@,.,;t t
-s,@AMTAR@,${SHELL} /usr/src/freeswitch.trunk/libs/libspeakup/missing --run tar,;t t
+s,@AMTAR@,${SHELL} /usr/src/SVN/freeswitch/libs/libspeakup/missing --run tar,;t t
s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
s,@am__untar@,${AMTAR} xf -,;t t
s,@CC@,gcc,;t t
@@ -535,9 +535,9 @@ s,@CXXDEPMODE@,depmode=gcc3,;t t
s,@am__fastdepCXX_TRUE@,,;t t
s,@am__fastdepCXX_FALSE@,#,;t t
s,@CXXCPP@,g++ -E,;t t
-s,@F77@,,;t t
-s,@FFLAGS@,,;t t
-s,@ac_ct_F77@,,;t t
+s,@F77@,g77,;t t
+s,@FFLAGS@,-g -O2,;t t
+s,@ac_ct_F77@,g77,;t t
s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
s,@LIBOBJS@,,;t t
s,@LTLIBOBJS@,,;t t
diff --git a/libs/libspeakup/libtool b/libs/libspeakup/libtool
index db8cfbce7d..6cf9ddc76a 100755
--- a/libs/libspeakup/libtool
+++ b/libs/libspeakup/libtool
@@ -40,11 +40,11 @@ Xsed="/bin/sed -e 1s/^X//"
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# The names of the tagged configurations supported by this script.
-available_tags=" CXX"
+available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
-# Libtool was configured on host agentbox3:
+# Libtool was configured on host sipxchange.pingtel-demo.vw:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -322,10 +322,10 @@ variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBR
link_all_deplibs=unknown
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../ /lib/i686-pc-linux-gnu/3.3.4/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../ /lib/i386-redhat-linux/3.4.5/ /lib/ /usr/lib/i386-redhat-linux/3.4.5/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/freeswitch/lib /root/pwlib/lib /root/opal/lib /usr/X11R6/lib /usr/local/lib /opt/swift/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/local/freeswitch/lib /usr/X11R6/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -6751,7 +6751,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured on host agentbox3:
+# Libtool was configured on host sipxchange.pingtel-demo.vw:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -6930,11 +6930,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../crti.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/crtbeginS.o"
+predep_objects="/usr/lib/gcc/i386-redhat-linux/3.4.5/../../../crti.o /usr/lib/gcc/i386-redhat-linux/3.4.5/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/crtendS.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../crtn.o"
+postdep_objects="/usr/lib/gcc/i386-redhat-linux/3.4.5/crtendS.o /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -6946,7 +6946,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4 -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/i386-redhat-linux/3.4.5 -L/usr/lib/gcc/i386-redhat-linux/3.4.5 -L/usr/lib/gcc/i386-redhat-linux/3.4.5/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -7026,10 +7026,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../ /lib/i686-pc-linux-gnu/3.3.4/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../ /lib/i386-redhat-linux/3.4.5/ /lib/ /usr/lib/i386-redhat-linux/3.4.5/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/freeswitch/lib /root/pwlib/lib /root/opal/lib /usr/X11R6/lib /usr/local/lib /opt/swift/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/local/freeswitch/lib /usr/X11R6/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -7051,3 +7051,308 @@ include_expsyms=""
# ### END LIBTOOL TAG CONFIG: CXX
+# ### BEGIN LIBTOOL TAG CONFIG: F77
+
+# Libtool was configured on host sipxchange.pingtel-demo.vw:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=i686-pc-linux-gnu
+host_os=linux-gnu
+
+# The build system.
+build_alias=
+build=i686-pc-linux-gnu
+build_os=linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc"
+
+# A language-specific compiler.
+CC="g77"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=32768
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=unknown
+
+# Whether dlopen of programs is supported.
+dlopen_self=unknown
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=unknown
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=""
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+ cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+ \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=""
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=""
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# If ld is used when linking, flag to hardcode $libdir into
+# a binary during linking. This must work even if $libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=unknown
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=" /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../../i386-redhat-linux/lib/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../i386-redhat-linux/3.4.5/ /usr/lib/gcc/i386-redhat-linux/3.4.5/../../../ /lib/i386-redhat-linux/3.4.5/ /lib/ /usr/lib/i386-redhat-linux/3.4.5/ /usr/lib/"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/qt-3.3/lib /usr/X11R6/lib /usr/local/freeswitch/lib /usr/X11R6/lib "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL TAG CONFIG: F77
+
diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index b4da2407e4..8d866d38f9 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -758,6 +758,13 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
}
payload = tech_pvt->read_frame.payload;
+ if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) {
+ char dtmf[128];
+ switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf));
+ switch_channel_queue_dtmf(channel, dtmf);
+ switch_set_flag(tech_pvt, TFLAG_DTMF);
+ }
+
if (switch_test_flag(tech_pvt, TFLAG_DTMF)) {
switch_clear_flag(tech_pvt, TFLAG_DTMF);
return SWITCH_STATUS_BREAK;
@@ -767,12 +774,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
tech_pvt->read_frame.datalen = tech_pvt->last_read ? tech_pvt->last_read : tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
}
- if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) {
- char dtmf[128];
- switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf));
- switch_channel_queue_dtmf(channel, dtmf);
- }
-
if (tech_pvt->read_frame.datalen > 0) {
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
frames = (tech_pvt->read_frame.datalen / bytes);
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 4949e99303..0e8996d3ac 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -710,10 +710,9 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
}
bytes = sbytes;
}
-
+
if (bytes > 0) {
uint32_t effective_size = (uint32_t)(bytes - sizeof(srtp_mini_hdr_t));
-
if (rtp_session->recv_msg.header.pt == RTP_MAGIC_NUMBER) {
if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) {
switch_set_flag(rtp_session, SWITCH_RTP_FLAG_MINI);
@@ -724,7 +723,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
continue;
}
-
+
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI) && rtp_session->rpacket_size && effective_size > 0) {
uint32_t mfactor = (effective_size % rtp_session->rpacket_size);
@@ -807,6 +806,38 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
return 0;
}
+ /* RFC2833 ... TBD try harder to honor the duration etc.*/
+ if (rtp_session->recv_msg.header.pt == 101) {
+ unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body;
+ int end = packet[1]&0x80;
+ int duration = (packet[2]<<8) + packet[3];
+ char key = switch_rfc2833_to_char(packet[0]);
+
+ /* SHEESH.... Curse you RFC2833 inventors!!!!*/
+ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) {
+ rtp_session->dtmf_data.last_digit = 0;
+ rtp_session->dtmf_data.dc = 0;
+ }
+ if (duration && end) {
+ if (key != rtp_session->dtmf_data.last_digit) {
+ char digit_str[] = {key, 0};
+ time(&rtp_session->dtmf_data.last_digit_time);
+ switch_rtp_queue_dtmf(rtp_session, digit_str);
+ }
+ if (++rtp_session->dtmf_data.dc >= 3) {
+ rtp_session->dtmf_data.last_digit = 0;
+ rtp_session->dtmf_data.dc = 0;
+ }
+
+ rtp_session->dtmf_data.last_digit = key;
+ } else {
+ rtp_session->dtmf_data.last_digit = 0;
+ rtp_session->dtmf_data.dc = 0;
+ }
+
+ continue;
+ }
+
break;
}
@@ -815,38 +846,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
*payload_type = rtp_session->recv_msg.header.pt;
- /* RFC2833 ... TBD try harder to honor the duration etc.*/
- if (*payload_type == 101) {
- unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body;
- int end = packet[1]&0x80;
- int duration = (packet[2]<<8) + packet[3];
- char key = switch_rfc2833_to_char(packet[0]);
-
- /* SHEESH.... Curse you RFC2833 inventors!!!!*/
- if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) {
- rtp_session->dtmf_data.last_digit = 0;
- rtp_session->dtmf_data.dc = 0;
- }
- if (duration && end) {
- if (key != rtp_session->dtmf_data.last_digit) {
- char digit_str[] = {key, 0};
- time(&rtp_session->dtmf_data.last_digit_time);
- switch_rtp_queue_dtmf(rtp_session, digit_str);
- }
- if (++rtp_session->dtmf_data.dc >= 3) {
- rtp_session->dtmf_data.last_digit = 0;
- rtp_session->dtmf_data.dc = 0;
- }
-
- rtp_session->dtmf_data.last_digit = key;
- } else {
- rtp_session->dtmf_data.last_digit = 0;
- rtp_session->dtmf_data.dc = 0;
- }
- }
-
-
-
if (*payload_type == SWITCH_RTP_CNG_PAYLOAD) {
*flags |= SFF_CNG;
}