Merge "pjproject-bundled: Cleanups for reported issues" into 13

6 files changed, 57 insertions, 10 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 3497e24e6..051ee3e82 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,7 +46,7 @@ check_for_app aclocal${MY_AM_VER}
 
 echo "Generating the configure script ..."
 
-aclocal${MY_AM_VER} -I autoconf
+aclocal${MY_AM_VER} -I autoconf `find third-party/ -maxdepth 1 -type d -printf "-I %p "`
 autoconf${MY_AC_VER}
 autoheader${MY_AC_VER}
 automake${MY_AM_VER} --add-missing --copy 2>/dev/null
diff --git a/configure b/configure
index f2f0f7897..14c5a0eba 100755
--- a/configure
+++ b/configure
@@ -13602,7 +13602,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -13648,7 +13648,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -13672,7 +13672,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -13717,7 +13717,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -13741,7 +13741,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -24217,7 +24217,6 @@ fi
 if test "$USE_PJPROJECT" != "no" ; then
    if test "$PJPROJECT_BUNDLED" = "yes" ; then
 
-
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded pjproject (may have to download)" >&5
 $as_echo_n "checking for embedded pjproject (may have to download)... " >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring" >&5
diff --git a/configure.ac b/configure.ac
index d0a1dec7e..7571f7fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2168,7 +2168,6 @@ fi
 
 if test "$USE_PJPROJECT" != "no" ; then
    if test "$PJPROJECT_BUNDLED" = "yes" ; then
-       AC_CONFIG_MACRO_DIR(third-party/pjproject)
        PJPROJECT_CONFIGURE([$PJPROJECT_DIR])
    else
       AST_PKG_CONFIG_CHECK([PJPROJECT], [libpjproject])
diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules
index f39629b92..062793f12 100644
--- a/third-party/pjproject/Makefile.rules
+++ b/third-party/pjproject/Makefile.rules
@@ -2,6 +2,6 @@ PJPROJECT_URL = http://www.pjsip.org/release/$(PJPROJECT_VERSION)
 
 # Even though we're not installing pjproject, we're setting prefix to /opt/pjproject to be safe
 PJPROJECT_CONFIG_OPTS = --prefix=/opt/pjproject --with-external-speex --with-external-gsm --with-external-srtp \
-	--with-external-pa --disable-video --disable-v4l2 --disable-sound \
-	--disable-opencore-amr --disable-ilbc-codec --without-libyuv --disable-g7221-codec \
+	--disable-video --disable-v4l2 --disable-sound --disable-opencore-amr --disable-ilbc-codec \
+	--without-libyuv --disable-g7221-codec \
 	--enable-epoll
diff --git a/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch b/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch
new file mode 100644
index 000000000..04d1d9703
--- /dev/null
+++ b/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch
@@ -0,0 +1,48 @@
+From 1281b60a1807d1285b101b6eb61c6478f29785fe Mon Sep 17 00:00:00 2001
+From: George Joseph <george.joseph@fairview5.com>
+Date: Wed, 23 Mar 2016 07:48:52 -0600
+Subject: [PATCH] aconfigure.ac:  Fix autoconf issue with opencore-amrnb on
+ older systems
+
+autoconf 2.63 on CentOS6 produces a bad ./aconfigure file related to
+opencore-amrnb.
+
+./aconfigure: line 15158: syntax error near unexpected token `fi'
+
+To get around this, a 'true;' needed to be added to the Ok case of
+AC_ARG_WITH(opencore-amrnb)
+---
+ aconfigure    | 3 +++
+ aconfigure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/aconfigure b/aconfigure
+index 33a08f5..4c122c2 100755
+--- a/aconfigure
++++ b/aconfigure
+@@ -7908,6 +7908,9 @@ fi
+ # Check whether --with-opencore-amrnb was given.
+ if test "${with_opencore_amrnb+set}" = set; then :
+   withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5
++else
++  true;
++
+ fi
+ 
+ 
+diff --git a/aconfigure.ac b/aconfigure.ac
+index 3e88124..5d3e833 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -1631,7 +1631,7 @@ AC_ARG_WITH(opencore-amrnb,
+     AC_HELP_STRING([--with-opencore-amrnb=DIR],
+ 		   [This option is obsolete and replaced by --with-opencore-amr=DIR]),
+     [AC_MSG_ERROR(This option is obsolete and replaced by --with-opencore-amr=DIR)],
+-    []
++    [true;]
+     )
+ 
+ dnl # opencore-amr alt prefix
+-- 
+2.5.0
+
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h
index 544c1e85e..840d8b279 100644
--- a/third-party/pjproject/patches/config_site.h
+++ b/third-party/pjproject/patches/config_site.h
@@ -29,6 +29,7 @@
 #define PJ_HAS_STRICMP_ALNUM		0
 #define PJ_HASH_USE_OWN_TOLOWER		1
 #define PJSIP_UNESCAPE_IN_PLACE		1
+#define PJSIP_MAX_PKT_LEN			6000
 
 #undef PJ_TODO
 #define PJ_TODO(x)