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

diff --git a/Makefile.am b/Makefile.am
index 23a8b6cdcb0147ae98016296a48ab93243e59cc4..a46399ee4e1ecc83398a66889e30efa6dc6f8dbd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)

diff --git a/Makefile.in b/Makefile.in
index 2c38938a3daad333f89ec62d2a9ffe86b7b7c12b..2f4758edab5387edf1381e03f28bba5053a8473e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)

diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index f90282ec47a5030dc07d3b18a0f36c4159d02533..3955576def4b78e39d2adf48c176639ad0634b86 100644 (file)
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -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 

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index b7513b44c581b1eb4c6ac6d26a31e8160ad91db6..f59401bd22d4996d4f82916d2e5703617f3c9cdd 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -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

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index ae046879027bd17be7540cf7dafa63cfcbc194b8..af968dd68ee7cc40aea5419afed5e2adbb67a46b 100644 (file)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -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 

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 8ba31be3fed3b11791b334578752334f89876a96..3de793bae9d39045c106f9ddb8e46308835dd07d 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -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*/