retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

move unix builds to apr 1.2.7, sqlite 3.3.6 and libsndfile 1.0.16 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2112 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-07-25 15:11:15 +00:00
parent 52d46039b3
commit da8484382c
6 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -164,9 +164,9 @@ depends:
@./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX)
@./build/addenv.sh build/freeswitch.env MAKE $(MAKE)
mkdir -p $(PREFIX)
./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX)
./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX)
./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX)
./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX)

6
Makefile.in
View File

@ -1084,9 +1084,9 @@ depends:
@./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX)
@./build/addenv.sh build/freeswitch.env MAKE $(MAKE)
mkdir -p $(PREFIX)
./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX)
./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX)
./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe
./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX)
./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX)
./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX)
./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX)

2
src/include/switch_apr.h
View File

@ -656,7 +656,7 @@ DoxyDefine(apr_status_t switch_socket_recvfrom(switch_sockaddr_t *from,
apr_int32_t flags,
char *buf,
apr_size_t *len);)
//#define switch_socket_recvfrom apr_socket_recvfrom
#define switch_socket_recvfrom apr_socket_recvfrom
/**
* Send a file from an open file descriptor to a socket, along with

3
src/include/switch_utils.h
View File

@ -61,9 +61,6 @@ BEGIN_EXTERN_C
!strcasecmp(expr, "true") ||\
atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE
SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, switch_size_t *len);
/*!
\brief Return a printable name of a switch_priority_t
\param priority the priority to get the name of

2
src/mod/formats/mod_sndfile/Makefile
View File

@ -3,7 +3,7 @@ LDFLAGS += -lsndfile -L/usr/local/lib
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX)
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.16.tar.gz --prefix=$(PREFIX)
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o

10
src/switch_utils.c
View File

@ -34,16 +34,6 @@
#include <string.h>
#include <stdlib.h>
SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, switch_size_t *len)
{
switch_status_t status;
if ((status = apr_socket_recvfrom(from, sock, flags, buf, len)) == SWITCH_STATUS_SUCCESS) {
from->port = ntohs(from->sa.sin.sin_port);
}
return status;
}
SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority)
{
switch(priority) { /*lol*/