<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8631">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: pjsip_evsub_set_uas_timeout was not used (part 2).<br><br>The previous change was not complete.<br><br>ASTERISK-27435<br><br>Change-Id: I11082c14c0ef9c6af8c995084a6851337ea2a90f<br>---<br>M configure<br>M configure.ac<br>2 files changed, 0 insertions(+), 97 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 4e07f0e..9fff2b2 100755<br>--- a/configure<br>+++ b/configure<br>@@ -25891,102 +25891,6 @@<br> <br> <br> <br>-if test "x${PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "x1" -a "${USE_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "no"; then<br>- pbxlibdir=""<br>- # if --with-PJSIP_EVSUB_SET_UAS_TIMEOUT=DIR has been specified, use it.<br>- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}" != "x"; then<br>- if test -d ${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/lib; then<br>- pbxlibdir="-L${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/lib"<br>- else<br>- pbxlibdir="-L${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}"<br>- fi<br>- fi<br>-<br>- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"<br>- CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_set_uas_timeout in -lpjsip" >&5<br>-$as_echo_n "checking for pjsip_evsub_set_uas_timeout in -lpjsip... " >&6; }<br>-if ${ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"<br>-cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-<br>-/* Override any GCC internal prototype to avoid an error.<br>- Use char because int might match the return type of a GCC<br>- builtin and then its argument prototype would still apply. */<br>-#ifdef __cplusplus<br>-extern "C"<br>-#endif<br>-char pjsip_evsub_set_uas_timeout ();<br>-int<br>-main ()<br>-{<br>-return pjsip_evsub_set_uas_timeout ();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_c_try_link "$LINENO"; then :<br>- ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=yes<br>-else<br>- ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=no<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext \<br>- conftest$ac_exeext conftest.$ac_ext<br>-LIBS=$ac_check_lib_save_LIBS<br>-fi<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&5<br>-$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&6; }<br>-if test "x$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" = xyes; then :<br>- AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=yes<br>-else<br>- AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=no<br>-fi<br>-<br>- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"<br>-<br>-<br>- # now check for the header.<br>- if test "${AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND}" = "yes"; then<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIB"<br>- # if --with-PJSIP_EVSUB_SET_UAS_TIMEOUT=DIR has been specified, use it.<br>- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}" != "x"; then<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="-I${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/include"<br>- fi<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE} $PJPROJECT_CFLAGS"<br>-<br>- # check for the header<br>- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE}"<br>- ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"<br>-if test "x$ac_cv_header_pjsip_h" = xyes; then :<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND=1<br>-else<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND=0<br>-fi<br>-<br>-<br>- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"<br>-<br>- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND}" = "x0" ; then<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB=""<br>- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE=""<br>- else<br>-<br>- PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=1<br>- cat >>confdefs.h <<_ACEOF<br>-#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1<br>-_ACEOF<br>-<br>- fi<br>- fi<br>-fi<br>-<br>-<br>-<br> if test "x${PBX_PJSIP_TSX_LAYER_FIND_TSX2}" != "x1" -a "${USE_PJSIP_TSX_LAYER_FIND_TSX2}" != "no"; then<br> pbxlibdir=""<br> # if --with-PJSIP_TSX_LAYER_FIND_TSX2=DIR has been specified, use it.<br>diff --git a/configure.ac b/configure.ac<br>index de34c42..2ed4cd9 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2303,7 +2303,6 @@<br> AST_EXT_LIB_CHECK([PJSIP_EVSUB_GRP_LOCK], [pjsip], [pjsip_evsub_add_ref], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> AST_EXT_LIB_CHECK([PJSIP_INV_SESSION_REF], [pjsip], [pjsip_inv_add_ref], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br>- AST_EXT_LIB_CHECK([PJSIP_EVSUB_SET_UAS_TIMEOUT], [pjsip], [pjsip_evsub_set_uas_timeout], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])<br> fi<br> fi<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8631">change 8631</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8631"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I11082c14c0ef9c6af8c995084a6851337ea2a90f </div>
<div style="display:none"> Gerrit-Change-Number: 8631 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>