update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1372 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
parent
9fbaceaa90
commit
2e0da1e8f7
|
|
@ -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
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue