diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-21 10:17:50 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-21 10:17:50 -0600 |
| commit | 69fcd96e7213ab992bfc04bab190ace7dfe82f0a (patch) | |
| tree | e48faaef81eb98863cefeaff9d00fd912fd77790 | |
| parent | 48ec7e49e8a179a6a99b1cf6e0b8b8f04e106b0b (diff) | |
| parent | 43dad7f669f42b67934f1468155351981fbf6977 (diff) | |
Merge "BuildSystem: pjsip_evsub_set_uas_timeout was not used." into 15
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 4 | ||||
| -rw-r--r-- | third-party/pjproject/configure.m4 | 1 |
4 files changed, 0 insertions, 25 deletions
@@ -952,10 +952,6 @@ PBX_PJSIP_TSX_LAYER_FIND_TSX2 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 @@ -9460,9 +9456,6 @@ $as_echo "#define HAVE_PJSIP_INV_SESSION_REF 1" >>confdefs.h $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 @@ -11693,18 +11686,6 @@ 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 - - - - - - - PJSIP_TSX_LAYER_FIND_TSX2_DESCRIP="pjsip_tsx_layer_find_tsx2 support" PJSIP_TSX_LAYER_FIND_TSX2_OPTION=pjsip PJSIP_TSX_LAYER_FIND_TSX2_DIR=${PJPROJECT_DIR} diff --git a/configure.ac b/configure.ac index 146e634e9..9b1ce7917 100644 --- a/configure.ac +++ b/configure.ac @@ -521,7 +521,6 @@ AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TLS_TRANSPORT_PROTO], [PJSIP TLS Transport pro 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 cfa260b21..2f7da87e0 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -628,10 +628,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 73887041c..c1edaf9aa 100644 --- a/third-party/pjproject/configure.m4 +++ b/third-party/pjproject/configure.m4 @@ -86,7 +86,6 @@ AC_DEFUN([_PJPROJECT_CONFIGURE], 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]) |