From 4f33f56a72a47cfc77b48f968c42322f7e2cca08 Mon Sep 17 00:00:00 2001
From: Alexander Traud <pabstraud@compuserve.com>
Date: Thu, 22 Mar 2018 13:27:52 +0100
Subject: [PATCH] BuildSystem: pjsip_evsub_set_uas_timeout was not used (part
2).
The previous change was not complete.
ASTERISK-27435
Change-Id: I11082c14c0ef9c6af8c995084a6851337ea2a90f
---
configure | 96 ----------------------------------------------------
configure.ac | 1 -
2 files changed, 97 deletions(-)
diff --git a/configure b/configure
index 4e07f0e1b8..9fff2b2736 100755
--- a/configure
+++ b/configure
@@ -25891,102 +25891,6 @@ fi
-if test "x${PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "x1" -a "${USE_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "no"; then
- pbxlibdir=""
- # if --with-PJSIP_EVSUB_SET_UAS_TIMEOUT=DIR has been specified, use it.
- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}" != "x"; then
- if test -d ${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/lib; then
- pbxlibdir="-L${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/lib"
- else
- pbxlibdir="-L${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}"
- fi
- fi
-
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_set_uas_timeout in -lpjsip" >&5
-$as_echo_n "checking for pjsip_evsub_set_uas_timeout in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pjsip_evsub_set_uas_timeout ();
-int
-main ()
-{
-return pjsip_evsub_set_uas_timeout ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=yes
-else
- ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout" = xyes; then :
- AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=yes
-else
- AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
-
-
- # now check for the header.
- if test "${AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND}" = "yes"; then
- PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIB"
- # if --with-PJSIP_EVSUB_SET_UAS_TIMEOUT=DIR has been specified, use it.
- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}" != "x"; then
- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="-I${PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR}/include"
- fi
- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE="${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE} $PJPROJECT_CFLAGS"
-
- # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
- PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND=1
-else
- PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
-
- if test "x${PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND}" = "x0" ; then
- PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB=""
- PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE=""
- else
-
- PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1
-_ACEOF
-
- fi
- fi
-fi
-
-
-
if test "x${PBX_PJSIP_TSX_LAYER_FIND_TSX2}" != "x1" -a "${USE_PJSIP_TSX_LAYER_FIND_TSX2}" != "no"; then
pbxlibdir=""
# if --with-PJSIP_TSX_LAYER_FIND_TSX2=DIR has been specified, use it.
diff --git a/configure.ac b/configure.ac
index de34c42065..2ed4cd9cd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2303,7 +2303,6 @@ if test "$USE_PJPROJECT" != "no" ; then
AST_EXT_LIB_CHECK([PJSIP_EVSUB_GRP_LOCK], [pjsip], [pjsip_evsub_add_ref], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJSIP_INV_SESSION_REF], [pjsip], [pjsip_inv_add_ref], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
- AST_EXT_LIB_CHECK([PJSIP_EVSUB_SET_UAS_TIMEOUT], [pjsip], [pjsip_evsub_set_uas_timeout], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS])
fi
fi
--
GitLab