[Asterisk-code-review] BuildSystem: pjsip evsub set uas timeout was not used. (asterisk[master])
Joshua Colp
asteriskteam at digium.com
Tue Nov 21 10:33:29 CST 2017
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7303 )
Change subject: BuildSystem: pjsip_evsub_set_uas_timeout was not used.
......................................................................
BuildSystem: pjsip_evsub_set_uas_timeout was not used.
ASTERISK-27435
Change-Id: Id318a7ae6d7d69b53f911d30bf3eece64852f15c
---
M configure
M configure.ac
M include/asterisk/autoconfig.h.in
M third-party/pjproject/configure.m4
4 files changed, 0 insertions(+), 25 deletions(-)
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
diff --git a/configure b/configure
index 358e626..bef917f 100755
--- a/configure
+++ b/configure
@@ -952,10 +952,6 @@
PJSIP_TSX_LAYER_FIND_TSX2_DIR
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE
PJSIP_TSX_LAYER_FIND_TSX2_LIB
-PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT
-PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR
-PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE
-PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB
PBX_PJSIP_AUTH_CLT_DEINIT
PJSIP_AUTH_CLT_DEINIT_DIR
PJSIP_AUTH_CLT_DEINIT_INCLUDE
@@ -9418,9 +9414,6 @@
$as_echo "#define HAVE_PJSIP_AUTH_CLT_DEINIT 1" >>confdefs.h
-$as_echo "#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1" >>confdefs.h
-
-
$as_echo "#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1" >>confdefs.h
@@ -11676,18 +11669,6 @@
PJSIP_AUTH_CLT_DEINIT_DIR=${PJPROJECT_DIR}
PBX_PJSIP_AUTH_CLT_DEINIT=0
-
-
-
-
-
-
-
-PJSIP_EVSUB_SET_UAS_TIMEOUT_DESCRIP="PJSIP EVSUB Set UAS Timeout support"
-PJSIP_EVSUB_SET_UAS_TIMEOUT_OPTION=pjsip
-PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR=${PJPROJECT_DIR}
-
-PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=0
diff --git a/configure.ac b/configure.ac
index 47c6b26..474ea22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,7 +521,6 @@
AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_GRP_LOCK], [PJSIP EVSUB Group Lock support], [PJPROJECT], [pjsip])
AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_INV_SESSION_REF], [PJSIP INVITE Session Reference Count support], [PJPROJECT], [pjsip])
AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_AUTH_CLT_DEINIT], [pjsip_auth_clt_deinit support], [PJPROJECT], [pjsip])
-AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_SET_UAS_TIMEOUT], [PJSIP EVSUB Set UAS Timeout support], [PJPROJECT], [pjsip])
AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip_tsx_layer_find_tsx2 support], [PJPROJECT], [pjsip])
fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 4700d40..f8bd0e3 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -631,10 +631,6 @@
/* Define to 1 if PJPROJECT has the PJSIP EVSUB Group Lock support feature. */
#undef HAVE_PJSIP_EVSUB_GRP_LOCK
-/* Define to 1 if PJPROJECT has the PJSIP EVSUB Set UAS Timeout support
- feature. */
-#undef HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT
-
/* Define to 1 if PJPROJECT has the PJSIP External Resolver Support feature.
*/
#undef HAVE_PJSIP_EXTERNAL_RESOLVER
diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index 2d33534..569ac21 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -80,7 +80,6 @@
AC_DEFINE([HAVE_PJSIP_EVSUB_GRP_LOCK], 1, [Define if your system has PJSIP_EVSUB_GRP_LOCK])
AC_DEFINE([HAVE_PJSIP_INV_SESSION_REF], 1, [Define if your system has PJSIP_INV_SESSION_REF])
AC_DEFINE([HAVE_PJSIP_AUTH_CLT_DEINIT], 1, [Define if your system has pjsip_auth_clt_deinit declared.])
- AC_DEFINE([HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT], 1, [Define if your system has pjsip_evsub_set_uas_timeout declared.])
AC_DEFINE([HAVE_PJSIP_TSX_LAYER_FIND_TSX2], 1, [Define if your system has pjsip_tsx_layer_find_tsx2 declared.])
AC_SUBST([PJPROJECT_BUNDLED])
--
To view, visit https://gerrit.asterisk.org/7303
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id318a7ae6d7d69b53f911d30bf3eece64852f15c
Gerrit-Change-Number: 7303
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171121/c66a1450/attachment-0001.html>
More information about the asterisk-code-review
mailing list