diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 125 |
1 files changed, 124 insertions, 1 deletions
@@ -947,6 +947,10 @@ PBX_POPT POPT_DIR POPT_INCLUDE POPT_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 @@ -7914,7 +7918,7 @@ if test "${WGET}" != ":" ; then DOWNLOAD_TIMEOUT='--timeout=$1' else if test "${CURL}" != ":" ; then DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" - DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar -w \"%{url_effective}\n\"" + DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar" DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' else # Extract the first word of "fetch", so it can be a program name with args. @@ -9351,6 +9355,9 @@ $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 + + @@ -11545,6 +11552,18 @@ 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 + + + + + + fi @@ -26674,6 +26693,110 @@ _ACEOF 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 + pbxfuncname="pjsip_evsub_set_uas_timeout" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND=yes + else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS" + as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5 +$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; } +if eval \${$as_ac_Lib+:} 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 ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; 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}" + fi + + # 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" + if test "xpjsip.h" = "x" ; then # no header, assume found + PJSIP_EVSUB_SET_UAS_TIMEOUT_HEADER_FOUND="1" + else # 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}" + fi + 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 + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + PJSIP_EVSUB_SET_UAS_TIMEOUT_LIB="" + fi + PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=1 + cat >>confdefs.h <<_ACEOF +#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1 +_ACEOF + + fi + fi +fi + + fi fi |