<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7305">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: pjsip_evsub_set_uas_timeout was not used.<br><br>ASTERISK-27435<br><br>Change-Id: Id318a7ae6d7d69b53f911d30bf3eece64852f15c<br>---<br>M configure<br>M configure.ac<br>M include/asterisk/autoconfig.h.in<br>M third-party/pjproject/configure.m4<br>4 files changed, 0 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 70553fc..ef251cd 100755<br>--- a/configure<br>+++ b/configure<br>@@ -952,10 +952,6 @@<br> PJSIP_TSX_LAYER_FIND_TSX2_DIR<br> PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE<br> PJSIP_TSX_LAYER_FIND_TSX2_LIB<br>-PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB<br> PBX_PJSIP_AUTH_CLT_DEINIT<br> PJSIP_AUTH_CLT_DEINIT_DIR<br> PJSIP_AUTH_CLT_DEINIT_INCLUDE<br>@@ -9412,9 +9408,6 @@<br> $as_echo "#define HAVE_PJSIP_AUTH_CLT_DEINIT 1" >>confdefs.h<br> <br> <br>-$as_echo "#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1" >>confdefs.h<br>-<br>-<br> $as_echo "#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1" >>confdefs.h<br> <br> <br>@@ -11638,18 +11631,6 @@<br> PJSIP_AUTH_CLT_DEINIT_DIR=${PJPROJECT_DIR}<br> <br> PBX_PJSIP_AUTH_CLT_DEINIT=0<br>-<br>-<br>-<br>-<br>-<br>-<br>-<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_DESCRIP="PJSIP EVSUB Set UAS Timeout support"<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_OPTION=pjsip<br>-PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR=${PJPROJECT_DIR}<br>-<br>-PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=0<br> <br> <br> <br>diff --git a/configure.ac b/configure.ac<br>index f5c160c..9673023 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -520,7 +520,6 @@<br> AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_GRP_LOCK], [PJSIP EVSUB Group Lock support], [PJPROJECT], [pjsip])<br> AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_INV_SESSION_REF], [PJSIP INVITE Session Reference Count support], [PJPROJECT], [pjsip])<br> AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_AUTH_CLT_DEINIT], [pjsip_auth_clt_deinit support], [PJPROJECT], [pjsip])<br>-AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_SET_UAS_TIMEOUT], [PJSIP EVSUB Set UAS Timeout support], [PJPROJECT], [pjsip])<br> AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip_tsx_layer_find_tsx2 support], [PJPROJECT], [pjsip])<br> fi<br> <br>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in<br>index cfa260b..2f7da87 100644<br>--- a/include/asterisk/autoconfig.h.in<br>+++ b/include/asterisk/autoconfig.h.in<br>@@ -628,10 +628,6 @@<br> /* Define to 1 if PJPROJECT has the PJSIP EVSUB Group Lock support feature. */<br> #undef HAVE_PJSIP_EVSUB_GRP_LOCK<br> <br>-/* Define to 1 if PJPROJECT has the PJSIP EVSUB Set UAS Timeout support<br>- feature. */<br>-#undef HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT<br>-<br> /* Define to 1 if PJPROJECT has the PJSIP External Resolver Support feature.<br> */<br> #undef HAVE_PJSIP_EXTERNAL_RESOLVER<br>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4<br>index 2d33534..569ac21 100644<br>--- a/third-party/pjproject/configure.m4<br>+++ b/third-party/pjproject/configure.m4<br>@@ -80,7 +80,6 @@<br> AC_DEFINE([HAVE_PJSIP_EVSUB_GRP_LOCK], 1, [Define if your system has PJSIP_EVSUB_GRP_LOCK])<br> AC_DEFINE([HAVE_PJSIP_INV_SESSION_REF], 1, [Define if your system has PJSIP_INV_SESSION_REF])<br> AC_DEFINE([HAVE_PJSIP_AUTH_CLT_DEINIT], 1, [Define if your system has pjsip_auth_clt_deinit declared.])<br>- AC_DEFINE([HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT], 1, [Define if your system has pjsip_evsub_set_uas_timeout declared.])<br> AC_DEFINE([HAVE_PJSIP_TSX_LAYER_FIND_TSX2], 1, [Define if your system has pjsip_tsx_layer_find_tsx2 declared.])<br> <br> AC_SUBST([PJPROJECT_BUNDLED])<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7305">change 7305</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/7305"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id318a7ae6d7d69b53f911d30bf3eece64852f15c </div>
<div style="display:none"> Gerrit-Change-Number: 7305 </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: Corey Farrell <git@cfware.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>