Skip to content

F
freeswitch
提交 809dfc84 authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

add in tree srtp to build system 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1089 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 2532569a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 709 行增加 和 652 行删除
Makefile.am
浏览文件 @ 809dfc84
...@@ -152,7 +152,7 @@ depends: ...@@ -152,7 +152,7 @@ depends:
./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp.tgz --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
rm build/freeswitch.env rm build/freeswitch.env
......
Makefile.in
浏览文件 @ 809dfc84
...@@ -1043,7 +1043,7 @@ depends: ...@@ -1043,7 +1043,7 @@ depends:
./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp.tgz --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
rm build/freeswitch.env rm build/freeswitch.env
modules: $(NAME) modules: $(NAME)
......
aclocal.m4
浏览文件 @ 809dfc84
差异被折叠。
configure
浏览文件 @ 809dfc84
差异被折叠。
libs/srtp/Makefile
浏览文件 @ 809dfc84
...@@ -34,7 +34,7 @@ CC = gcc ...@@ -34,7 +34,7 @@ CC = gcc
INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include
DEFS = -DHAVE_CONFIG_H DEFS = -DHAVE_CONFIG_H
CPPFLAGS= CPPFLAGS=
CFLAGS = -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops CFLAGS = -Wall -O4 -fexpensive-optimizations -funroll-loops
LIBS = LIBS =
LDFLAGS = -L. LDFLAGS = -L.
COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
......
libs/srtp/config.log
浏览文件 @ 809dfc84
差异被折叠。
libs/srtp/config.status
浏览文件 @ 809dfc84
...@@ -300,7 +300,7 @@ Report bugs to <bug-autoconf@gnu.org>." ...@@ -300,7 +300,7 @@ Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\ ac_cs_version="\
config.status config.status
configured by ./configure, generated by GNU Autoconf 2.59, configured by ./configure, generated by GNU Autoconf 2.59,
with options \"'--prefix=/usr/local/freeswitch' '--enable-pic'\" with options \"'--prefix=/usr/local/freeswitch'\"
Copyright (C) 2003 Free Software Foundation, Inc. Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation This config.status script is free software; the Free Software Foundation
...@@ -379,8 +379,8 @@ if $ac_cs_silent; then ...@@ -379,8 +379,8 @@ if $ac_cs_silent; then
fi fi
if $ac_cs_recheck; then if $ac_cs_recheck; then
echo "running /bin/sh ./configure " '--prefix=/usr/local/freeswitch' '--enable-pic' $ac_configure_extra_args " --no-create --no-recursion" >&6 echo "running /bin/sh ./configure " '--prefix=/usr/local/freeswitch' $ac_configure_extra_args " --no-create --no-recursion" >&6
exec /bin/sh ./configure '--prefix=/usr/local/freeswitch' '--enable-pic' $ac_configure_extra_args --no-create --no-recursion exec /bin/sh ./configure '--prefix=/usr/local/freeswitch' $ac_configure_extra_args --no-create --no-recursion
fi fi
for ac_config_target in $ac_config_targets for ac_config_target in $ac_config_targets
...@@ -475,7 +475,7 @@ s,@LIBS@,,;t t ...@@ -475,7 +475,7 @@ s,@LIBS@,,;t t
s,@RANLIB@,ranlib,;t t s,@RANLIB@,ranlib,;t t
s,@ac_ct_RANLIB@,ranlib,;t t s,@ac_ct_RANLIB@,ranlib,;t t
s,@CC@,gcc,;t t s,@CC@,gcc,;t t
s,@CFLAGS@,-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops,;t t s,@CFLAGS@,-Wall -O4 -fexpensive-optimizations -funroll-loops,;t t
s,@LDFLAGS@,,;t t s,@LDFLAGS@,,;t t
s,@CPPFLAGS@,,;t t s,@CPPFLAGS@,,;t t
s,@ac_ct_CC@,gcc,;t t s,@ac_ct_CC@,gcc,;t t
...@@ -487,13 +487,13 @@ s,@INSTALL_DATA@,${INSTALL} -m 644,;t t ...@@ -487,13 +487,13 @@ s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
s,@RNG_OBJS@,rand_source.o,;t t s,@RNG_OBJS@,rand_source.o,;t t
s,@CPP@,gcc -E,;t t s,@CPP@,gcc -E,;t t
s,@EGREP@,grep -E,;t t s,@EGREP@,grep -E,;t t
s,@build@,x86_64-unknown-linux-gnu,;t t s,@build@,i686-pc-linux-gnu,;t t
s,@build_cpu@,x86_64,;t t s,@build_cpu@,i686,;t t
s,@build_vendor@,unknown,;t t s,@build_vendor@,pc,;t t
s,@build_os@,linux-gnu,;t t s,@build_os@,linux-gnu,;t t
s,@host@,x86_64-unknown-linux-gnu,;t t s,@host@,i686-pc-linux-gnu,;t t
s,@host_cpu@,x86_64,;t t s,@host_cpu@,i686,;t t
s,@host_vendor@,unknown,;t t s,@host_vendor@,pc,;t t
s,@host_os@,linux-gnu,;t t s,@host_os@,linux-gnu,;t t
s,@EXE@,,;t t s,@EXE@,,;t t
s,@GDOI_OBJS@,,;t t s,@GDOI_OBJS@,,;t t
...@@ -841,7 +841,7 @@ ${ac_dA}HAVE_UINT16_T${ac_dB}HAVE_UINT16_T${ac_dC}1${ac_dD} ...@@ -841,7 +841,7 @@ ${ac_dA}HAVE_UINT16_T${ac_dB}HAVE_UINT16_T${ac_dC}1${ac_dD}
${ac_dA}HAVE_INT32_T${ac_dB}HAVE_INT32_T${ac_dC}1${ac_dD} ${ac_dA}HAVE_INT32_T${ac_dB}HAVE_INT32_T${ac_dC}1${ac_dD}
${ac_dA}HAVE_UINT32_T${ac_dB}HAVE_UINT32_T${ac_dC}1${ac_dD} ${ac_dA}HAVE_UINT32_T${ac_dB}HAVE_UINT32_T${ac_dC}1${ac_dD}
${ac_dA}HAVE_UINT64_T${ac_dB}HAVE_UINT64_T${ac_dC}1${ac_dD} ${ac_dA}HAVE_UINT64_T${ac_dB}HAVE_UINT64_T${ac_dC}1${ac_dD}
${ac_dA}SIZEOF_UNSIGNED_LONG${ac_dB}SIZEOF_UNSIGNED_LONG${ac_dC}8${ac_dD} ${ac_dA}SIZEOF_UNSIGNED_LONG${ac_dB}SIZEOF_UNSIGNED_LONG${ac_dC}4${ac_dD}
${ac_dA}SIZEOF_UNSIGNED_LONG_LONG${ac_dB}SIZEOF_UNSIGNED_LONG_LONG${ac_dC}8${ac_dD} ${ac_dA}SIZEOF_UNSIGNED_LONG_LONG${ac_dB}SIZEOF_UNSIGNED_LONG_LONG${ac_dC}8${ac_dD}
${ac_dA}HAVE_SOCKET${ac_dB}HAVE_SOCKET${ac_dC}1${ac_dD} ${ac_dA}HAVE_SOCKET${ac_dB}HAVE_SOCKET${ac_dC}1${ac_dD}
${ac_dA}HAVE_INET_ATON${ac_dB}HAVE_INET_ATON${ac_dC}1${ac_dD} ${ac_dA}HAVE_INET_ATON${ac_dB}HAVE_INET_ATON${ac_dC}1${ac_dD}
...@@ -856,6 +856,7 @@ t clr ...@@ -856,6 +856,7 @@ t clr
: clr : clr
${ac_dA}HAVE_USLEEP${ac_dB}HAVE_USLEEP${ac_dC}1${ac_dD} ${ac_dA}HAVE_USLEEP${ac_dB}HAVE_USLEEP${ac_dC}1${ac_dD}
${ac_dA}CPU_CISC${ac_dB}CPU_CISC${ac_dC}1${ac_dD} ${ac_dA}CPU_CISC${ac_dB}CPU_CISC${ac_dC}1${ac_dD}
${ac_dA}HAVE_X86${ac_dB}HAVE_X86${ac_dC}1${ac_dD}
${ac_dA}ENABLE_DEBUGGING${ac_dB}ENABLE_DEBUGGING${ac_dC}1${ac_dD} ${ac_dA}ENABLE_DEBUGGING${ac_dB}ENABLE_DEBUGGING${ac_dC}1${ac_dD}
${ac_dA}ERR_REPORTING_STDOUT${ac_dB}ERR_REPORTING_STDOUT${ac_dC}1${ac_dD} ${ac_dA}ERR_REPORTING_STDOUT${ac_dB}ERR_REPORTING_STDOUT${ac_dC}1${ac_dD}
CEOF CEOF
...@@ -904,7 +905,7 @@ ${ac_uA}HAVE_UINT16_T${ac_uB}HAVE_UINT16_T${ac_uC}1${ac_uD} ...@@ -904,7 +905,7 @@ ${ac_uA}HAVE_UINT16_T${ac_uB}HAVE_UINT16_T${ac_uC}1${ac_uD}
${ac_uA}HAVE_INT32_T${ac_uB}HAVE_INT32_T${ac_uC}1${ac_uD} ${ac_uA}HAVE_INT32_T${ac_uB}HAVE_INT32_T${ac_uC}1${ac_uD}
${ac_uA}HAVE_UINT32_T${ac_uB}HAVE_UINT32_T${ac_uC}1${ac_uD} ${ac_uA}HAVE_UINT32_T${ac_uB}HAVE_UINT32_T${ac_uC}1${ac_uD}
${ac_uA}HAVE_UINT64_T${ac_uB}HAVE_UINT64_T${ac_uC}1${ac_uD} ${ac_uA}HAVE_UINT64_T${ac_uB}HAVE_UINT64_T${ac_uC}1${ac_uD}
${ac_uA}SIZEOF_UNSIGNED_LONG${ac_uB}SIZEOF_UNSIGNED_LONG${ac_uC}8${ac_uD} ${ac_uA}SIZEOF_UNSIGNED_LONG${ac_uB}SIZEOF_UNSIGNED_LONG${ac_uC}4${ac_uD}
${ac_uA}SIZEOF_UNSIGNED_LONG_LONG${ac_uB}SIZEOF_UNSIGNED_LONG_LONG${ac_uC}8${ac_uD} ${ac_uA}SIZEOF_UNSIGNED_LONG_LONG${ac_uB}SIZEOF_UNSIGNED_LONG_LONG${ac_uC}8${ac_uD}
${ac_uA}HAVE_SOCKET${ac_uB}HAVE_SOCKET${ac_uC}1${ac_uD} ${ac_uA}HAVE_SOCKET${ac_uB}HAVE_SOCKET${ac_uC}1${ac_uD}
${ac_uA}HAVE_INET_ATON${ac_uB}HAVE_INET_ATON${ac_uC}1${ac_uD} ${ac_uA}HAVE_INET_ATON${ac_uB}HAVE_INET_ATON${ac_uC}1${ac_uD}
...@@ -919,6 +920,7 @@ t clr ...@@ -919,6 +920,7 @@ t clr
: clr : clr
${ac_uA}HAVE_USLEEP${ac_uB}HAVE_USLEEP${ac_uC}1${ac_uD} ${ac_uA}HAVE_USLEEP${ac_uB}HAVE_USLEEP${ac_uC}1${ac_uD}
${ac_uA}CPU_CISC${ac_uB}CPU_CISC${ac_uC}1${ac_uD} ${ac_uA}CPU_CISC${ac_uB}CPU_CISC${ac_uC}1${ac_uD}
${ac_uA}HAVE_X86${ac_uB}HAVE_X86${ac_uC}1${ac_uD}
${ac_uA}ENABLE_DEBUGGING${ac_uB}ENABLE_DEBUGGING${ac_uC}1${ac_uD} ${ac_uA}ENABLE_DEBUGGING${ac_uB}ENABLE_DEBUGGING${ac_uC}1${ac_uD}
${ac_uA}ERR_REPORTING_STDOUT${ac_uB}ERR_REPORTING_STDOUT${ac_uC}1${ac_uD} ${ac_uA}ERR_REPORTING_STDOUT${ac_uB}ERR_REPORTING_STDOUT${ac_uC}1${ac_uD}
s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
......
libs/srtp/crypto/Makefile
浏览文件 @ 809dfc84
...@@ -12,7 +12,7 @@ CC = gcc ...@@ -12,7 +12,7 @@ CC = gcc
INCDIR = -Iinclude -I$(srcdir)/include INCDIR = -Iinclude -I$(srcdir)/include
DEFS = -DHAVE_CONFIG_H DEFS = -DHAVE_CONFIG_H
CPPFLAGS= CPPFLAGS=
CFLAGS = -fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops CFLAGS = -Wall -O4 -fexpensive-optimizations -funroll-loops
LIBS = LIBS =
LDFLAGS = -L. LDFLAGS = -L.
COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
......
libs/srtp/crypto/include/config.h
浏览文件 @ 809dfc84
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
/* #undef HAVE_WINSOCK2_H */ /* #undef HAVE_WINSOCK2_H */
/* Define to use X86 inlined assembly code */ /* Define to use X86 inlined assembly code */
/* #undef HAVE_X86 */ #define HAVE_X86 1
/* Define to the address where bug reports for this package should be sent. */ /* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "" #define PACKAGE_BUGREPORT ""
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
#define PACKAGE_VERSION "" #define PACKAGE_VERSION ""
/* The size of a `unsigned long', as computed by sizeof. */ /* The size of a `unsigned long', as computed by sizeof. */
#define SIZEOF_UNSIGNED_LONG 8 #define SIZEOF_UNSIGNED_LONG 4
/* The size of a `unsigned long long', as computed by sizeof. */ /* The size of a `unsigned long long', as computed by sizeof. */
#define SIZEOF_UNSIGNED_LONG_LONG 8 #define SIZEOF_UNSIGNED_LONG_LONG 8
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论