diff options
-rw-r--r-- | .gitreview | 1 | ||||
-rw-r--r-- | addons/ooh323c/src/ooCalls.c | 2 | ||||
-rw-r--r-- | autoconf/ast_c_compile_check.m4 | 6 | ||||
-rw-r--r-- | autoconf/ast_check_pwlib.m4 | 12 | ||||
-rw-r--r-- | autoconf/ast_ext_lib.m4 | 23 | ||||
-rw-r--r-- | autoconf/ast_ext_tool_check.m4 | 14 | ||||
-rw-r--r-- | autoconf/ast_gcc_attribute.m4 | 19 | ||||
-rw-r--r-- | configs/samples/features.conf.sample | 4 | ||||
-rwxr-xr-x | configure | 5669 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | include/asterisk/cli.h | 28 | ||||
-rw-r--r-- | main/asterisk.c | 254 | ||||
-rw-r--r-- | main/cli.c | 101 | ||||
-rw-r--r-- | main/translate.c | 29 | ||||
-rwxr-xr-x | menuselect/configure | 134 | ||||
-rw-r--r-- | res/ari/resource_bridges.c | 13 | ||||
-rw-r--r-- | res/res_rtp_asterisk.c | 49 | ||||
-rw-r--r-- | tests/test_substitution.c | 19 | ||||
-rw-r--r-- | third-party/pjproject/patches/0040-183_without_to_tag.patch | 17 |
19 files changed, 2327 insertions, 4070 deletions
diff --git a/.gitreview b/.gitreview index f9ef0502a..d38061d45 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=gerrit.asterisk.org port=29418 project=asterisk.git +defaultbranch=master diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c index 26dc63eab..c920e6a23 100644 --- a/addons/ooh323c/src/ooCalls.c +++ b/addons/ooh323c/src/ooCalls.c @@ -29,6 +29,7 @@ #include "ooGkClient.h" #include "ooh323ep.h" #include "ooCalls.h" +#include "ooCmdChannel.h" /** Global endpoint structure */ extern OOH323EndPoint gH323ep; @@ -173,6 +174,7 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) call->msdRetries = 0; call->pFastStartRes = NULL; call->usrData = NULL; + ooCreateCallCmdConnection(call); OOTRACEINFO3("Created a new call (%s, %s)\n", call->callType, call->callToken); /* Add new call to calllist */ diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4 index ed1563017..ebdaefa89 100644 --- a/autoconf/ast_c_compile_check.m4 +++ b/autoconf/ast_c_compile_check.m4 @@ -4,11 +4,7 @@ AC_DEFUN([AST_C_COMPILE_CHECK], [ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then - if test "x$5" != "x"; then - AC_MSG_CHECKING([for $5]) - else - AC_MSG_CHECKING([if "$2" compiles using $3]) - fi + AC_MSG_CHECKING(m4_ifval([$5],[for $5],[if "$2" compiles using $3])) saved_cppflags="${CPPFLAGS}" if test "x${$1_DIR}" != "x"; then $1_INCLUDE="-I${$1_DIR}/include" diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 81c3f4086..4588fa3b1 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -191,11 +191,7 @@ fi ]) AC_DEFUN([AST_CHECK_PWLIB_VERSION], [ - if test "x$7" != "x"; then - VNAME="$7" - else - VNAME="$2_VERSION" - fi + VNAME="m4_default([$7],[$2_VERSION])" if test "${HAS_$2:-unset}" != "unset"; then $2_VERSION=`grep "$VNAME \"" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` @@ -204,11 +200,7 @@ AC_DEFUN([AST_CHECK_PWLIB_VERSION], [ $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.` $2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER})) $2_REQ=$(($4*10000+$5*100+$6)) - if test "x$10" = "x"; then - $2_MAX=9999999 - else - $2_MAX=$(($8*10000+$9*100+$10)) - fi + $2_MAX=m4_ifblank([$10], [9999999], [$(($8*10000+$9*100+$10))]) AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323) if test ${$2_VER} -lt ${$2_REQ}; then diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4 index cd5a3a779..e8ce2013d 100644 --- a/autoconf/ast_ext_lib.m4 +++ b/autoconf/ast_ext_lib.m4 @@ -117,15 +117,15 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then pbxlibdir="-L${$1_DIR}" fi fi - pbxfuncname="$3" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + m4_ifblank([$3], [ + # empty lib, assume only headers AST_$1_FOUND=yes - else + ], [ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} $6" - AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5]) + AC_CHECK_LIB([$2], [$3], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5]) CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + ]) # now check for the header. if test "${AST_$1_FOUND}" = "yes"; then @@ -135,21 +135,24 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then $1_INCLUDE="-I${$1_DIR}/include" fi $1_INCLUDE="${$1_INCLUDE} $6" - if test "x$4" = "x" ; then # no header, assume found + m4_ifblank([$4], [ + # no header, assume found $1_HEADER_FOUND="1" - else # check for the header + ], [ + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}" AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + ]) if test "x${$1_HEADER_FOUND}" = "x0" ; then $1_LIB="" $1_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + m4_ifblank([$3], [ + # only checking headers -> no library $1_LIB="" - fi + ]) PBX_$1=1 cat >>confdefs.h <<_ACEOF [@%:@define] HAVE_$1 1 diff --git a/autoconf/ast_ext_tool_check.m4 b/autoconf/ast_ext_tool_check.m4 index 758720d24..ef762eb87 100644 --- a/autoconf/ast_ext_tool_check.m4 +++ b/autoconf/ast_ext_tool_check.m4 @@ -10,15 +10,13 @@ AC_DEFUN([AST_EXT_TOOL_CHECK], PBX_$1=0 AC_PATH_TOOL(CONFIG_$1, $2, No, [${$1_DIR}/bin:$PATH]) if test ! "x${CONFIG_$1}" = xNo; then - if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi - $1_INCLUDE=$(${CONFIG_$1} $A) + $1_INCLUDE=$(${CONFIG_$1} m4_default([$3],[--cflags])) $1_INCLUDE=$(echo ${$1_INCLUDE} | $SED -e "s|-I|-I${$1_DIR}|g") - if test x"$4" = x ; then A=--libs ; else A="$4" ; fi - $1_LIB=$(${CONFIG_$1} $A) + $1_LIB=$(${CONFIG_$1} m4_default([$4],[--libs])) $1_LIB=$(echo ${$1_LIB} | $SED -e "s|-L|-L${$1_DIR}|g") - if test x"$5" != x ; then + m4_ifval([$5], [ saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}" @@ -28,15 +26,15 @@ AC_DEFUN([AST_EXT_TOOL_CHECK], AC_LINK_IFELSE( [ AC_LANG_PROGRAM( [ $5 ], [ $6; ])], [ PBX_$1=1 AC_DEFINE([HAVE_$1], 1, - [Define if your system has the $1 headers.])], + [Define if your system has the $1 libraries.])], [] ) CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else + ], [ PBX_$1=1 AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.]) - fi + ]) fi fi ]) diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4 index b1972bedf..9d5a32045 100644 --- a/autoconf/ast_gcc_attribute.m4 +++ b/autoconf/ast_gcc_attribute.m4 @@ -9,28 +9,17 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" m4_ifval([$4],$4=0) ax_cv_have_func_attribute_$1=0 -if test "x$2" = "x" -then AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}], - [])], + [AC_LANG_PROGRAM( + m4_ifblank([$2], + [$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}], + [$3 void __attribute__(($2)) *test(void *muffin, ...) ;]))], AC_MSG_RESULT(yes) m4_ifval([$4],$4=1) ax_cv_have_func_attribute_$1=1 AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), AC_MSG_RESULT(no) ) -else -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) ;], - [])], - AC_MSG_RESULT(yes) - m4_ifval([$4],$4=1) - ax_cv_have_func_attribute_$1=1 - AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), - AC_MSG_RESULT(no) -) -fi m4_ifval([$4],[AC_SUBST($4)]) CFLAGS="$saved_CFLAGS" diff --git a/configs/samples/features.conf.sample b/configs/samples/features.conf.sample index 223d69358..5806e4c04 100644 --- a/configs/samples/features.conf.sample +++ b/configs/samples/features.conf.sample @@ -72,8 +72,8 @@ ; means run the application on the opposite channel from the one that ; has activated the feature. ; ActivatedBy -> ActivatedBy is no longer honored. The feature is activated by which -; channel DYNAMIC_FEATURES includes the feature is on. Use predial -; to set different values of DYNAMIC_FEATURES on the channels. +; channel DYNAMIC_FEATURES includes the feature is on. Use a pre-dial +; handler to set different values for DYNAMIC_FEATURES on the channels. ; Historic values are: "caller", "callee", and "both". ; Application -> This is the application to execute. ; AppArguments -> These are the arguments to be passed into the application. If you need @@ -1,5 +1,4 @@ #! /bin/sh -# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for asterisk trunk. # @@ -3712,7 +3711,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_aux_dir= -for ac_dir in `pwd` "$srcdir"/`pwd`; do +for ac_dir in "$srcdir"/; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -3728,7 +3727,7 @@ for ac_dir in `pwd` "$srcdir"/`pwd`; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`pwd\` \"$srcdir\"/\`pwd\`" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\"/" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3743,7 +3742,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # preserve any CFLAGS or LDFLAGS that may be set # NOTE: This must be done before calling any macros that end up # calling AC_PROG_CC or the like, since they will set a default @@ -13621,16 +13619,12 @@ if test "x${PBX_TERMCAP}" != "x1" -a "${USE_TERMCAP}" != "no"; then pbxlibdir="-L${TERMCAP_DIR}" fi fi - pbxfuncname="tgetent" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_TERMCAP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_termcap_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltermcap" >&5 -$as_echo_n "checking for ${pbxfuncname} in -ltermcap... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 +$as_echo_n "checking for tgetent in -ltermcap... " >&6; } +if ${ac_cv_lib_termcap_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13644,35 +13638,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char tgetent (); int main () { -return ${pbxfuncname} (); +return tgetent (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_termcap_tgetent=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_termcap_tgetent=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } +if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : AST_TERMCAP_FOUND=yes else AST_TERMCAP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_TERMCAP_FOUND}" = "yes"; then @@ -13682,28 +13675,15 @@ fi TERMCAP_INCLUDE="-I${TERMCAP_DIR}/include" fi TERMCAP_INCLUDE="${TERMCAP_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - TERMCAP_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - TERMCAP_HEADER_FOUND=1 -else - TERMCAP_HEADER_FOUND=0 -fi + # no header, assume found + TERMCAP_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then TERMCAP_LIB="" TERMCAP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - TERMCAP_LIB="" - fi + PBX_TERMCAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_TERMCAP 1 @@ -13725,16 +13705,12 @@ if test "x${PBX_TINFO}" != "x1" -a "${USE_TINFO}" != "no"; then pbxlibdir="-L${TINFO_DIR}" fi fi - pbxfuncname="tgetent" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_TINFO_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_tinfo_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltinfo" >&5 -$as_echo_n "checking for ${pbxfuncname} in -ltinfo... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 +$as_echo_n "checking for tgetent in -ltinfo... " >&6; } +if ${ac_cv_lib_tinfo_tgetent+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13748,35 +13724,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char tgetent (); int main () { -return ${pbxfuncname} (); +return tgetent (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_tinfo_tgetent=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_tinfo_tgetent=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 +$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } +if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then : AST_TINFO_FOUND=yes else AST_TINFO_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_TINFO_FOUND}" = "yes"; then @@ -13786,28 +13761,15 @@ fi TINFO_INCLUDE="-I${TINFO_DIR}/include" fi TINFO_INCLUDE="${TINFO_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - TINFO_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - TINFO_HEADER_FOUND=1 -else - TINFO_HEADER_FOUND=0 -fi + # no header, assume found + TINFO_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${TINFO_HEADER_FOUND}" = "x0" ; then TINFO_LIB="" TINFO_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - TINFO_LIB="" - fi + PBX_TINFO=1 cat >>confdefs.h <<_ACEOF #define HAVE_TINFO 1 @@ -13829,16 +13791,12 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="-L${CURSES_DIR}" fi fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CURSES_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcurses" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcurses... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 +$as_echo_n "checking for initscr in -lcurses... " >&6; } +if ${ac_cv_lib_curses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13852,35 +13810,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char initscr (); int main () { -return ${pbxfuncname} (); +return initscr (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_curses_initscr=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_curses_initscr=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 +$as_echo "$ac_cv_lib_curses_initscr" >&6; } +if test "x$ac_cv_lib_curses_initscr" = xyes; then : AST_CURSES_FOUND=yes else AST_CURSES_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_CURSES_FOUND}" = "yes"; then @@ -13890,9 +13847,8 @@ fi CURSES_INCLUDE="-I${CURSES_DIR}/include" fi CURSES_INCLUDE="${CURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - CURSES_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" @@ -13904,14 +13860,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${CURSES_HEADER_FOUND}" = "x0" ; then CURSES_LIB="" CURSES_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CURSES_LIB="" - fi + PBX_CURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_CURSES 1 @@ -13933,16 +13887,12 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then pbxlibdir="-L${NCURSES_DIR}" fi fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NCURSES_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lncurses" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lncurses... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 +$as_echo_n "checking for initscr in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13956,35 +13906,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char initscr (); int main () { -return ${pbxfuncname} (); +return initscr (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ncurses_initscr=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ncurses_initscr=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 +$as_echo "$ac_cv_lib_ncurses_initscr" >&6; } +if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : AST_NCURSES_FOUND=yes else AST_NCURSES_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_NCURSES_FOUND}" = "yes"; then @@ -13994,9 +13943,8 @@ fi NCURSES_INCLUDE="-I${NCURSES_DIR}/include" fi NCURSES_INCLUDE="${NCURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - NCURSES_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" @@ -14008,14 +13956,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then NCURSES_LIB="" NCURSES_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NCURSES_LIB="" - fi + PBX_NCURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_NCURSES 1 @@ -14056,16 +14002,12 @@ if test "x${PBX_LIBUUID}" != "x1" -a "${USE_LIBUUID}" != "no"; then pbxlibdir="-L${LIBUUID_DIR}" fi fi - pbxfuncname="uuid_generate_random" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LIBUUID_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_uuid_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -luuid" >&5 -$as_echo_n "checking for ${pbxfuncname} in -luuid... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -luuid" >&5 +$as_echo_n "checking for uuid_generate_random in -luuid... " >&6; } +if ${ac_cv_lib_uuid_uuid_generate_random+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14079,35 +14021,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char uuid_generate_random (); int main () { -return ${pbxfuncname} (); +return uuid_generate_random (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_uuid_uuid_generate_random=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_uuid_uuid_generate_random=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_random" >&5 +$as_echo "$ac_cv_lib_uuid_uuid_generate_random" >&6; } +if test "x$ac_cv_lib_uuid_uuid_generate_random" = xyes; then : AST_LIBUUID_FOUND=yes else AST_LIBUUID_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LIBUUID_FOUND}" = "yes"; then @@ -14117,9 +14058,8 @@ fi LIBUUID_INCLUDE="-I${LIBUUID_DIR}/include" fi LIBUUID_INCLUDE="${LIBUUID_INCLUDE} " - if test "xuuid/uuid.h" = "x" ; then # no header, assume found - LIBUUID_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBUUID_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" @@ -14131,14 +14071,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LIBUUID_HEADER_FOUND}" = "x0" ; then LIBUUID_LIB="" LIBUUID_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LIBUUID_LIB="" - fi + PBX_LIBUUID=1 cat >>confdefs.h <<_ACEOF #define HAVE_LIBUUID 1 @@ -14160,16 +14098,12 @@ if test "x${PBX_E2FSUUID}" != "x1" -a "${USE_E2FSUUID}" != "no"; then pbxlibdir="-L${E2FSUUID_DIR}" fi fi - pbxfuncname="uuid_generate_random" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_E2FSUUID_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_e2fs-uuid_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -le2fs-uuid" >&5 -$as_echo_n "checking for ${pbxfuncname} in -le2fs-uuid... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -le2fs-uuid" >&5 +$as_echo_n "checking for uuid_generate_random in -le2fs-uuid... " >&6; } +if ${ac_cv_lib_e2fs_uuid_uuid_generate_random+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14183,35 +14117,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char uuid_generate_random (); int main () { -return ${pbxfuncname} (); +return uuid_generate_random (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_e2fs_uuid_uuid_generate_random=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_e2fs_uuid_uuid_generate_random=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_e2fs_uuid_uuid_generate_random" >&5 +$as_echo "$ac_cv_lib_e2fs_uuid_uuid_generate_random" >&6; } +if test "x$ac_cv_lib_e2fs_uuid_uuid_generate_random" = xyes; then : AST_E2FSUUID_FOUND=yes else AST_E2FSUUID_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_E2FSUUID_FOUND}" = "yes"; then @@ -14221,9 +14154,8 @@ fi E2FSUUID_INCLUDE="-I${E2FSUUID_DIR}/include" fi E2FSUUID_INCLUDE="${E2FSUUID_INCLUDE} " - if test "xuuid/uuid.h" = "x" ; then # no header, assume found - E2FSUUID_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${E2FSUUID_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" @@ -14235,14 +14167,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${E2FSUUID_HEADER_FOUND}" = "x0" ; then E2FSUUID_LIB="" E2FSUUID_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - E2FSUUID_LIB="" - fi + PBX_E2FSUUID=1 cat >>confdefs.h <<_ACEOF #define HAVE_E2FSUUID 1 @@ -14294,16 +14224,12 @@ if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then pbxlibdir="-L${JANSSON_DIR}" fi fi - pbxfuncname="json_dumps" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_JANSSON_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_jansson_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ljansson" >&5 -$as_echo_n "checking for ${pbxfuncname} in -ljansson... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_dumps in -ljansson" >&5 +$as_echo_n "checking for json_dumps in -ljansson... " >&6; } +if ${ac_cv_lib_jansson_json_dumps+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14317,35 +14243,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char json_dumps (); int main () { -return ${pbxfuncname} (); +return json_dumps (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_jansson_json_dumps=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_jansson_json_dumps=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jansson_json_dumps" >&5 +$as_echo "$ac_cv_lib_jansson_json_dumps" >&6; } +if test "x$ac_cv_lib_jansson_json_dumps" = xyes; then : AST_JANSSON_FOUND=yes else AST_JANSSON_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_JANSSON_FOUND}" = "yes"; then @@ -14355,9 +14280,8 @@ fi JANSSON_INCLUDE="-I${JANSSON_DIR}/include" fi JANSSON_INCLUDE="${JANSSON_INCLUDE} " - if test "xjansson.h" = "x" ; then # no header, assume found - JANSSON_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${JANSSON_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "jansson.h" "ac_cv_header_jansson_h" "$ac_includes_default" @@ -14369,14 +14293,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${JANSSON_HEADER_FOUND}" = "x0" ; then JANSSON_LIB="" JANSSON_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - JANSSON_LIB="" - fi + PBX_JANSSON=1 cat >>confdefs.h <<_ACEOF #define HAVE_JANSSON 1 @@ -14404,16 +14326,12 @@ if test "x${PBX_RT}" != "x1" -a "${USE_RT}" != "no"; then pbxlibdir="-L${RT_DIR}" fi fi - pbxfuncname="clock_gettime" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_rt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lrt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lrt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +$as_echo_n "checking for clock_gettime in -lrt... " >&6; } +if ${ac_cv_lib_rt_clock_gettime+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14427,35 +14345,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char clock_gettime (); int main () { -return ${pbxfuncname} (); +return clock_gettime (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_rt_clock_gettime=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_rt_clock_gettime=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : AST_RT_FOUND=yes else AST_RT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_RT_FOUND}" = "yes"; then @@ -14465,28 +14382,15 @@ fi RT_INCLUDE="-I${RT_DIR}/include" fi RT_INCLUDE="${RT_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - RT_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${RT_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - RT_HEADER_FOUND=1 -else - RT_HEADER_FOUND=0 -fi + # no header, assume found + RT_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${RT_HEADER_FOUND}" = "x0" ; then RT_LIB="" RT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RT_LIB="" - fi + PBX_RT=1 cat >>confdefs.h <<_ACEOF #define HAVE_RT 1 @@ -14602,16 +14506,13 @@ else fi if test ! "x${CONFIG_LIBXML2}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} $A) + LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} --cflags) LIBXML2_INCLUDE=$(echo ${LIBXML2_INCLUDE} | $SED -e "s|-I|-I${LIBXML2_DIR}|g") - if test x"" = x ; then A=--libs ; else A="" ; fi - LIBXML2_LIB=$(${CONFIG_LIBXML2} $A) + LIBXML2_LIB=$(${CONFIG_LIBXML2} --libs) LIBXML2_LIB=$(echo ${LIBXML2_LIB} | $SED -e "s|-L|-L${LIBXML2_DIR}|g") - if test x"#include <libxml/tree.h> - #include <libxml/parser.h>" != x ; then + saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBXML2_INCLUDE}" @@ -14639,12 +14540,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else - PBX_LIBXML2=1 -$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h - - fi fi fi @@ -14668,16 +14564,12 @@ if test "x${PBX_URIPARSER}" != "x1" -a "${USE_URIPARSER}" != "no"; then pbxlibdir="-L${URIPARSER_DIR}" fi fi - pbxfuncname="uriParseUriA" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_URIPARSER_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -luriparser" >&5 -$as_echo_n "checking for ${pbxfuncname} in -luriparser... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uriParseUriA in -luriparser" >&5 +$as_echo_n "checking for uriParseUriA in -luriparser... " >&6; } +if ${ac_cv_lib_uriparser_uriParseUriA+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14691,35 +14583,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char uriParseUriA (); int main () { -return ${pbxfuncname} (); +return uriParseUriA (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_uriparser_uriParseUriA=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_uriparser_uriParseUriA=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uriparser_uriParseUriA" >&5 +$as_echo "$ac_cv_lib_uriparser_uriParseUriA" >&6; } +if test "x$ac_cv_lib_uriparser_uriParseUriA" = xyes; then : AST_URIPARSER_FOUND=yes else AST_URIPARSER_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_URIPARSER_FOUND}" = "yes"; then @@ -14729,9 +14620,8 @@ fi URIPARSER_INCLUDE="-I${URIPARSER_DIR}/include" fi URIPARSER_INCLUDE="${URIPARSER_INCLUDE} " - if test "xuriparser/Uri.h" = "x" ; then # no header, assume found - URIPARSER_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${URIPARSER_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "uriparser/Uri.h" "ac_cv_header_uriparser_Uri_h" "$ac_includes_default" @@ -14743,14 +14633,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${URIPARSER_HEADER_FOUND}" = "x0" ; then URIPARSER_LIB="" URIPARSER_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - URIPARSER_LIB="" - fi + PBX_URIPARSER=1 cat >>confdefs.h <<_ACEOF #define HAVE_URIPARSER 1 @@ -14791,16 +14679,12 @@ if test "x${PBX_LIBXSLT}" != "x1" -a "${USE_LIBXSLT}" != "no"; then pbxlibdir="-L${LIBXSLT_DIR}" fi fi - pbxfuncname="xsltLoadStylesheetPI" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LIBXSLT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${LIBXML2_INCLUDE}" - as_ac_Lib=`$as_echo "ac_cv_lib_xslt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lxslt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lxslt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltLoadStylesheetPI in -lxslt" >&5 +$as_echo_n "checking for xsltLoadStylesheetPI in -lxslt... " >&6; } +if ${ac_cv_lib_xslt_xsltLoadStylesheetPI+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14814,35 +14698,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char xsltLoadStylesheetPI (); int main () { -return ${pbxfuncname} (); +return xsltLoadStylesheetPI (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_xslt_xsltLoadStylesheetPI=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_xslt_xsltLoadStylesheetPI=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltLoadStylesheetPI" >&5 +$as_echo "$ac_cv_lib_xslt_xsltLoadStylesheetPI" >&6; } +if test "x$ac_cv_lib_xslt_xsltLoadStylesheetPI" = xyes; then : AST_LIBXSLT_FOUND=yes else AST_LIBXSLT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LIBXSLT_FOUND}" = "yes"; then @@ -14852,9 +14735,8 @@ fi LIBXSLT_INCLUDE="-I${LIBXSLT_DIR}/include" fi LIBXSLT_INCLUDE="${LIBXSLT_INCLUDE} ${LIBXML2_INCLUDE}" - if test "xlibxslt/xsltInternals.h" = "x" ; then # no header, assume found - LIBXSLT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBXSLT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default" @@ -14866,14 +14748,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LIBXSLT_HEADER_FOUND}" = "x0" ; then LIBXSLT_LIB="" LIBXSLT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LIBXSLT_LIB="" - fi + PBX_LIBXSLT=1 cat >>confdefs.h <<_ACEOF #define HAVE_LIBXSLT 1 @@ -14895,16 +14775,12 @@ if test "x${PBX_LIBXSLT_CLEANUP}" != "x1" -a "${USE_LIBXSLT_CLEANUP}" != "no"; t pbxlibdir="-L${LIBXSLT_CLEANUP_DIR}" fi fi - pbxfuncname="xsltCleanupGlobals" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LIBXSLT_CLEANUP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${LIBXML2_INCLUDE}" - as_ac_Lib=`$as_echo "ac_cv_lib_xslt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lxslt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lxslt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5 +$as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; } +if ${ac_cv_lib_xslt_xsltCleanupGlobals+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14918,35 +14794,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char xsltCleanupGlobals (); int main () { -return ${pbxfuncname} (); +return xsltCleanupGlobals (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_xslt_xsltCleanupGlobals=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_xslt_xsltCleanupGlobals=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5 +$as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; } +if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes; then : AST_LIBXSLT_CLEANUP_FOUND=yes else AST_LIBXSLT_CLEANUP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LIBXSLT_CLEANUP_FOUND}" = "yes"; then @@ -14956,9 +14831,8 @@ fi LIBXSLT_CLEANUP_INCLUDE="-I${LIBXSLT_CLEANUP_DIR}/include" fi LIBXSLT_CLEANUP_INCLUDE="${LIBXSLT_CLEANUP_INCLUDE} ${LIBXML2_INCLUDE}" - if test "xlibxslt/xsltInternals.h" = "x" ; then # no header, assume found - LIBXSLT_CLEANUP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBXSLT_CLEANUP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default" @@ -14970,14 +14844,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LIBXSLT_CLEANUP_HEADER_FOUND}" = "x0" ; then LIBXSLT_CLEANUP_LIB="" LIBXSLT_CLEANUP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LIBXSLT_CLEANUP_LIB="" - fi + PBX_LIBXSLT_CLEANUP=1 cat >>confdefs.h <<_ACEOF #define HAVE_LIBXSLT_CLEANUP 1 @@ -18208,8 +18080,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_pure=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;} @@ -18237,35 +18107,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_pure=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_pure 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18279,8 +18120,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_malloc=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;} @@ -18308,35 +18147,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_malloc=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_malloc 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18350,8 +18160,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_const=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;} @@ -18379,35 +18187,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_const=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_const 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18421,8 +18200,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_unused=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;} @@ -18450,35 +18227,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_unused=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_unused 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18492,8 +18240,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_always_inline=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;} @@ -18521,35 +18267,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_always_inline=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_always_inline 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18563,8 +18280,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_deprecated=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;} @@ -18592,35 +18307,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_deprecated=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_deprecated 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18634,8 +18320,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_sentinel=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;} @@ -18663,35 +18347,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_sentinel=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_sentinel 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18705,8 +18360,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_warn_unused_result=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;} @@ -18734,35 +18387,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_warn_unused_result=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_warn_unused_result 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18776,8 +18400,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_may_alias=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((may_alias)) *test(void *muffin, ...) {return (void *) 0;} @@ -18805,35 +18427,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_may_alias=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_may_alias 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18847,8 +18440,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_constructor=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((constructor)) *test(void *muffin, ...) {return (void *) 0;} @@ -18876,35 +18467,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_constructor=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_constructor 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18922,8 +18484,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_destructor=0 -if test "x" = "x" -then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((destructor)) *test(void *muffin, ...) {return (void *) 0;} @@ -18951,35 +18511,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__(()) *test(void *muffin, ...) ; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_destructor=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_destructor 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -18996,36 +18527,6 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" ax_cv_have_func_attribute_noreturn=0 -if test "xnoreturn" = "x" -then -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - void __attribute__((noreturn)) *test(void *muffin, ...) {return (void *) 0;} -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - ax_cv_have_func_attribute_noreturn=1 - -cat >>confdefs.h <<_ACEOF -#define HAVE_ATTRIBUTE_noreturn 1 -_ACEOF - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ void __attribute__((noreturn)) *test(void *muffin, ...) ; @@ -19053,7 +18554,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi CFLAGS="$saved_CFLAGS" @@ -20263,16 +19763,12 @@ if test "x${PBX_ALSA}" != "x1" -a "${USE_ALSA}" != "no"; then pbxlibdir="-L${ALSA_DIR}" fi fi - pbxfuncname="snd_spcm_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ALSA_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lasound" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lasound... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_spcm_init in -lasound" >&5 +$as_echo_n "checking for snd_spcm_init in -lasound... " >&6; } +if ${ac_cv_lib_asound_snd_spcm_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20286,35 +19782,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char snd_spcm_init (); int main () { -return ${pbxfuncname} (); +return snd_spcm_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_asound_snd_spcm_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_asound_snd_spcm_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_spcm_init" >&5 +$as_echo "$ac_cv_lib_asound_snd_spcm_init" >&6; } +if test "x$ac_cv_lib_asound_snd_spcm_init" = xyes; then : AST_ALSA_FOUND=yes else AST_ALSA_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ALSA_FOUND}" = "yes"; then @@ -20324,9 +19819,8 @@ fi ALSA_INCLUDE="-I${ALSA_DIR}/include" fi ALSA_INCLUDE="${ALSA_INCLUDE} " - if test "xalsa/asoundlib.h" = "x" ; then # no header, assume found - ALSA_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" @@ -20338,14 +19832,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ALSA_HEADER_FOUND}" = "x0" ; then ALSA_LIB="" ALSA_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ALSA_LIB="" - fi + PBX_ALSA=1 cat >>confdefs.h <<_ACEOF #define HAVE_ALSA 1 @@ -20368,16 +19860,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then pbxlibdir="-L${BFD_DIR}" fi fi - pbxfuncname="bfd_openr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BFD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5 +$as_echo_n "checking for bfd_openr in -lbfd... " >&6; } +if ${ac_cv_lib_bfd_bfd_openr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20391,35 +19879,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char bfd_openr (); int main () { -return ${pbxfuncname} (); +return bfd_openr (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_bfd_bfd_openr=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_bfd_bfd_openr=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 +$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; } +if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then : AST_BFD_FOUND=yes else AST_BFD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BFD_FOUND}" = "yes"; then @@ -20429,9 +19916,8 @@ fi BFD_INCLUDE="-I${BFD_DIR}/include" fi BFD_INCLUDE="${BFD_INCLUDE} " - if test "xbfd.h" = "x" ; then # no header, assume found - BFD_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default" @@ -20443,14 +19929,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BFD_HEADER_FOUND}" = "x0" ; then BFD_LIB="" BFD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BFD_LIB="" - fi + PBX_BFD=1 cat >>confdefs.h <<_ACEOF #define HAVE_BFD 1 @@ -20475,16 +19959,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then pbxlibdir="-L${BFD_DIR}" fi fi - pbxfuncname="bfd_check_format" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BFD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5 +$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; } +if ${ac_cv_lib_bfd_bfd_check_format+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20498,35 +19978,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char bfd_check_format (); int main () { -return ${pbxfuncname} (); +return bfd_check_format (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_bfd_bfd_check_format=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_bfd_bfd_check_format=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5 +$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; } +if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then : AST_BFD_FOUND=yes else AST_BFD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BFD_FOUND}" = "yes"; then @@ -20536,9 +20015,8 @@ fi BFD_INCLUDE="-I${BFD_DIR}/include" fi BFD_INCLUDE="${BFD_INCLUDE} " - if test "xbfd.h" = "x" ; then # no header, assume found - BFD_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default" @@ -20550,14 +20028,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BFD_HEADER_FOUND}" = "x0" ; then BFD_LIB="" BFD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BFD_LIB="" - fi + PBX_BFD=1 cat >>confdefs.h <<_ACEOF #define HAVE_BFD 1 @@ -20583,16 +20059,12 @@ if test "x${PBX_BFD}" != "x1" -a "${USE_BFD}" != "no"; then pbxlibdir="-L${BFD_DIR}" fi fi - pbxfuncname="bfd_check_format" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BFD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_bfd_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbfd" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lbfd... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_check_format in -lbfd" >&5 +$as_echo_n "checking for bfd_check_format in -lbfd... " >&6; } +if ${ac_cv_lib_bfd_bfd_check_format+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20606,35 +20078,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char bfd_check_format (); int main () { -return ${pbxfuncname} (); +return bfd_check_format (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_bfd_bfd_check_format=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_bfd_bfd_check_format=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_check_format" >&5 +$as_echo "$ac_cv_lib_bfd_bfd_check_format" >&6; } +if test "x$ac_cv_lib_bfd_bfd_check_format" = xyes; then : AST_BFD_FOUND=yes else AST_BFD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BFD_FOUND}" = "yes"; then @@ -20644,9 +20115,8 @@ fi BFD_INCLUDE="-I${BFD_DIR}/include" fi BFD_INCLUDE="${BFD_INCLUDE} " - if test "xbfd.h" = "x" ; then # no header, assume found - BFD_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default" @@ -20658,14 +20128,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BFD_HEADER_FOUND}" = "x0" ; then BFD_LIB="" BFD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BFD_LIB="" - fi + PBX_BFD=1 cat >>confdefs.h <<_ACEOF #define HAVE_BFD 1 @@ -20691,16 +20159,12 @@ if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then pbxlibdir="-L${CAP_DIR}" fi fi - pbxfuncname="cap_from_text" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CAP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcap" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcap... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_from_text in -lcap" >&5 +$as_echo_n "checking for cap_from_text in -lcap... " >&6; } +if ${ac_cv_lib_cap_cap_from_text+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20714,35 +20178,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char cap_from_text (); int main () { -return ${pbxfuncname} (); +return cap_from_text (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_cap_cap_from_text=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cap_cap_from_text=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_from_text" >&5 +$as_echo "$ac_cv_lib_cap_cap_from_text" >&6; } +if test "x$ac_cv_lib_cap_cap_from_text" = xyes; then : AST_CAP_FOUND=yes else AST_CAP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_CAP_FOUND}" = "yes"; then @@ -20752,9 +20215,8 @@ fi CAP_INCLUDE="-I${CAP_DIR}/include" fi CAP_INCLUDE="${CAP_INCLUDE} " - if test "xsys/capability.h" = "x" ; then # no header, assume found - CAP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default" @@ -20766,14 +20228,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${CAP_HEADER_FOUND}" = "x0" ; then CAP_LIB="" CAP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CAP_LIB="" - fi + PBX_CAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_CAP 1 @@ -20981,13 +20441,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI_LINEREVERSE_VMWI}" != "x1" -a "${USE_DAHDI_LINEREVERSE_VMWI}" != "no"; then - if test "xenhanced dahdi vmwi support" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5 $as_echo_n "checking for enhanced dahdi vmwi support... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h" >&5 -$as_echo_n "checking if \"struct dahdi_vmwi_info booger\" compiles using dahdi/user.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_LINEREVERSE_VMWI_DIR}" != "x"; then DAHDI_LINEREVERSE_VMWI_INCLUDE="-I${DAHDI_LINEREVERSE_VMWI_DIR}/include" @@ -21027,13 +20482,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_DAHDI_ECHOCANCEL_FAX_MODE}" != "x1" -a "${USE_DAHDI_ECHOCANCEL_FAX_MODE}" != "no"; then - if test "x" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5 -$as_echo_n "checking for ... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5 $as_echo_n "checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${DAHDI_ECHOCANCEL_FAX_MODE_DIR}" != "x"; then DAHDI_ECHOCANCEL_FAX_MODE_INCLUDE="-I${DAHDI_ECHOCANCEL_FAX_MODE_DIR}/include" @@ -21073,13 +20523,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then - if test "xgetifaddrs() support" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5 $as_echo_n "checking for getifaddrs() support... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h" >&5 -$as_echo_n "checking if \"struct ifaddrs *p; getifaddrs(&p)\" compiles using ifaddrs.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${GETIFADDRS_DIR}" != "x"; then GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include" @@ -21118,13 +20563,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x${PBX_TIMERFD}" != "x1" -a "${USE_TIMERFD}" != "no"; then - if test "xtimerfd support" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5 $as_echo_n "checking for timerfd support... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h" >&5 -$as_echo_n "checking if \"timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);\" compiles using sys/timerfd.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${TIMERFD_DIR}" != "x"; then TIMERFD_INCLUDE="-I${TIMERFD_DIR}/include" @@ -21531,13 +20971,8 @@ fi else if test "x${PBX_LIBEDIT_IS_UNICODE}" != "x1" -a "${USE_LIBEDIT_IS_UNICODE}" != "no"; then - if test "xTesting for libedit unicode support" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5 $as_echo_n "checking for Testing for libedit unicode support... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"el_rfunc_t *callback;\" compiles using histedit.h" >&5 -$as_echo_n "checking if \"el_rfunc_t *callback;\" compiles using histedit.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${LIBEDIT_IS_UNICODE_DIR}" != "x"; then LIBEDIT_IS_UNICODE_INCLUDE="-I${LIBEDIT_IS_UNICODE_DIR}/include" @@ -21588,16 +21023,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then pbxlibdir="-L${ICONV_DIR}" fi fi - pbxfuncname="iconv_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ICONV_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liconv" >&5 -$as_echo_n "checking for ${pbxfuncname} in -liconv... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5 +$as_echo_n "checking for iconv_open in -liconv... " >&6; } +if ${ac_cv_lib_iconv_iconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21611,35 +21042,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char iconv_open (); int main () { -return ${pbxfuncname} (); +return iconv_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_iconv_iconv_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_iconv_iconv_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5 +$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; } +if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then : AST_ICONV_FOUND=yes else AST_ICONV_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ICONV_FOUND}" = "yes"; then @@ -21649,9 +21079,8 @@ fi ICONV_INCLUDE="-I${ICONV_DIR}/include" fi ICONV_INCLUDE="${ICONV_INCLUDE} " - if test "xiconv.h" = "x" ; then # no header, assume found - ICONV_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" @@ -21663,14 +21092,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" ICONV_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ICONV_LIB="" - fi + PBX_ICONV=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICONV 1 @@ -21693,16 +21120,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then pbxlibdir="-L${ICONV_DIR}" fi fi - pbxfuncname="libiconv_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ICONV_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_iconv_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liconv" >&5 -$as_echo_n "checking for ${pbxfuncname} in -liconv... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5 +$as_echo_n "checking for libiconv_open in -liconv... " >&6; } +if ${ac_cv_lib_iconv_libiconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21716,35 +21139,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char libiconv_open (); int main () { -return ${pbxfuncname} (); +return libiconv_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_iconv_libiconv_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_iconv_libiconv_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5 +$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } +if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : AST_ICONV_FOUND=yes else AST_ICONV_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ICONV_FOUND}" = "yes"; then @@ -21754,9 +21176,8 @@ fi ICONV_INCLUDE="-I${ICONV_DIR}/include" fi ICONV_INCLUDE="${ICONV_INCLUDE} " - if test "xiconv.h" = "x" ; then # no header, assume found - ICONV_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" @@ -21768,14 +21189,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" ICONV_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ICONV_LIB="" - fi + PBX_ICONV=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICONV 1 @@ -21798,16 +21217,12 @@ if test "x${PBX_ICONV}" != "x1" -a "${USE_ICONV}" != "no"; then pbxlibdir="-L${ICONV_DIR}" fi fi - pbxfuncname="iconv_close" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ICONV_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_close in -lc" >&5 +$as_echo_n "checking for iconv_close in -lc... " >&6; } +if ${ac_cv_lib_c_iconv_close+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21821,35 +21236,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char iconv_close (); int main () { -return ${pbxfuncname} (); +return iconv_close (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_c_iconv_close=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_c_iconv_close=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_close" >&5 +$as_echo "$ac_cv_lib_c_iconv_close" >&6; } +if test "x$ac_cv_lib_c_iconv_close" = xyes; then : AST_ICONV_FOUND=yes else AST_ICONV_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ICONV_FOUND}" = "yes"; then @@ -21859,9 +21273,8 @@ fi ICONV_INCLUDE="-I${ICONV_DIR}/include" fi ICONV_INCLUDE="${ICONV_INCLUDE} " - if test "xiconv.h" = "x" ; then # no header, assume found - ICONV_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" @@ -21873,14 +21286,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ICONV_HEADER_FOUND}" = "x0" ; then ICONV_LIB="" ICONV_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ICONV_LIB="" - fi + PBX_ICONV=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICONV 1 @@ -21904,16 +21315,12 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then pbxlibdir="-L${ICAL_DIR}" fi fi - pbxfuncname="icaltimezone_get_utc_timezone" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ICAL_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`$as_echo "ac_cv_lib_ical_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lical" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lical... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icaltimezone_get_utc_timezone in -lical" >&5 +$as_echo_n "checking for icaltimezone_get_utc_timezone in -lical... " >&6; } +if ${ac_cv_lib_ical_icaltimezone_get_utc_timezone+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -21927,35 +21334,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char icaltimezone_get_utc_timezone (); int main () { -return ${pbxfuncname} (); +return icaltimezone_get_utc_timezone (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ical_icaltimezone_get_utc_timezone=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ical_icaltimezone_get_utc_timezone=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&5 +$as_echo "$ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&6; } +if test "x$ac_cv_lib_ical_icaltimezone_get_utc_timezone" = xyes; then : AST_ICAL_FOUND=yes else AST_ICAL_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ICAL_FOUND}" = "yes"; then @@ -21965,9 +21371,8 @@ fi ICAL_INCLUDE="-I${ICAL_DIR}/include" fi ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xlibical/ical.h" = "x" ; then # no header, assume found - ICAL_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libical/ical.h" "ac_cv_header_libical_ical_h" "$ac_includes_default" @@ -21979,14 +21384,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ICAL_HEADER_FOUND}" = "x0" ; then ICAL_LIB="" ICAL_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ICAL_LIB="" - fi + PBX_ICAL=1 cat >>confdefs.h <<_ACEOF #define HAVE_ICAL 1 @@ -22009,16 +21412,12 @@ if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then pbxlibdir="-L${IKSEMEL_DIR}" fi fi - pbxfuncname="iks_start_sasl" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_IKSEMEL_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liksemel" >&5 -$as_echo_n "checking for ${pbxfuncname} in -liksemel... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iks_start_sasl in -liksemel" >&5 +$as_echo_n "checking for iks_start_sasl in -liksemel... " >&6; } +if ${ac_cv_lib_iksemel_iks_start_sasl+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22032,35 +21431,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char iks_start_sasl (); int main () { -return ${pbxfuncname} (); +return iks_start_sasl (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_iksemel_iks_start_sasl=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_iksemel_iks_start_sasl=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5 +$as_echo "$ac_cv_lib_iksemel_iks_start_sasl" >&6; } +if test "x$ac_cv_lib_iksemel_iks_start_sasl" = xyes; then : AST_IKSEMEL_FOUND=yes else AST_IKSEMEL_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_IKSEMEL_FOUND}" = "yes"; then @@ -22070,9 +21468,8 @@ fi IKSEMEL_INCLUDE="-I${IKSEMEL_DIR}/include" fi IKSEMEL_INCLUDE="${IKSEMEL_INCLUDE} " - if test "xiksemel.h" = "x" ; then # no header, assume found - IKSEMEL_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "iksemel.h" "ac_cv_header_iksemel_h" "$ac_includes_default" @@ -22084,14 +21481,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then IKSEMEL_LIB="" IKSEMEL_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - IKSEMEL_LIB="" - fi + PBX_IKSEMEL=1 cat >>confdefs.h <<_ACEOF #define HAVE_IKSEMEL 1 @@ -22742,16 +22137,12 @@ if test "x${PBX_IODBC}" != "x1" -a "${USE_IODBC}" != "no"; then pbxlibdir="-L${IODBC_DIR}" fi fi - pbxfuncname="SQLConnect" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_IODBC_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`$as_echo "ac_cv_lib_iodbc_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -liodbc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -liodbc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5 +$as_echo_n "checking for SQLConnect in -liodbc... " >&6; } +if ${ac_cv_lib_iodbc_SQLConnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22765,35 +22156,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char SQLConnect (); int main () { -return ${pbxfuncname} (); +return SQLConnect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_iodbc_SQLConnect=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_iodbc_SQLConnect=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLConnect" >&5 +$as_echo "$ac_cv_lib_iodbc_SQLConnect" >&6; } +if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes; then : AST_IODBC_FOUND=yes else AST_IODBC_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_IODBC_FOUND}" = "yes"; then @@ -22803,9 +22193,8 @@ fi IODBC_INCLUDE="-I${IODBC_DIR}/include" fi IODBC_INCLUDE="${IODBC_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xsql.h" = "x" ; then # no header, assume found - IODBC_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default" @@ -22817,14 +22206,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${IODBC_HEADER_FOUND}" = "x0" ; then IODBC_LIB="" IODBC_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - IODBC_LIB="" - fi + PBX_IODBC=1 cat >>confdefs.h <<_ACEOF #define HAVE_IODBC 1 @@ -22847,16 +22234,12 @@ if test "x${PBX_INOTIFY}" != "x1" -a "${USE_INOTIFY}" != "no"; then pbxlibdir="-L${INOTIFY_DIR}" fi fi - pbxfuncname="inotify_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_INOTIFY_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -lc" >&5 +$as_echo_n "checking for inotify_init in -lc... " >&6; } +if ${ac_cv_lib_c_inotify_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22870,35 +22253,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char inotify_init (); int main () { -return ${pbxfuncname} (); +return inotify_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_c_inotify_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_c_inotify_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5 +$as_echo "$ac_cv_lib_c_inotify_init" >&6; } +if test "x$ac_cv_lib_c_inotify_init" = xyes; then : AST_INOTIFY_FOUND=yes else AST_INOTIFY_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_INOTIFY_FOUND}" = "yes"; then @@ -22908,9 +22290,8 @@ fi INOTIFY_INCLUDE="-I${INOTIFY_DIR}/include" fi INOTIFY_INCLUDE="${INOTIFY_INCLUDE} " - if test "xsys/inotify.h" = "x" ; then # no header, assume found - INOTIFY_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" @@ -22922,14 +22303,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${INOTIFY_HEADER_FOUND}" = "x0" ; then INOTIFY_LIB="" INOTIFY_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - INOTIFY_LIB="" - fi + PBX_INOTIFY=1 cat >>confdefs.h <<_ACEOF #define HAVE_INOTIFY 1 @@ -22952,16 +22331,12 @@ if test "x${PBX_JACK}" != "x1" -a "${USE_JACK}" != "no"; then pbxlibdir="-L${JACK_DIR}" fi fi - pbxfuncname="jack_activate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_JACK_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_jack_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ljack" >&5 -$as_echo_n "checking for ${pbxfuncname} in -ljack... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_activate in -ljack" >&5 +$as_echo_n "checking for jack_activate in -ljack... " >&6; } +if ${ac_cv_lib_jack_jack_activate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22975,35 +22350,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char jack_activate (); int main () { -return ${pbxfuncname} (); +return jack_activate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_jack_jack_activate=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_jack_jack_activate=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_activate" >&5 +$as_echo "$ac_cv_lib_jack_jack_activate" >&6; } +if test "x$ac_cv_lib_jack_jack_activate" = xyes; then : AST_JACK_FOUND=yes else AST_JACK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_JACK_FOUND}" = "yes"; then @@ -23013,9 +22387,8 @@ fi JACK_INCLUDE="-I${JACK_DIR}/include" fi JACK_INCLUDE="${JACK_INCLUDE} " - if test "xjack/jack.h" = "x" ; then # no header, assume found - JACK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "jack/jack.h" "ac_cv_header_jack_jack_h" "$ac_includes_default" @@ -23027,14 +22400,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${JACK_HEADER_FOUND}" = "x0" ; then JACK_LIB="" JACK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - JACK_LIB="" - fi + PBX_JACK=1 cat >>confdefs.h <<_ACEOF #define HAVE_JACK 1 @@ -23058,16 +22429,12 @@ if test "x${PBX_KQUEUE}" != "x1" -a "${USE_KQUEUE}" != "no"; then pbxlibdir="-L${KQUEUE_DIR}" fi fi - pbxfuncname="kqueue" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_KQUEUE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue in -lc" >&5 +$as_echo_n "checking for kqueue in -lc... " >&6; } +if ${ac_cv_lib_c_kqueue+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23081,35 +22448,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char kqueue (); int main () { -return ${pbxfuncname} (); +return kqueue (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_c_kqueue=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_c_kqueue=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_kqueue" >&5 +$as_echo "$ac_cv_lib_c_kqueue" >&6; } +if test "x$ac_cv_lib_c_kqueue" = xyes; then : AST_KQUEUE_FOUND=yes else AST_KQUEUE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_KQUEUE_FOUND}" = "yes"; then @@ -23119,9 +22485,8 @@ fi KQUEUE_INCLUDE="-I${KQUEUE_DIR}/include" fi KQUEUE_INCLUDE="${KQUEUE_INCLUDE} " - if test "xsys/event.h" = "x" ; then # no header, assume found - KQUEUE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${KQUEUE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default" @@ -23133,14 +22498,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${KQUEUE_HEADER_FOUND}" = "x0" ; then KQUEUE_LIB="" KQUEUE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - KQUEUE_LIB="" - fi + PBX_KQUEUE=1 cat >>confdefs.h <<_ACEOF #define HAVE_KQUEUE 1 @@ -23177,16 +22540,12 @@ if test "x${PBX_LTDL}" != "x1" -a "${USE_LTDL}" != "no"; then pbxlibdir="-L${LTDL_DIR}" fi fi - pbxfuncname="lt_dlinit" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LTDL_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ltdl_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lltdl" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lltdl... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5 +$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; } +if ${ac_cv_lib_ltdl_lt_dlinit+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23200,35 +22559,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char lt_dlinit (); int main () { -return ${pbxfuncname} (); +return lt_dlinit (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ltdl_lt_dlinit=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ltdl_lt_dlinit=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ltdl_lt_dlinit" >&5 +$as_echo "$ac_cv_lib_ltdl_lt_dlinit" >&6; } +if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then : AST_LTDL_FOUND=yes else AST_LTDL_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LTDL_FOUND}" = "yes"; then @@ -23238,9 +22596,8 @@ fi LTDL_INCLUDE="-I${LTDL_DIR}/include" fi LTDL_INCLUDE="${LTDL_INCLUDE} " - if test "xltdl.h" = "x" ; then # no header, assume found - LTDL_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default" @@ -23252,14 +22609,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LTDL_HEADER_FOUND}" = "x0" ; then LTDL_LIB="" LTDL_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LTDL_LIB="" - fi + PBX_LTDL=1 cat >>confdefs.h <<_ACEOF #define HAVE_LTDL 1 @@ -23282,16 +22637,12 @@ if test "x${PBX_LDAP}" != "x1" -a "${USE_LDAP}" != "no"; then pbxlibdir="-L${LDAP_DIR}" fi fi - pbxfuncname="ldap_initialize" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LDAP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ldap_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lldap" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lldap... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5 +$as_echo_n "checking for ldap_initialize in -lldap... " >&6; } +if ${ac_cv_lib_ldap_ldap_initialize+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23305,35 +22656,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char ldap_initialize (); int main () { -return ${pbxfuncname} (); +return ldap_initialize (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ldap_ldap_initialize=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ldap_ldap_initialize=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5 +$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; } +if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then : AST_LDAP_FOUND=yes else AST_LDAP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LDAP_FOUND}" = "yes"; then @@ -23343,9 +22693,8 @@ fi LDAP_INCLUDE="-I${LDAP_DIR}/include" fi LDAP_INCLUDE="${LDAP_INCLUDE} " - if test "xldap.h" = "x" ; then # no header, assume found - LDAP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" @@ -23357,14 +22706,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LDAP_HEADER_FOUND}" = "x0" ; then LDAP_LIB="" LDAP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LDAP_LIB="" - fi + PBX_LDAP=1 cat >>confdefs.h <<_ACEOF #define HAVE_LDAP 1 @@ -23387,16 +22734,12 @@ if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then pbxlibdir="-L${MISDN_DIR}" fi fi - pbxfuncname="mISDN_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_MISDN_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lmISDN" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lmISDN... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mISDN_open in -lmISDN" >&5 +$as_echo_n "checking for mISDN_open in -lmISDN... " >&6; } +if ${ac_cv_lib_mISDN_mISDN_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23410,35 +22753,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char mISDN_open (); int main () { -return ${pbxfuncname} (); +return mISDN_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_mISDN_mISDN_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_mISDN_mISDN_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mISDN_mISDN_open" >&5 +$as_echo "$ac_cv_lib_mISDN_mISDN_open" >&6; } +if test "x$ac_cv_lib_mISDN_mISDN_open" = xyes; then : AST_MISDN_FOUND=yes else AST_MISDN_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_MISDN_FOUND}" = "yes"; then @@ -23448,9 +22790,8 @@ fi MISDN_INCLUDE="-I${MISDN_DIR}/include" fi MISDN_INCLUDE="${MISDN_INCLUDE} " - if test "xmISDNuser/mISDNlib.h" = "x" ; then # no header, assume found - MISDN_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/mISDNlib.h" "ac_cv_header_mISDNuser_mISDNlib_h" "$ac_includes_default" @@ -23462,14 +22803,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${MISDN_HEADER_FOUND}" = "x0" ; then MISDN_LIB="" MISDN_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - MISDN_LIB="" - fi + PBX_MISDN=1 cat >>confdefs.h <<_ACEOF #define HAVE_MISDN 1 @@ -23493,16 +22832,12 @@ if test "x${PBX_ISDNNET}" != "x1" -a "${USE_ISDNNET}" != "no"; then pbxlibdir="-L${ISDNNET_DIR}" fi fi - pbxfuncname="init_manager" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ISDNNET_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_isdnnet_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lisdnnet" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lisdnnet... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_manager in -lisdnnet" >&5 +$as_echo_n "checking for init_manager in -lisdnnet... " >&6; } +if ${ac_cv_lib_isdnnet_init_manager+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23516,35 +22851,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char init_manager (); int main () { -return ${pbxfuncname} (); +return init_manager (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_isdnnet_init_manager=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_isdnnet_init_manager=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_isdnnet_init_manager" >&5 +$as_echo "$ac_cv_lib_isdnnet_init_manager" >&6; } +if test "x$ac_cv_lib_isdnnet_init_manager" = xyes; then : AST_ISDNNET_FOUND=yes else AST_ISDNNET_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ISDNNET_FOUND}" = "yes"; then @@ -23554,9 +22888,8 @@ fi ISDNNET_INCLUDE="-I${ISDNNET_DIR}/include" fi ISDNNET_INCLUDE="${ISDNNET_INCLUDE} " - if test "xmISDNuser/isdn_net.h" = "x" ; then # no header, assume found - ISDNNET_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/isdn_net.h" "ac_cv_header_mISDNuser_isdn_net_h" "$ac_includes_default" @@ -23568,14 +22901,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then ISDNNET_LIB="" ISDNNET_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ISDNNET_LIB="" - fi + PBX_ISDNNET=1 cat >>confdefs.h <<_ACEOF #define HAVE_ISDNNET 1 @@ -23597,16 +22928,12 @@ if test "x${PBX_SUPPSERV}" != "x1" -a "${USE_SUPPSERV}" != "no"; then pbxlibdir="-L${SUPPSERV_DIR}" fi fi - pbxfuncname="encodeFac" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SUPPSERV_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_suppserv_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsuppserv" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsuppserv... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for encodeFac in -lsuppserv" >&5 +$as_echo_n "checking for encodeFac in -lsuppserv... " >&6; } +if ${ac_cv_lib_suppserv_encodeFac+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23620,35 +22947,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char encodeFac (); int main () { -return ${pbxfuncname} (); +return encodeFac (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_suppserv_encodeFac=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_suppserv_encodeFac=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_suppserv_encodeFac" >&5 +$as_echo "$ac_cv_lib_suppserv_encodeFac" >&6; } +if test "x$ac_cv_lib_suppserv_encodeFac" = xyes; then : AST_SUPPSERV_FOUND=yes else AST_SUPPSERV_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SUPPSERV_FOUND}" = "yes"; then @@ -23658,9 +22984,8 @@ fi SUPPSERV_INCLUDE="-I${SUPPSERV_DIR}/include" fi SUPPSERV_INCLUDE="${SUPPSERV_INCLUDE} " - if test "xmISDNuser/suppserv.h" = "x" ; then # no header, assume found - SUPPSERV_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/suppserv.h" "ac_cv_header_mISDNuser_suppserv_h" "$ac_includes_default" @@ -23672,14 +22997,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then SUPPSERV_LIB="" SUPPSERV_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SUPPSERV_LIB="" - fi + PBX_SUPPSERV=1 cat >>confdefs.h <<_ACEOF #define HAVE_SUPPSERV 1 @@ -23906,47 +23229,18 @@ else fi if test ! "x${CONFIG_MYSQLCLIENT}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - MYSQLCLIENT_INCLUDE=$(${CONFIG_MYSQLCLIENT} $A) + MYSQLCLIENT_INCLUDE=$(${CONFIG_MYSQLCLIENT} --cflags) MYSQLCLIENT_INCLUDE=$(echo ${MYSQLCLIENT_INCLUDE} | $SED -e "s|-I|-I${MYSQLCLIENT_DIR}|g") - if test x"" = x ; then A=--libs ; else A="" ; fi - MYSQLCLIENT_LIB=$(${CONFIG_MYSQLCLIENT} $A) + MYSQLCLIENT_LIB=$(${CONFIG_MYSQLCLIENT} --libs) MYSQLCLIENT_LIB=$(echo ${MYSQLCLIENT_LIB} | $SED -e "s|-L|-L${MYSQLCLIENT_DIR}|g") - if test x"" != x ; then - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${MYSQLCLIENT_INCLUDE}" - - saved_libs="${LIBS}" - LIBS=${MYSQLCLIENT_LIB} - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - PBX_MYSQLCLIENT=1 -$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - LIBS="${saved_libs}" - else PBX_MYSQLCLIENT=1 $as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h - fi + fi fi @@ -23962,16 +23256,12 @@ if test "x${PBX_NBS}" != "x1" -a "${USE_NBS}" != "no"; then pbxlibdir="-L${NBS_DIR}" fi fi - pbxfuncname="nbs_connect" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NBS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_nbs_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnbs" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lnbs... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nbs_connect in -lnbs" >&5 +$as_echo_n "checking for nbs_connect in -lnbs... " >&6; } +if ${ac_cv_lib_nbs_nbs_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23985,35 +23275,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char nbs_connect (); int main () { -return ${pbxfuncname} (); +return nbs_connect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_nbs_nbs_connect=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_nbs_nbs_connect=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nbs_nbs_connect" >&5 +$as_echo "$ac_cv_lib_nbs_nbs_connect" >&6; } +if test "x$ac_cv_lib_nbs_nbs_connect" = xyes; then : AST_NBS_FOUND=yes else AST_NBS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_NBS_FOUND}" = "yes"; then @@ -24023,9 +23312,8 @@ fi NBS_INCLUDE="-I${NBS_DIR}/include" fi NBS_INCLUDE="${NBS_INCLUDE} " - if test "xnbs.h" = "x" ; then # no header, assume found - NBS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "nbs.h" "ac_cv_header_nbs_h" "$ac_includes_default" @@ -24037,14 +23325,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${NBS_HEADER_FOUND}" = "x0" ; then NBS_LIB="" NBS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NBS_LIB="" - fi + PBX_NBS=1 cat >>confdefs.h <<_ACEOF #define HAVE_NBS 1 @@ -24160,47 +23446,18 @@ else fi if test ! "x${CONFIG_NEON}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - NEON_INCLUDE=$(${CONFIG_NEON} $A) + NEON_INCLUDE=$(${CONFIG_NEON} --cflags) NEON_INCLUDE=$(echo ${NEON_INCLUDE} | $SED -e "s|-I|-I${NEON_DIR}|g") - if test x"" = x ; then A=--libs ; else A="" ; fi - NEON_LIB=$(${CONFIG_NEON} $A) + NEON_LIB=$(${CONFIG_NEON} --libs) NEON_LIB=$(echo ${NEON_LIB} | $SED -e "s|-L|-L${NEON_DIR}|g") - if test x"" != x ; then - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${NEON_INCLUDE}" - - saved_libs="${LIBS}" - LIBS=${NEON_LIB} - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - PBX_NEON=1 -$as_echo "#define HAVE_NEON 1" >>confdefs.h - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - LIBS="${saved_libs}" - else PBX_NEON=1 $as_echo "#define HAVE_NEON 1" >>confdefs.h - fi + fi fi @@ -24309,15 +23566,13 @@ else fi if test ! "x${CONFIG_NEON29}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - NEON29_INCLUDE=$(${CONFIG_NEON29} $A) + NEON29_INCLUDE=$(${CONFIG_NEON29} --cflags) NEON29_INCLUDE=$(echo ${NEON29_INCLUDE} | $SED -e "s|-I|-I${NEON29_DIR}|g") - if test x"--libs" = x ; then A=--libs ; else A="--libs" ; fi - NEON29_LIB=$(${CONFIG_NEON29} $A) + NEON29_LIB=$(${CONFIG_NEON29} --libs) NEON29_LIB=$(echo ${NEON29_LIB} | $SED -e "s|-L|-L${NEON29_DIR}|g") - if test x"#include <ne_auth.h>" != x ; then + saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NEON29_INCLUDE}" @@ -24346,12 +23601,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else - PBX_NEON29=1 -$as_echo "#define HAVE_NEON29 1" >>confdefs.h - - fi fi fi @@ -24460,17 +23710,13 @@ else fi if test ! "x${CONFIG_NETSNMP}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - NETSNMP_INCLUDE=$(${CONFIG_NETSNMP} $A) + NETSNMP_INCLUDE=$(${CONFIG_NETSNMP} --cflags) NETSNMP_INCLUDE=$(echo ${NETSNMP_INCLUDE} | $SED -e "s|-I|-I${NETSNMP_DIR}|g") - if test x"--agent-libs" = x ; then A=--libs ; else A="--agent-libs" ; fi - NETSNMP_LIB=$(${CONFIG_NETSNMP} $A) + NETSNMP_LIB=$(${CONFIG_NETSNMP} --agent-libs) NETSNMP_LIB=$(echo ${NETSNMP_LIB} | $SED -e "s|-L|-L${NETSNMP_DIR}|g") - if test x"#include <net-snmp/net-snmp-config.h> -#include <net-snmp/net-snmp-includes.h> -#include <net-snmp/agent/net-snmp-agent-includes.h>" != x ; then + saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}" @@ -24499,12 +23745,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else - PBX_NETSNMP=1 - -$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h - fi fi fi @@ -24520,16 +23761,12 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then pbxlibdir="-L${NEWT_DIR}" fi fi - pbxfuncname="newtBell" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NEWT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5 +$as_echo_n "checking for newtBell in -lnewt... " >&6; } +if ${ac_cv_lib_newt_newtBell+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24543,35 +23780,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char newtBell (); int main () { -return ${pbxfuncname} (); +return newtBell (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_newt_newtBell=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_newt_newtBell=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5 +$as_echo "$ac_cv_lib_newt_newtBell" >&6; } +if test "x$ac_cv_lib_newt_newtBell" = xyes; then : AST_NEWT_FOUND=yes else AST_NEWT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_NEWT_FOUND}" = "yes"; then @@ -24581,9 +23817,8 @@ fi NEWT_INCLUDE="-I${NEWT_DIR}/include" fi NEWT_INCLUDE="${NEWT_INCLUDE} " - if test "xnewt.h" = "x" ; then # no header, assume found - NEWT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default" @@ -24595,14 +23830,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${NEWT_HEADER_FOUND}" = "x0" ; then NEWT_LIB="" NEWT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NEWT_LIB="" - fi + PBX_NEWT=1 cat >>confdefs.h <<_ACEOF #define HAVE_NEWT 1 @@ -24632,16 +23865,12 @@ if test "x${PBX_UNBOUND}" != "x1" -a "${USE_UNBOUND}" != "no"; then pbxlibdir="-L${UNBOUND_DIR}" fi fi - pbxfuncname="ub_ctx_delete" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_UNBOUND_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_unbound_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lunbound" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lunbound... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ub_ctx_delete in -lunbound" >&5 +$as_echo_n "checking for ub_ctx_delete in -lunbound... " >&6; } +if ${ac_cv_lib_unbound_ub_ctx_delete+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24655,35 +23884,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char ub_ctx_delete (); int main () { -return ${pbxfuncname} (); +return ub_ctx_delete (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_unbound_ub_ctx_delete=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_unbound_ub_ctx_delete=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_ub_ctx_delete" >&5 +$as_echo "$ac_cv_lib_unbound_ub_ctx_delete" >&6; } +if test "x$ac_cv_lib_unbound_ub_ctx_delete" = xyes; then : AST_UNBOUND_FOUND=yes else AST_UNBOUND_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_UNBOUND_FOUND}" = "yes"; then @@ -24693,9 +23921,8 @@ fi UNBOUND_INCLUDE="-I${UNBOUND_DIR}/include" fi UNBOUND_INCLUDE="${UNBOUND_INCLUDE} " - if test "xunbound.h" = "x" ; then # no header, assume found - UNBOUND_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${UNBOUND_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "unbound.h" "ac_cv_header_unbound_h" "$ac_includes_default" @@ -24707,14 +23934,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${UNBOUND_HEADER_FOUND}" = "x0" ; then UNBOUND_LIB="" UNBOUND_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - UNBOUND_LIB="" - fi + PBX_UNBOUND=1 cat >>confdefs.h <<_ACEOF #define HAVE_UNBOUND 1 @@ -24780,16 +24005,12 @@ if test "x${PBX_UNIXODBC}" != "x1" -a "${USE_UNIXODBC}" != "no"; then pbxlibdir="-L${UNIXODBC_DIR}" fi fi - pbxfuncname="SQLConnect" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_UNIXODBC_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_odbc_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lodbc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lodbc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5 +$as_echo_n "checking for SQLConnect in -lodbc... " >&6; } +if ${ac_cv_lib_odbc_SQLConnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24803,35 +24024,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char SQLConnect (); int main () { -return ${pbxfuncname} (); +return SQLConnect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_odbc_SQLConnect=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_odbc_SQLConnect=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5 +$as_echo "$ac_cv_lib_odbc_SQLConnect" >&6; } +if test "x$ac_cv_lib_odbc_SQLConnect" = xyes; then : AST_UNIXODBC_FOUND=yes else AST_UNIXODBC_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_UNIXODBC_FOUND}" = "yes"; then @@ -24841,9 +24061,8 @@ fi UNIXODBC_INCLUDE="-I${UNIXODBC_DIR}/include" fi UNIXODBC_INCLUDE="${UNIXODBC_INCLUDE} " - if test "xsql.h" = "x" ; then # no header, assume found - UNIXODBC_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default" @@ -24855,14 +24074,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then UNIXODBC_LIB="" UNIXODBC_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - UNIXODBC_LIB="" - fi + PBX_UNIXODBC=1 cat >>confdefs.h <<_ACEOF #define HAVE_UNIXODBC 1 @@ -24885,16 +24102,12 @@ if test "x${PBX_OGG}" != "x1" -a "${USE_OGG}" != "no"; then pbxlibdir="-L${OGG_DIR}" fi fi - pbxfuncname="ogg_sync_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OGG_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ogg_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -logg" >&5 -$as_echo_n "checking for ${pbxfuncname} in -logg... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_sync_init in -logg" >&5 +$as_echo_n "checking for ogg_sync_init in -logg... " >&6; } +if ${ac_cv_lib_ogg_ogg_sync_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24908,35 +24121,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char ogg_sync_init (); int main () { -return ${pbxfuncname} (); +return ogg_sync_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ogg_ogg_sync_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ogg_ogg_sync_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_sync_init" >&5 +$as_echo "$ac_cv_lib_ogg_ogg_sync_init" >&6; } +if test "x$ac_cv_lib_ogg_ogg_sync_init" = xyes; then : AST_OGG_FOUND=yes else AST_OGG_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OGG_FOUND}" = "yes"; then @@ -24946,28 +24158,15 @@ fi OGG_INCLUDE="-I${OGG_DIR}/include" fi OGG_INCLUDE="${OGG_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - OGG_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - OGG_HEADER_FOUND=1 -else - OGG_HEADER_FOUND=0 -fi + # no header, assume found + OGG_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${OGG_HEADER_FOUND}" = "x0" ; then OGG_LIB="" OGG_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OGG_LIB="" - fi + PBX_OGG=1 cat >>confdefs.h <<_ACEOF #define HAVE_OGG 1 @@ -24991,16 +24190,12 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then pbxlibdir="-L${BKTR_DIR}" fi fi - pbxfuncname="backtrace" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BKTR_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_execinfo_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lexecinfo" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lexecinfo... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5 +$as_echo_n "checking for backtrace in -lexecinfo... " >&6; } +if ${ac_cv_lib_execinfo_backtrace+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25014,35 +24209,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char backtrace (); int main () { -return ${pbxfuncname} (); +return backtrace (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_execinfo_backtrace=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_execinfo_backtrace=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5 +$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; } +if test "x$ac_cv_lib_execinfo_backtrace" = xyes; then : AST_BKTR_FOUND=yes else AST_BKTR_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BKTR_FOUND}" = "yes"; then @@ -25052,9 +24246,8 @@ fi BKTR_INCLUDE="-I${BKTR_DIR}/include" fi BKTR_INCLUDE="${BKTR_INCLUDE} " - if test "xexecinfo.h" = "x" ; then # no header, assume found - BKTR_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" @@ -25066,14 +24259,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" BKTR_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BKTR_LIB="" - fi + PBX_BKTR=1 cat >>confdefs.h <<_ACEOF #define HAVE_BKTR 1 @@ -25096,16 +24287,12 @@ if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then pbxlibdir="-L${BKTR_DIR}" fi fi - pbxfuncname="backtrace" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BKTR_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_c_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lc" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lc... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5 +$as_echo_n "checking for backtrace in -lc... " >&6; } +if ${ac_cv_lib_c_backtrace+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25119,35 +24306,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char backtrace (); int main () { -return ${pbxfuncname} (); +return backtrace (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_c_backtrace=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_c_backtrace=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 +$as_echo "$ac_cv_lib_c_backtrace" >&6; } +if test "x$ac_cv_lib_c_backtrace" = xyes; then : AST_BKTR_FOUND=yes else AST_BKTR_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BKTR_FOUND}" = "yes"; then @@ -25157,9 +24343,8 @@ fi BKTR_INCLUDE="-I${BKTR_DIR}/include" fi BKTR_INCLUDE="${BKTR_INCLUDE} " - if test "xexecinfo.h" = "x" ; then # no header, assume found - BKTR_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" @@ -25171,14 +24356,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BKTR_HEADER_FOUND}" = "x0" ; then BKTR_LIB="" BKTR_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BKTR_LIB="" - fi + PBX_BKTR=1 cat >>confdefs.h <<_ACEOF #define HAVE_BKTR 1 @@ -25201,16 +24384,12 @@ if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then pbxlibdir="-L${BLUETOOTH_DIR}" fi fi - pbxfuncname="ba2str" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BLUETOOTH_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbluetooth" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lbluetooth... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ba2str in -lbluetooth" >&5 +$as_echo_n "checking for ba2str in -lbluetooth... " >&6; } +if ${ac_cv_lib_bluetooth_ba2str+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25224,35 +24403,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char ba2str (); int main () { -return ${pbxfuncname} (); +return ba2str (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_bluetooth_ba2str=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_bluetooth_ba2str=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_ba2str" >&5 +$as_echo "$ac_cv_lib_bluetooth_ba2str" >&6; } +if test "x$ac_cv_lib_bluetooth_ba2str" = xyes; then : AST_BLUETOOTH_FOUND=yes else AST_BLUETOOTH_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BLUETOOTH_FOUND}" = "yes"; then @@ -25262,9 +24440,8 @@ fi BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include" fi BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} " - if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found - BLUETOOTH_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" @@ -25276,14 +24453,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then BLUETOOTH_LIB="" BLUETOOTH_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BLUETOOTH_LIB="" - fi + PBX_BLUETOOTH=1 cat >>confdefs.h <<_ACEOF #define HAVE_BLUETOOTH 1 @@ -25306,16 +24481,12 @@ if test "x${PBX_BEANSTALK}" != "x1" -a "${USE_BEANSTALK}" != "no"; then pbxlibdir="-L${BEANSTALK_DIR}" fi fi - pbxfuncname="bs_version" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_BEANSTALK_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_beanstalk_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lbeanstalk" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lbeanstalk... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bs_version in -lbeanstalk" >&5 +$as_echo_n "checking for bs_version in -lbeanstalk... " >&6; } +if ${ac_cv_lib_beanstalk_bs_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25329,35 +24500,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char bs_version (); int main () { -return ${pbxfuncname} (); +return bs_version (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_beanstalk_bs_version=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_beanstalk_bs_version=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_beanstalk_bs_version" >&5 +$as_echo "$ac_cv_lib_beanstalk_bs_version" >&6; } +if test "x$ac_cv_lib_beanstalk_bs_version" = xyes; then : AST_BEANSTALK_FOUND=yes else AST_BEANSTALK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_BEANSTALK_FOUND}" = "yes"; then @@ -25367,9 +24537,8 @@ fi BEANSTALK_INCLUDE="-I${BEANSTALK_DIR}/include" fi BEANSTALK_INCLUDE="${BEANSTALK_INCLUDE} " - if test "xbeanstalk.h" = "x" ; then # no header, assume found - BEANSTALK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${BEANSTALK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "beanstalk.h" "ac_cv_header_beanstalk_h" "$ac_includes_default" @@ -25381,14 +24550,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${BEANSTALK_HEADER_FOUND}" = "x0" ; then BEANSTALK_LIB="" BEANSTALK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - BEANSTALK_LIB="" - fi + PBX_BEANSTALK=1 cat >>confdefs.h <<_ACEOF #define HAVE_BEANSTALK 1 @@ -25412,58 +24579,10 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then pbxlibdir="-L${OSS_DIR}" fi fi - pbxfuncname="" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OSS_FOUND=yes - else - ast_ext_lib_check_save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lossaudio ${pbxlibdir} $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_OSS_FOUND=yes -else - AST_OSS_FOUND=no -fi + # empty lib, assume only headers + AST_OSS_FOUND=yes - CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi # now check for the header. if test "${AST_OSS_FOUND}" = "yes"; then @@ -25473,9 +24592,8 @@ fi OSS_INCLUDE="-I${OSS_DIR}/include" fi OSS_INCLUDE="${OSS_INCLUDE} " - if test "xlinux/soundcard.h" = "x" ; then # no header, assume found - OSS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default" @@ -25487,14 +24605,15 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" OSS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + + # only checking headers -> no library OSS_LIB="" - fi + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 @@ -25516,58 +24635,10 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then pbxlibdir="-L${OSS_DIR}" fi fi - pbxfuncname="" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OSS_FOUND=yes - else - ast_ext_lib_check_save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lossaudio ${pbxlibdir} $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_OSS_FOUND=yes -else - AST_OSS_FOUND=no -fi + # empty lib, assume only headers + AST_OSS_FOUND=yes - CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi # now check for the header. if test "${AST_OSS_FOUND}" = "yes"; then @@ -25577,9 +24648,8 @@ fi OSS_INCLUDE="-I${OSS_DIR}/include" fi OSS_INCLUDE="${OSS_INCLUDE} " - if test "xsys/soundcard.h" = "x" ; then # no header, assume found - OSS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default" @@ -25591,14 +24661,15 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" OSS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + + # only checking headers -> no library OSS_LIB="" - fi + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 @@ -25620,16 +24691,12 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then pbxlibdir="-L${OSS_DIR}" fi fi - pbxfuncname="oss_ioctl_mixer" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OSS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ossaudio_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lossaudio" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lossaudio... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oss_ioctl_mixer in -lossaudio" >&5 +$as_echo_n "checking for oss_ioctl_mixer in -lossaudio... " >&6; } +if ${ac_cv_lib_ossaudio_oss_ioctl_mixer+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25643,35 +24710,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char oss_ioctl_mixer (); int main () { -return ${pbxfuncname} (); +return oss_ioctl_mixer (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ossaudio_oss_ioctl_mixer=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ossaudio_oss_ioctl_mixer=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5 +$as_echo "$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; } +if test "x$ac_cv_lib_ossaudio_oss_ioctl_mixer" = xyes; then : AST_OSS_FOUND=yes else AST_OSS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OSS_FOUND}" = "yes"; then @@ -25681,9 +24747,8 @@ fi OSS_INCLUDE="-I${OSS_DIR}/include" fi OSS_INCLUDE="${OSS_INCLUDE} " - if test "xsoundcard.h" = "x" ; then # no header, assume found - OSS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default" @@ -25695,14 +24760,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OSS_HEADER_FOUND}" = "x0" ; then OSS_LIB="" OSS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OSS_LIB="" - fi + PBX_OSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OSS 1 @@ -26145,16 +25208,12 @@ if test "x${PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK}" != "x1" -a "${USE_PJSIP_DLG_ pbxlibdir="-L${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}" fi fi - pbxfuncname="pjsip_dlg_create_uas_and_inc_lock" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip" >&5 +$as_echo_n "checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26168,35 +25227,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_dlg_create_uas_and_inc_lock (); int main () { -return ${pbxfuncname} (); +return pjsip_dlg_create_uas_and_inc_lock (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" = xyes; then : AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=yes else AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND}" = "yes"; then @@ -26206,9 +25264,8 @@ fi PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="-I${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_DIR}/include" fi PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26220,14 +25277,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND}" = "x0" ; then PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB="" PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_LIB="" - fi + PBX_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK 1 @@ -26249,16 +25304,12 @@ if test "x${PBX_PJ_TRANSACTION_GRP_LOCK}" != "x1" -a "${USE_PJ_TRANSACTION_GRP_L pbxlibdir="-L${PJ_TRANSACTION_GRP_LOCK_DIR}" fi fi - pbxfuncname="pjsip_tsx_create_uac2" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJ_TRANSACTION_GRP_LOCK_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_create_uac2 in -lpjsip" >&5 +$as_echo_n "checking for pjsip_tsx_create_uac2 in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_tsx_create_uac2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26272,35 +25323,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_tsx_create_uac2 (); int main () { -return ${pbxfuncname} (); +return pjsip_tsx_create_uac2 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_tsx_create_uac2=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_tsx_create_uac2=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" = xyes; then : AST_PJ_TRANSACTION_GRP_LOCK_FOUND=yes else AST_PJ_TRANSACTION_GRP_LOCK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJ_TRANSACTION_GRP_LOCK_FOUND}" = "yes"; then @@ -26310,9 +25360,8 @@ fi PJ_TRANSACTION_GRP_LOCK_INCLUDE="-I${PJ_TRANSACTION_GRP_LOCK_DIR}/include" fi PJ_TRANSACTION_GRP_LOCK_INCLUDE="${PJ_TRANSACTION_GRP_LOCK_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJ_TRANSACTION_GRP_LOCK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26324,14 +25373,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND}" = "x0" ; then PJ_TRANSACTION_GRP_LOCK_LIB="" PJ_TRANSACTION_GRP_LOCK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJ_TRANSACTION_GRP_LOCK_LIB="" - fi + PBX_PJ_TRANSACTION_GRP_LOCK=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJ_TRANSACTION_GRP_LOCK 1 @@ -26349,13 +25396,8 @@ fi LIBS="${LIBS} ${PJPROJECT_LIB}" if test "x${PBX_PJSIP_REPLACE_MEDIA_STREAM}" != "x1" -a "${USE_PJSIP_REPLACE_MEDIA_STREAM}" != "no"; then - if test "x" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5 -$as_echo_n "checking for ... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5 $as_echo_n "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${PJSIP_REPLACE_MEDIA_STREAM_DIR}" != "x"; then PJSIP_REPLACE_MEDIA_STREAM_INCLUDE="-I${PJSIP_REPLACE_MEDIA_STREAM_DIR}/include" @@ -26406,16 +25448,12 @@ if test "x${PBX_PJSIP_GET_DEST_INFO}" != "x1" -a "${USE_PJSIP_GET_DEST_INFO}" != pbxlibdir="-L${PJSIP_GET_DEST_INFO_DIR}" fi fi - pbxfuncname="pjsip_get_dest_info" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_GET_DEST_INFO_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_get_dest_info in -lpjsip" >&5 +$as_echo_n "checking for pjsip_get_dest_info in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_get_dest_info+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26429,35 +25467,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_get_dest_info (); int main () { -return ${pbxfuncname} (); +return pjsip_get_dest_info (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_get_dest_info=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_get_dest_info=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_get_dest_info" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_get_dest_info" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_get_dest_info" = xyes; then : AST_PJSIP_GET_DEST_INFO_FOUND=yes else AST_PJSIP_GET_DEST_INFO_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_GET_DEST_INFO_FOUND}" = "yes"; then @@ -26467,9 +25504,8 @@ fi PJSIP_GET_DEST_INFO_INCLUDE="-I${PJSIP_GET_DEST_INFO_DIR}/include" fi PJSIP_GET_DEST_INFO_INCLUDE="${PJSIP_GET_DEST_INFO_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_GET_DEST_INFO_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_GET_DEST_INFO_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26481,14 +25517,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_GET_DEST_INFO_HEADER_FOUND}" = "x0" ; then PJSIP_GET_DEST_INFO_LIB="" PJSIP_GET_DEST_INFO_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_GET_DEST_INFO_LIB="" - fi + PBX_PJSIP_GET_DEST_INFO=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_GET_DEST_INFO 1 @@ -26510,16 +25544,12 @@ if test "x${PBX_PJ_SSL_CERT_LOAD_FROM_FILES2}" != "x1" -a "${USE_PJ_SSL_CERT_LOA pbxlibdir="-L${PJ_SSL_CERT_LOAD_FROM_FILES2_DIR}" fi fi - pbxfuncname="pj_ssl_cert_load_from_files2" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS" - as_ac_Lib=`$as_echo "ac_cv_lib_pj_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpj" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpj... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_ssl_cert_load_from_files2 in -lpj" >&5 +$as_echo_n "checking for pj_ssl_cert_load_from_files2 in -lpj... " >&6; } +if ${ac_cv_lib_pj_pj_ssl_cert_load_from_files2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26533,35 +25563,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pj_ssl_cert_load_from_files2 (); int main () { -return ${pbxfuncname} (); +return pj_ssl_cert_load_from_files2 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pj_pj_ssl_cert_load_from_files2=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pj_pj_ssl_cert_load_from_files2=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&5 +$as_echo "$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&6; } +if test "x$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" = xyes; then : AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes else AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND}" = "yes"; then @@ -26571,9 +25600,8 @@ fi PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE="-I${PJ_SSL_CERT_LOAD_FROM_FILES2_DIR}/include" fi PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE="${PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjlib.h" = "x" ; then # no header, assume found - PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjlib.h" "ac_cv_header_pjlib_h" "$ac_includes_default" @@ -26585,14 +25613,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND}" = "x0" ; then PJ_SSL_CERT_LOAD_FROM_FILES2_LIB="" PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJ_SSL_CERT_LOAD_FROM_FILES2_LIB="" - fi + PBX_PJ_SSL_CERT_LOAD_FROM_FILES2=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 1 @@ -26614,16 +25640,12 @@ if test "x${PBX_PJSIP_EXTERNAL_RESOLVER}" != "x1" -a "${USE_PJSIP_EXTERNAL_RESOL pbxlibdir="-L${PJSIP_EXTERNAL_RESOLVER_DIR}" fi fi - pbxfuncname="pjsip_endpt_set_ext_resolver" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_EXTERNAL_RESOLVER_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_endpt_set_ext_resolver in -lpjsip" >&5 +$as_echo_n "checking for pjsip_endpt_set_ext_resolver in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26637,35 +25659,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_endpt_set_ext_resolver (); int main () { -return ${pbxfuncname} (); +return pjsip_endpt_set_ext_resolver (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" = xyes; then : AST_PJSIP_EXTERNAL_RESOLVER_FOUND=yes else AST_PJSIP_EXTERNAL_RESOLVER_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_EXTERNAL_RESOLVER_FOUND}" = "yes"; then @@ -26675,9 +25696,8 @@ fi PJSIP_EXTERNAL_RESOLVER_INCLUDE="-I${PJSIP_EXTERNAL_RESOLVER_DIR}/include" fi PJSIP_EXTERNAL_RESOLVER_INCLUDE="${PJSIP_EXTERNAL_RESOLVER_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_EXTERNAL_RESOLVER_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26689,14 +25709,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND}" = "x0" ; then PJSIP_EXTERNAL_RESOLVER_LIB="" PJSIP_EXTERNAL_RESOLVER_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_EXTERNAL_RESOLVER_LIB="" - fi + PBX_PJSIP_EXTERNAL_RESOLVER=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_EXTERNAL_RESOLVER 1 @@ -26714,13 +25732,8 @@ fi LIBS="${LIBS} ${PJPROJECT_LIB}" if test "x${PBX_PJSIP_TLS_TRANSPORT_PROTO}" != "x1" -a "${USE_PJSIP_TLS_TRANSPORT_PROTO}" != "no"; then - if test "x" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for " >&5 -$as_echo_n "checking for ... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5 $as_echo_n "checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${PJSIP_TLS_TRANSPORT_PROTO_DIR}" != "x"; then PJSIP_TLS_TRANSPORT_PROTO_INCLUDE="-I${PJSIP_TLS_TRANSPORT_PROTO_DIR}/include" @@ -26771,16 +25784,12 @@ if test "x${PBX_PJSIP_EVSUB_GRP_LOCK}" != "x1" -a "${USE_PJSIP_EVSUB_GRP_LOCK}" pbxlibdir="-L${PJSIP_EVSUB_GRP_LOCK_DIR}" fi fi - pbxfuncname="pjsip_evsub_add_ref" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_EVSUB_GRP_LOCK_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_add_ref in -lpjsip" >&5 +$as_echo_n "checking for pjsip_evsub_add_ref in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_evsub_add_ref+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26794,35 +25803,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_evsub_add_ref (); int main () { -return ${pbxfuncname} (); +return pjsip_evsub_add_ref (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_evsub_add_ref=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_evsub_add_ref=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_evsub_add_ref" = xyes; then : AST_PJSIP_EVSUB_GRP_LOCK_FOUND=yes else AST_PJSIP_EVSUB_GRP_LOCK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_EVSUB_GRP_LOCK_FOUND}" = "yes"; then @@ -26832,9 +25840,8 @@ fi PJSIP_EVSUB_GRP_LOCK_INCLUDE="-I${PJSIP_EVSUB_GRP_LOCK_DIR}/include" fi PJSIP_EVSUB_GRP_LOCK_INCLUDE="${PJSIP_EVSUB_GRP_LOCK_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_GRP_LOCK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26846,14 +25853,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND}" = "x0" ; then PJSIP_EVSUB_GRP_LOCK_LIB="" PJSIP_EVSUB_GRP_LOCK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_EVSUB_GRP_LOCK_LIB="" - fi + PBX_PJSIP_EVSUB_GRP_LOCK=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_EVSUB_GRP_LOCK 1 @@ -26875,16 +25880,12 @@ if test "x${PBX_PJSIP_INV_SESSION_REF}" != "x1" -a "${USE_PJSIP_INV_SESSION_REF} pbxlibdir="-L${PJSIP_INV_SESSION_REF_DIR}" fi fi - pbxfuncname="pjsip_inv_add_ref" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_INV_SESSION_REF_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_inv_add_ref in -lpjsip" >&5 +$as_echo_n "checking for pjsip_inv_add_ref in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_inv_add_ref+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26898,35 +25899,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_inv_add_ref (); int main () { -return ${pbxfuncname} (); +return pjsip_inv_add_ref (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_inv_add_ref=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_inv_add_ref=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_inv_add_ref" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_inv_add_ref" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_inv_add_ref" = xyes; then : AST_PJSIP_INV_SESSION_REF_FOUND=yes else AST_PJSIP_INV_SESSION_REF_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_INV_SESSION_REF_FOUND}" = "yes"; then @@ -26936,9 +25936,8 @@ fi PJSIP_INV_SESSION_REF_INCLUDE="-I${PJSIP_INV_SESSION_REF_DIR}/include" fi PJSIP_INV_SESSION_REF_INCLUDE="${PJSIP_INV_SESSION_REF_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_INV_SESSION_REF_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_INV_SESSION_REF_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -26950,14 +25949,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_INV_SESSION_REF_HEADER_FOUND}" = "x0" ; then PJSIP_INV_SESSION_REF_LIB="" PJSIP_INV_SESSION_REF_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_INV_SESSION_REF_LIB="" - fi + PBX_PJSIP_INV_SESSION_REF=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_INV_SESSION_REF 1 @@ -26979,16 +25976,12 @@ if test "x${PBX_PJSIP_AUTH_CLT_DEINIT}" != "x1" -a "${USE_PJSIP_AUTH_CLT_DEINIT} pbxlibdir="-L${PJSIP_AUTH_CLT_DEINIT_DIR}" fi fi - pbxfuncname="pjsip_auth_clt_deinit" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_AUTH_CLT_DEINIT_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_auth_clt_deinit in -lpjsip" >&5 +$as_echo_n "checking for pjsip_auth_clt_deinit in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_auth_clt_deinit+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27002,35 +25995,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_auth_clt_deinit (); int main () { -return ${pbxfuncname} (); +return pjsip_auth_clt_deinit (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_auth_clt_deinit=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_auth_clt_deinit=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" = xyes; then : AST_PJSIP_AUTH_CLT_DEINIT_FOUND=yes else AST_PJSIP_AUTH_CLT_DEINIT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_AUTH_CLT_DEINIT_FOUND}" = "yes"; then @@ -27040,9 +26032,8 @@ fi PJSIP_AUTH_CLT_DEINIT_INCLUDE="-I${PJSIP_AUTH_CLT_DEINIT_DIR}/include" fi PJSIP_AUTH_CLT_DEINIT_INCLUDE="${PJSIP_AUTH_CLT_DEINIT_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_AUTH_CLT_DEINIT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -27054,14 +26045,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND}" = "x0" ; then PJSIP_AUTH_CLT_DEINIT_LIB="" PJSIP_AUTH_CLT_DEINIT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_AUTH_CLT_DEINIT_LIB="" - fi + PBX_PJSIP_AUTH_CLT_DEINIT=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_AUTH_CLT_DEINIT 1 @@ -27083,16 +26072,12 @@ if test "x${PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT}" != "x1" -a "${USE_PJSIP_EVSUB_SET_ 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 "$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 @@ -27106,35 +26091,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_evsub_set_uas_timeout (); int main () { -return ${pbxfuncname} (); +return pjsip_evsub_set_uas_timeout (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_evsub_set_uas_timeout=yes else - eval "$as_ac_Lib=no" + 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 -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 : +{ $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}" - fi + # now check for the header. if test "${AST_PJSIP_EVSUB_SET_UAS_TIMEOUT_FOUND}" = "yes"; then @@ -27144,9 +26128,8 @@ fi 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 + + # 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" @@ -27158,14 +26141,12 @@ 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 @@ -27187,16 +26168,12 @@ if test "x${PBX_PJSIP_TSX_LAYER_FIND_TSX2}" != "x1" -a "${USE_PJSIP_TSX_LAYER_FI pbxlibdir="-L${PJSIP_TSX_LAYER_FIND_TSX2_DIR}" fi fi - pbxfuncname="pjsip_tsx_layer_find_tsx2" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PJSIP_TSX_LAYER_FIND_TSX2_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 "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_layer_find_tsx2 in -lpjsip" >&5 +$as_echo_n "checking for pjsip_tsx_layer_find_tsx2 in -lpjsip... " >&6; } +if ${ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27210,35 +26187,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pjsip_tsx_layer_find_tsx2 (); int main () { -return ${pbxfuncname} (); +return pjsip_tsx_layer_find_tsx2 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&5 +$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&6; } +if test "x$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" = xyes; then : AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes else AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND}" = "yes"; then @@ -27248,9 +26224,8 @@ fi PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="-I${PJSIP_TSX_LAYER_FIND_TSX2_DIR}/include" fi PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE} $PJPROJECT_CFLAGS" - if test "xpjsip.h" = "x" ; then # no header, assume found - PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default" @@ -27262,14 +26237,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND}" = "x0" ; then PJSIP_TSX_LAYER_FIND_TSX2_LIB="" PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PJSIP_TSX_LAYER_FIND_TSX2_LIB="" - fi + PBX_PJSIP_TSX_LAYER_FIND_TSX2=1 cat >>confdefs.h <<_ACEOF #define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1 @@ -27385,16 +26358,12 @@ if test "x${PBX_POPT}" != "x1" -a "${USE_POPT}" != "no"; then pbxlibdir="-L${POPT_DIR}" fi fi - pbxfuncname="poptStrerror" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_POPT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_popt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpopt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpopt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptStrerror in -lpopt" >&5 +$as_echo_n "checking for poptStrerror in -lpopt... " >&6; } +if ${ac_cv_lib_popt_poptStrerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27408,35 +26377,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char poptStrerror (); int main () { -return ${pbxfuncname} (); +return poptStrerror (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_popt_poptStrerror=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_popt_poptStrerror=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptStrerror" >&5 +$as_echo "$ac_cv_lib_popt_poptStrerror" >&6; } +if test "x$ac_cv_lib_popt_poptStrerror" = xyes; then : AST_POPT_FOUND=yes else AST_POPT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_POPT_FOUND}" = "yes"; then @@ -27446,9 +26414,8 @@ fi POPT_INCLUDE="-I${POPT_DIR}/include" fi POPT_INCLUDE="${POPT_INCLUDE} " - if test "xpopt.h" = "x" ; then # no header, assume found - POPT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default" @@ -27460,14 +26427,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${POPT_HEADER_FOUND}" = "x0" ; then POPT_LIB="" POPT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - POPT_LIB="" - fi + PBX_POPT=1 cat >>confdefs.h <<_ACEOF #define HAVE_POPT 1 @@ -27490,16 +26455,12 @@ if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then pbxlibdir="-L${PORTAUDIO_DIR}" fi fi - pbxfuncname="Pa_GetDeviceCount" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PORTAUDIO_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_portaudio_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lportaudio" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lportaudio... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pa_GetDeviceCount in -lportaudio" >&5 +$as_echo_n "checking for Pa_GetDeviceCount in -lportaudio... " >&6; } +if ${ac_cv_lib_portaudio_Pa_GetDeviceCount+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27513,35 +26474,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char Pa_GetDeviceCount (); int main () { -return ${pbxfuncname} (); +return Pa_GetDeviceCount (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_portaudio_Pa_GetDeviceCount=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_portaudio_Pa_GetDeviceCount=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5 +$as_echo "$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6; } +if test "x$ac_cv_lib_portaudio_Pa_GetDeviceCount" = xyes; then : AST_PORTAUDIO_FOUND=yes else AST_PORTAUDIO_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PORTAUDIO_FOUND}" = "yes"; then @@ -27551,9 +26511,8 @@ fi PORTAUDIO_INCLUDE="-I${PORTAUDIO_DIR}/include" fi PORTAUDIO_INCLUDE="${PORTAUDIO_INCLUDE} " - if test "xportaudio.h" = "x" ; then # no header, assume found - PORTAUDIO_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "portaudio.h" "ac_cv_header_portaudio_h" "$ac_includes_default" @@ -27565,14 +26524,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PORTAUDIO_HEADER_FOUND}" = "x0" ; then PORTAUDIO_LIB="" PORTAUDIO_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PORTAUDIO_LIB="" - fi + PBX_PORTAUDIO=1 cat >>confdefs.h <<_ACEOF #define HAVE_PORTAUDIO 1 @@ -27595,16 +26552,12 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then pbxlibdir="-L${PRI_DIR}" fi fi - pbxfuncname="pri_connected_line_update" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connected_line_update in -lpri" >&5 +$as_echo_n "checking for pri_connected_line_update in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_connected_line_update+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27618,35 +26571,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_connected_line_update (); int main () { -return ${pbxfuncname} (); +return pri_connected_line_update (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_connected_line_update=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_connected_line_update=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connected_line_update" >&5 +$as_echo "$ac_cv_lib_pri_pri_connected_line_update" >&6; } +if test "x$ac_cv_lib_pri_pri_connected_line_update" = xyes; then : AST_PRI_FOUND=yes else AST_PRI_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_FOUND}" = "yes"; then @@ -27656,9 +26608,8 @@ fi PRI_INCLUDE="-I${PRI_DIR}/include" fi PRI_INCLUDE="${PRI_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -27670,14 +26621,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_HEADER_FOUND}" = "x0" ; then PRI_LIB="" PRI_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_LIB="" - fi + PBX_PRI=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI 1 @@ -27699,16 +26648,12 @@ if test "x${PBX_PRI_SETUP_ACK_INBAND}" != "x1" -a "${USE_PRI_SETUP_ACK_INBAND}" pbxlibdir="-L${PRI_SETUP_ACK_INBAND_DIR}" fi fi - pbxfuncname="pri_setup_ack" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_SETUP_ACK_INBAND_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_setup_ack in -lpri" >&5 +$as_echo_n "checking for pri_setup_ack in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_setup_ack+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27722,35 +26667,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_setup_ack (); int main () { -return ${pbxfuncname} (); +return pri_setup_ack (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_setup_ack=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_setup_ack=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_setup_ack" >&5 +$as_echo "$ac_cv_lib_pri_pri_setup_ack" >&6; } +if test "x$ac_cv_lib_pri_pri_setup_ack" = xyes; then : AST_PRI_SETUP_ACK_INBAND_FOUND=yes else AST_PRI_SETUP_ACK_INBAND_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_SETUP_ACK_INBAND_FOUND}" = "yes"; then @@ -27760,9 +26704,8 @@ fi PRI_SETUP_ACK_INBAND_INCLUDE="-I${PRI_SETUP_ACK_INBAND_DIR}/include" fi PRI_SETUP_ACK_INBAND_INCLUDE="${PRI_SETUP_ACK_INBAND_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_SETUP_ACK_INBAND_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_ACK_INBAND_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -27774,14 +26717,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_SETUP_ACK_INBAND_HEADER_FOUND}" = "x0" ; then PRI_SETUP_ACK_INBAND_LIB="" PRI_SETUP_ACK_INBAND_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_SETUP_ACK_INBAND_LIB="" - fi + PBX_PRI_SETUP_ACK_INBAND=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_SETUP_ACK_INBAND 1 @@ -27803,16 +26744,12 @@ if test "x${PBX_PRI_L2_PERSISTENCE}" != "x1" -a "${USE_PRI_L2_PERSISTENCE}" != " pbxlibdir="-L${PRI_L2_PERSISTENCE_DIR}" fi fi - pbxfuncname="pri_persistent_layer2_option" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_L2_PERSISTENCE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_persistent_layer2_option in -lpri" >&5 +$as_echo_n "checking for pri_persistent_layer2_option in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_persistent_layer2_option+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27826,35 +26763,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_persistent_layer2_option (); int main () { -return ${pbxfuncname} (); +return pri_persistent_layer2_option (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_persistent_layer2_option=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_persistent_layer2_option=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_persistent_layer2_option" >&5 +$as_echo "$ac_cv_lib_pri_pri_persistent_layer2_option" >&6; } +if test "x$ac_cv_lib_pri_pri_persistent_layer2_option" = xyes; then : AST_PRI_L2_PERSISTENCE_FOUND=yes else AST_PRI_L2_PERSISTENCE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_L2_PERSISTENCE_FOUND}" = "yes"; then @@ -27864,9 +26800,8 @@ fi PRI_L2_PERSISTENCE_INCLUDE="-I${PRI_L2_PERSISTENCE_DIR}/include" fi PRI_L2_PERSISTENCE_INCLUDE="${PRI_L2_PERSISTENCE_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_L2_PERSISTENCE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_L2_PERSISTENCE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -27878,14 +26813,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_L2_PERSISTENCE_HEADER_FOUND}" = "x0" ; then PRI_L2_PERSISTENCE_LIB="" PRI_L2_PERSISTENCE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_L2_PERSISTENCE_LIB="" - fi + PBX_PRI_L2_PERSISTENCE=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_L2_PERSISTENCE 1 @@ -27907,16 +26840,12 @@ if test "x${PBX_PRI_DATETIME_SEND}" != "x1" -a "${USE_PRI_DATETIME_SEND}" != "no pbxlibdir="-L${PRI_DATETIME_SEND_DIR}" fi fi - pbxfuncname="pri_date_time_send_option" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_DATETIME_SEND_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_date_time_send_option in -lpri" >&5 +$as_echo_n "checking for pri_date_time_send_option in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_date_time_send_option+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27930,35 +26859,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_date_time_send_option (); int main () { -return ${pbxfuncname} (); +return pri_date_time_send_option (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_date_time_send_option=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_date_time_send_option=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_date_time_send_option" >&5 +$as_echo "$ac_cv_lib_pri_pri_date_time_send_option" >&6; } +if test "x$ac_cv_lib_pri_pri_date_time_send_option" = xyes; then : AST_PRI_DATETIME_SEND_FOUND=yes else AST_PRI_DATETIME_SEND_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_DATETIME_SEND_FOUND}" = "yes"; then @@ -27968,9 +26896,8 @@ fi PRI_DATETIME_SEND_INCLUDE="-I${PRI_DATETIME_SEND_DIR}/include" fi PRI_DATETIME_SEND_INCLUDE="${PRI_DATETIME_SEND_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_DATETIME_SEND_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_DATETIME_SEND_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -27982,14 +26909,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_DATETIME_SEND_HEADER_FOUND}" = "x0" ; then PRI_DATETIME_SEND_LIB="" PRI_DATETIME_SEND_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_DATETIME_SEND_LIB="" - fi + PBX_PRI_DATETIME_SEND=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_DATETIME_SEND 1 @@ -28011,16 +26936,12 @@ if test "x${PBX_PRI_MWI_V2}" != "x1" -a "${USE_PRI_MWI_V2}" != "no"; then pbxlibdir="-L${PRI_MWI_V2_DIR}" fi fi - pbxfuncname="pri_mwi_indicate_v2" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_MWI_V2_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate_v2 in -lpri" >&5 +$as_echo_n "checking for pri_mwi_indicate_v2 in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_mwi_indicate_v2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28034,35 +26955,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_mwi_indicate_v2 (); int main () { -return ${pbxfuncname} (); +return pri_mwi_indicate_v2 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_mwi_indicate_v2=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_mwi_indicate_v2=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate_v2" >&5 +$as_echo "$ac_cv_lib_pri_pri_mwi_indicate_v2" >&6; } +if test "x$ac_cv_lib_pri_pri_mwi_indicate_v2" = xyes; then : AST_PRI_MWI_V2_FOUND=yes else AST_PRI_MWI_V2_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_MWI_V2_FOUND}" = "yes"; then @@ -28072,9 +26992,8 @@ fi PRI_MWI_V2_INCLUDE="-I${PRI_MWI_V2_DIR}/include" fi PRI_MWI_V2_INCLUDE="${PRI_MWI_V2_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_MWI_V2_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_MWI_V2_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28086,14 +27005,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_MWI_V2_HEADER_FOUND}" = "x0" ; then PRI_MWI_V2_LIB="" PRI_MWI_V2_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_MWI_V2_LIB="" - fi + PBX_PRI_MWI_V2=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_MWI_V2 1 @@ -28115,16 +27032,12 @@ if test "x${PBX_PRI_DISPLAY_TEXT}" != "x1" -a "${USE_PRI_DISPLAY_TEXT}" != "no"; pbxlibdir="-L${PRI_DISPLAY_TEXT_DIR}" fi fi - pbxfuncname="pri_display_text" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_DISPLAY_TEXT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_display_text in -lpri" >&5 +$as_echo_n "checking for pri_display_text in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_display_text+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28138,35 +27051,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_display_text (); int main () { -return ${pbxfuncname} (); +return pri_display_text (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_display_text=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_display_text=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_display_text" >&5 +$as_echo "$ac_cv_lib_pri_pri_display_text" >&6; } +if test "x$ac_cv_lib_pri_pri_display_text" = xyes; then : AST_PRI_DISPLAY_TEXT_FOUND=yes else AST_PRI_DISPLAY_TEXT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_DISPLAY_TEXT_FOUND}" = "yes"; then @@ -28176,9 +27088,8 @@ fi PRI_DISPLAY_TEXT_INCLUDE="-I${PRI_DISPLAY_TEXT_DIR}/include" fi PRI_DISPLAY_TEXT_INCLUDE="${PRI_DISPLAY_TEXT_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_DISPLAY_TEXT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_DISPLAY_TEXT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28190,14 +27101,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_DISPLAY_TEXT_HEADER_FOUND}" = "x0" ; then PRI_DISPLAY_TEXT_LIB="" PRI_DISPLAY_TEXT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_DISPLAY_TEXT_LIB="" - fi + PBX_PRI_DISPLAY_TEXT=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_DISPLAY_TEXT 1 @@ -28219,16 +27128,12 @@ if test "x${PBX_PRI_MWI}" != "x1" -a "${USE_PRI_MWI}" != "no"; then pbxlibdir="-L${PRI_MWI_DIR}" fi fi - pbxfuncname="pri_mwi_indicate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_MWI_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate in -lpri" >&5 +$as_echo_n "checking for pri_mwi_indicate in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_mwi_indicate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28242,35 +27147,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_mwi_indicate (); int main () { -return ${pbxfuncname} (); +return pri_mwi_indicate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_mwi_indicate=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_mwi_indicate=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate" >&5 +$as_echo "$ac_cv_lib_pri_pri_mwi_indicate" >&6; } +if test "x$ac_cv_lib_pri_pri_mwi_indicate" = xyes; then : AST_PRI_MWI_FOUND=yes else AST_PRI_MWI_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_MWI_FOUND}" = "yes"; then @@ -28280,9 +27184,8 @@ fi PRI_MWI_INCLUDE="-I${PRI_MWI_DIR}/include" fi PRI_MWI_INCLUDE="${PRI_MWI_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_MWI_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_MWI_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28294,14 +27197,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_MWI_HEADER_FOUND}" = "x0" ; then PRI_MWI_LIB="" PRI_MWI_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_MWI_LIB="" - fi + PBX_PRI_MWI=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_MWI 1 @@ -28323,16 +27224,12 @@ if test "x${PBX_PRI_MCID}" != "x1" -a "${USE_PRI_MCID}" != "no"; then pbxlibdir="-L${PRI_MCID_DIR}" fi fi - pbxfuncname="pri_mcid_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_MCID_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mcid_enable in -lpri" >&5 +$as_echo_n "checking for pri_mcid_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_mcid_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28346,35 +27243,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_mcid_enable (); int main () { -return ${pbxfuncname} (); +return pri_mcid_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_mcid_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_mcid_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mcid_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_mcid_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_mcid_enable" = xyes; then : AST_PRI_MCID_FOUND=yes else AST_PRI_MCID_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_MCID_FOUND}" = "yes"; then @@ -28384,9 +27280,8 @@ fi PRI_MCID_INCLUDE="-I${PRI_MCID_DIR}/include" fi PRI_MCID_INCLUDE="${PRI_MCID_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_MCID_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_MCID_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28398,14 +27293,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_MCID_HEADER_FOUND}" = "x0" ; then PRI_MCID_LIB="" PRI_MCID_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_MCID_LIB="" - fi + PBX_PRI_MCID=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_MCID 1 @@ -28427,16 +27320,12 @@ if test "x${PBX_PRI_CALL_WAITING}" != "x1" -a "${USE_PRI_CALL_WAITING}" != "no"; pbxlibdir="-L${PRI_CALL_WAITING_DIR}" fi fi - pbxfuncname="pri_connect_ack_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_CALL_WAITING_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connect_ack_enable in -lpri" >&5 +$as_echo_n "checking for pri_connect_ack_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_connect_ack_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28450,35 +27339,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_connect_ack_enable (); int main () { -return ${pbxfuncname} (); +return pri_connect_ack_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_connect_ack_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_connect_ack_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connect_ack_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_connect_ack_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_connect_ack_enable" = xyes; then : AST_PRI_CALL_WAITING_FOUND=yes else AST_PRI_CALL_WAITING_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_CALL_WAITING_FOUND}" = "yes"; then @@ -28488,9 +27376,8 @@ fi PRI_CALL_WAITING_INCLUDE="-I${PRI_CALL_WAITING_DIR}/include" fi PRI_CALL_WAITING_INCLUDE="${PRI_CALL_WAITING_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_CALL_WAITING_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_CALL_WAITING_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28502,14 +27389,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_CALL_WAITING_HEADER_FOUND}" = "x0" ; then PRI_CALL_WAITING_LIB="" PRI_CALL_WAITING_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_CALL_WAITING_LIB="" - fi + PBX_PRI_CALL_WAITING=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_CALL_WAITING 1 @@ -28531,16 +27416,12 @@ if test "x${PBX_PRI_AOC_EVENTS}" != "x1" -a "${USE_PRI_AOC_EVENTS}" != "no"; the pbxlibdir="-L${PRI_AOC_EVENTS_DIR}" fi fi - pbxfuncname="pri_aoc_events_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_AOC_EVENTS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_aoc_events_enable in -lpri" >&5 +$as_echo_n "checking for pri_aoc_events_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_aoc_events_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28554,35 +27435,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_aoc_events_enable (); int main () { -return ${pbxfuncname} (); +return pri_aoc_events_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_aoc_events_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_aoc_events_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_aoc_events_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_aoc_events_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_aoc_events_enable" = xyes; then : AST_PRI_AOC_EVENTS_FOUND=yes else AST_PRI_AOC_EVENTS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_AOC_EVENTS_FOUND}" = "yes"; then @@ -28592,9 +27472,8 @@ fi PRI_AOC_EVENTS_INCLUDE="-I${PRI_AOC_EVENTS_DIR}/include" fi PRI_AOC_EVENTS_INCLUDE="${PRI_AOC_EVENTS_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_AOC_EVENTS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_AOC_EVENTS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28606,14 +27485,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_AOC_EVENTS_HEADER_FOUND}" = "x0" ; then PRI_AOC_EVENTS_LIB="" PRI_AOC_EVENTS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_AOC_EVENTS_LIB="" - fi + PBX_PRI_AOC_EVENTS=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_AOC_EVENTS 1 @@ -28635,16 +27512,12 @@ if test "x${PBX_PRI_TRANSFER}" != "x1" -a "${USE_PRI_TRANSFER}" != "no"; then pbxlibdir="-L${PRI_TRANSFER_DIR}" fi fi - pbxfuncname="pri_transfer_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_TRANSFER_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_transfer_enable in -lpri" >&5 +$as_echo_n "checking for pri_transfer_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_transfer_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28658,35 +27531,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_transfer_enable (); int main () { -return ${pbxfuncname} (); +return pri_transfer_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_transfer_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_transfer_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_transfer_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_transfer_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_transfer_enable" = xyes; then : AST_PRI_TRANSFER_FOUND=yes else AST_PRI_TRANSFER_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_TRANSFER_FOUND}" = "yes"; then @@ -28696,9 +27568,8 @@ fi PRI_TRANSFER_INCLUDE="-I${PRI_TRANSFER_DIR}/include" fi PRI_TRANSFER_INCLUDE="${PRI_TRANSFER_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_TRANSFER_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_TRANSFER_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28710,14 +27581,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_TRANSFER_HEADER_FOUND}" = "x0" ; then PRI_TRANSFER_LIB="" PRI_TRANSFER_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_TRANSFER_LIB="" - fi + PBX_PRI_TRANSFER=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_TRANSFER 1 @@ -28739,16 +27608,12 @@ if test "x${PBX_PRI_CCSS}" != "x1" -a "${USE_PRI_CCSS}" != "no"; then pbxlibdir="-L${PRI_CCSS_DIR}" fi fi - pbxfuncname="pri_cc_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_CCSS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_cc_enable in -lpri" >&5 +$as_echo_n "checking for pri_cc_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_cc_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28762,35 +27627,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_cc_enable (); int main () { -return ${pbxfuncname} (); +return pri_cc_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_cc_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_cc_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_cc_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_cc_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_cc_enable" = xyes; then : AST_PRI_CCSS_FOUND=yes else AST_PRI_CCSS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_CCSS_FOUND}" = "yes"; then @@ -28800,9 +27664,8 @@ fi PRI_CCSS_INCLUDE="-I${PRI_CCSS_DIR}/include" fi PRI_CCSS_INCLUDE="${PRI_CCSS_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_CCSS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_CCSS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28814,14 +27677,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_CCSS_HEADER_FOUND}" = "x0" ; then PRI_CCSS_LIB="" PRI_CCSS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_CCSS_LIB="" - fi + PBX_PRI_CCSS=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_CCSS 1 @@ -28843,16 +27704,12 @@ if test "x${PBX_PRI_HANGUP_FIX}" != "x1" -a "${USE_PRI_HANGUP_FIX}" != "no"; the pbxlibdir="-L${PRI_HANGUP_FIX_DIR}" fi fi - pbxfuncname="pri_hangup_fix_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_HANGUP_FIX_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hangup_fix_enable in -lpri" >&5 +$as_echo_n "checking for pri_hangup_fix_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_hangup_fix_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28866,35 +27723,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_hangup_fix_enable (); int main () { -return ${pbxfuncname} (); +return pri_hangup_fix_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_hangup_fix_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_hangup_fix_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hangup_fix_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_hangup_fix_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_hangup_fix_enable" = xyes; then : AST_PRI_HANGUP_FIX_FOUND=yes else AST_PRI_HANGUP_FIX_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_HANGUP_FIX_FOUND}" = "yes"; then @@ -28904,9 +27760,8 @@ fi PRI_HANGUP_FIX_INCLUDE="-I${PRI_HANGUP_FIX_DIR}/include" fi PRI_HANGUP_FIX_INCLUDE="${PRI_HANGUP_FIX_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_HANGUP_FIX_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_HANGUP_FIX_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -28918,14 +27773,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_HANGUP_FIX_HEADER_FOUND}" = "x0" ; then PRI_HANGUP_FIX_LIB="" PRI_HANGUP_FIX_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_HANGUP_FIX_LIB="" - fi + PBX_PRI_HANGUP_FIX=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_HANGUP_FIX 1 @@ -28947,16 +27800,12 @@ if test "x${PBX_PRI_SUBADDR}" != "x1" -a "${USE_PRI_SUBADDR}" != "no"; then pbxlibdir="-L${PRI_SUBADDR_DIR}" fi fi - pbxfuncname="pri_sr_set_called_subaddress" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_SUBADDR_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_called_subaddress in -lpri" >&5 +$as_echo_n "checking for pri_sr_set_called_subaddress in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_sr_set_called_subaddress+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28970,35 +27819,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_sr_set_called_subaddress (); int main () { -return ${pbxfuncname} (); +return pri_sr_set_called_subaddress (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_sr_set_called_subaddress=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_sr_set_called_subaddress=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_called_subaddress" >&5 +$as_echo "$ac_cv_lib_pri_pri_sr_set_called_subaddress" >&6; } +if test "x$ac_cv_lib_pri_pri_sr_set_called_subaddress" = xyes; then : AST_PRI_SUBADDR_FOUND=yes else AST_PRI_SUBADDR_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_SUBADDR_FOUND}" = "yes"; then @@ -29008,9 +27856,8 @@ fi PRI_SUBADDR_INCLUDE="-I${PRI_SUBADDR_DIR}/include" fi PRI_SUBADDR_INCLUDE="${PRI_SUBADDR_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_SUBADDR_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_SUBADDR_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29022,14 +27869,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_SUBADDR_HEADER_FOUND}" = "x0" ; then PRI_SUBADDR_LIB="" PRI_SUBADDR_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_SUBADDR_LIB="" - fi + PBX_PRI_SUBADDR=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_SUBADDR 1 @@ -29051,16 +27896,12 @@ if test "x${PBX_PRI_CALL_HOLD}" != "x1" -a "${USE_PRI_CALL_HOLD}" != "no"; then pbxlibdir="-L${PRI_CALL_HOLD_DIR}" fi fi - pbxfuncname="pri_hold_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_CALL_HOLD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hold_enable in -lpri" >&5 +$as_echo_n "checking for pri_hold_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_hold_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29074,35 +27915,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_hold_enable (); int main () { -return ${pbxfuncname} (); +return pri_hold_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_hold_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_hold_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hold_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_hold_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_hold_enable" = xyes; then : AST_PRI_CALL_HOLD_FOUND=yes else AST_PRI_CALL_HOLD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_CALL_HOLD_FOUND}" = "yes"; then @@ -29112,9 +27952,8 @@ fi PRI_CALL_HOLD_INCLUDE="-I${PRI_CALL_HOLD_DIR}/include" fi PRI_CALL_HOLD_INCLUDE="${PRI_CALL_HOLD_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_CALL_HOLD_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_CALL_HOLD_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29126,14 +27965,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_CALL_HOLD_HEADER_FOUND}" = "x0" ; then PRI_CALL_HOLD_LIB="" PRI_CALL_HOLD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_CALL_HOLD_LIB="" - fi + PBX_PRI_CALL_HOLD=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_CALL_HOLD 1 @@ -29155,16 +27992,12 @@ if test "x${PBX_PRI_CALL_REROUTING}" != "x1" -a "${USE_PRI_CALL_REROUTING}" != " pbxlibdir="-L${PRI_CALL_REROUTING_DIR}" fi fi - pbxfuncname="pri_reroute_enable" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_CALL_REROUTING_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_reroute_enable in -lpri" >&5 +$as_echo_n "checking for pri_reroute_enable in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_reroute_enable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29178,35 +28011,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_reroute_enable (); int main () { -return ${pbxfuncname} (); +return pri_reroute_enable (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_reroute_enable=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_reroute_enable=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_reroute_enable" >&5 +$as_echo "$ac_cv_lib_pri_pri_reroute_enable" >&6; } +if test "x$ac_cv_lib_pri_pri_reroute_enable" = xyes; then : AST_PRI_CALL_REROUTING_FOUND=yes else AST_PRI_CALL_REROUTING_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_CALL_REROUTING_FOUND}" = "yes"; then @@ -29216,9 +28048,8 @@ fi PRI_CALL_REROUTING_INCLUDE="-I${PRI_CALL_REROUTING_DIR}/include" fi PRI_CALL_REROUTING_INCLUDE="${PRI_CALL_REROUTING_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_CALL_REROUTING_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_CALL_REROUTING_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29230,14 +28061,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_CALL_REROUTING_HEADER_FOUND}" = "x0" ; then PRI_CALL_REROUTING_LIB="" PRI_CALL_REROUTING_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_CALL_REROUTING_LIB="" - fi + PBX_PRI_CALL_REROUTING=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_CALL_REROUTING 1 @@ -29259,16 +28088,12 @@ if test "x${PBX_PRI_SETUP_KEYPAD}" != "x1" -a "${USE_PRI_SETUP_KEYPAD}" != "no"; pbxlibdir="-L${PRI_SETUP_KEYPAD_DIR}" fi fi - pbxfuncname="pri_sr_set_keypad_digits" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_SETUP_KEYPAD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_keypad_digits in -lpri" >&5 +$as_echo_n "checking for pri_sr_set_keypad_digits in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_sr_set_keypad_digits+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29282,35 +28107,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_sr_set_keypad_digits (); int main () { -return ${pbxfuncname} (); +return pri_sr_set_keypad_digits (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_sr_set_keypad_digits=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_sr_set_keypad_digits=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_keypad_digits" >&5 +$as_echo "$ac_cv_lib_pri_pri_sr_set_keypad_digits" >&6; } +if test "x$ac_cv_lib_pri_pri_sr_set_keypad_digits" = xyes; then : AST_PRI_SETUP_KEYPAD_FOUND=yes else AST_PRI_SETUP_KEYPAD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_SETUP_KEYPAD_FOUND}" = "yes"; then @@ -29320,9 +28144,8 @@ fi PRI_SETUP_KEYPAD_INCLUDE="-I${PRI_SETUP_KEYPAD_DIR}/include" fi PRI_SETUP_KEYPAD_INCLUDE="${PRI_SETUP_KEYPAD_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_SETUP_KEYPAD_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_KEYPAD_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29334,14 +28157,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_SETUP_KEYPAD_HEADER_FOUND}" = "x0" ; then PRI_SETUP_KEYPAD_LIB="" PRI_SETUP_KEYPAD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_SETUP_KEYPAD_LIB="" - fi + PBX_PRI_SETUP_KEYPAD=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_SETUP_KEYPAD 1 @@ -29367,16 +28188,12 @@ if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; pbxlibdir="-L${PRI_PROG_W_CAUSE_DIR}" fi fi - pbxfuncname="pri_progress_with_cause" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_PROG_W_CAUSE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_progress_with_cause in -lpri" >&5 +$as_echo_n "checking for pri_progress_with_cause in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_progress_with_cause+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29390,35 +28207,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_progress_with_cause (); int main () { -return ${pbxfuncname} (); +return pri_progress_with_cause (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_progress_with_cause=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_progress_with_cause=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_progress_with_cause" >&5 +$as_echo "$ac_cv_lib_pri_pri_progress_with_cause" >&6; } +if test "x$ac_cv_lib_pri_pri_progress_with_cause" = xyes; then : AST_PRI_PROG_W_CAUSE_FOUND=yes else AST_PRI_PROG_W_CAUSE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_PROG_W_CAUSE_FOUND}" = "yes"; then @@ -29428,9 +28244,8 @@ fi PRI_PROG_W_CAUSE_INCLUDE="-I${PRI_PROG_W_CAUSE_DIR}/include" fi PRI_PROG_W_CAUSE_INCLUDE="${PRI_PROG_W_CAUSE_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_PROG_W_CAUSE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29442,14 +28257,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_PROG_W_CAUSE_HEADER_FOUND}" = "x0" ; then PRI_PROG_W_CAUSE_LIB="" PRI_PROG_W_CAUSE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_PROG_W_CAUSE_LIB="" - fi + PBX_PRI_PROG_W_CAUSE=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_PROG_W_CAUSE 1 @@ -29471,16 +28284,12 @@ if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}" fi fi - pbxfuncname="pri_set_inbanddisconnect" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_INBANDDISCONNECT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_set_inbanddisconnect in -lpri" >&5 +$as_echo_n "checking for pri_set_inbanddisconnect in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_set_inbanddisconnect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29494,35 +28303,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_set_inbanddisconnect (); int main () { -return ${pbxfuncname} (); +return pri_set_inbanddisconnect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_set_inbanddisconnect=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_set_inbanddisconnect=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5 +$as_echo "$ac_cv_lib_pri_pri_set_inbanddisconnect" >&6; } +if test "x$ac_cv_lib_pri_pri_set_inbanddisconnect" = xyes; then : AST_PRI_INBANDDISCONNECT_FOUND=yes else AST_PRI_INBANDDISCONNECT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then @@ -29532,9 +28340,8 @@ fi PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include" fi PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_INBANDDISCONNECT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29546,14 +28353,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then PRI_INBANDDISCONNECT_LIB="" PRI_INBANDDISCONNECT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_INBANDDISCONNECT_LIB="" - fi + PBX_PRI_INBANDDISCONNECT=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_INBANDDISCONNECT 1 @@ -29575,16 +28380,12 @@ if test "x${PBX_PRI_SERVICE_MESSAGES}" != "x1" -a "${USE_PRI_SERVICE_MESSAGES}" pbxlibdir="-L${PRI_SERVICE_MESSAGES_DIR}" fi fi - pbxfuncname="pri_maintenance_service" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_SERVICE_MESSAGES_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_maintenance_service in -lpri" >&5 +$as_echo_n "checking for pri_maintenance_service in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_maintenance_service+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29598,35 +28399,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_maintenance_service (); int main () { -return ${pbxfuncname} (); +return pri_maintenance_service (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_maintenance_service=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_maintenance_service=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_maintenance_service" >&5 +$as_echo "$ac_cv_lib_pri_pri_maintenance_service" >&6; } +if test "x$ac_cv_lib_pri_pri_maintenance_service" = xyes; then : AST_PRI_SERVICE_MESSAGES_FOUND=yes else AST_PRI_SERVICE_MESSAGES_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_SERVICE_MESSAGES_FOUND}" = "yes"; then @@ -29636,9 +28436,8 @@ fi PRI_SERVICE_MESSAGES_INCLUDE="-I${PRI_SERVICE_MESSAGES_DIR}/include" fi PRI_SERVICE_MESSAGES_INCLUDE="${PRI_SERVICE_MESSAGES_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_SERVICE_MESSAGES_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_SERVICE_MESSAGES_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29650,14 +28449,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_SERVICE_MESSAGES_HEADER_FOUND}" = "x0" ; then PRI_SERVICE_MESSAGES_LIB="" PRI_SERVICE_MESSAGES_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_SERVICE_MESSAGES_LIB="" - fi + PBX_PRI_SERVICE_MESSAGES=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_SERVICE_MESSAGES 1 @@ -29679,16 +28476,12 @@ if test "x${PBX_PRI_REVERSE_CHARGE}" != "x1" -a "${USE_PRI_REVERSE_CHARGE}" != " pbxlibdir="-L${PRI_REVERSE_CHARGE_DIR}" fi fi - pbxfuncname="pri_sr_set_reversecharge" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_PRI_REVERSE_CHARGE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpri" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_reversecharge in -lpri" >&5 +$as_echo_n "checking for pri_sr_set_reversecharge in -lpri... " >&6; } +if ${ac_cv_lib_pri_pri_sr_set_reversecharge+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29702,35 +28495,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char pri_sr_set_reversecharge (); int main () { -return ${pbxfuncname} (); +return pri_sr_set_reversecharge (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_pri_pri_sr_set_reversecharge=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_pri_pri_sr_set_reversecharge=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_reversecharge" >&5 +$as_echo "$ac_cv_lib_pri_pri_sr_set_reversecharge" >&6; } +if test "x$ac_cv_lib_pri_pri_sr_set_reversecharge" = xyes; then : AST_PRI_REVERSE_CHARGE_FOUND=yes else AST_PRI_REVERSE_CHARGE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_PRI_REVERSE_CHARGE_FOUND}" = "yes"; then @@ -29740,9 +28532,8 @@ fi PRI_REVERSE_CHARGE_INCLUDE="-I${PRI_REVERSE_CHARGE_DIR}/include" fi PRI_REVERSE_CHARGE_INCLUDE="${PRI_REVERSE_CHARGE_INCLUDE} " - if test "xlibpri.h" = "x" ; then # no header, assume found - PRI_REVERSE_CHARGE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PRI_REVERSE_CHARGE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default" @@ -29754,14 +28545,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${PRI_REVERSE_CHARGE_HEADER_FOUND}" = "x0" ; then PRI_REVERSE_CHARGE_LIB="" PRI_REVERSE_CHARGE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - PRI_REVERSE_CHARGE_LIB="" - fi + PBX_PRI_REVERSE_CHARGE=1 cat >>confdefs.h <<_ACEOF #define HAVE_PRI_REVERSE_CHARGE 1 @@ -29785,16 +28574,12 @@ if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then pbxlibdir="-L${RESAMPLE_DIR}" fi fi - pbxfuncname="resample_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RESAMPLE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lresample" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lresample... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resample_open in -lresample" >&5 +$as_echo_n "checking for resample_open in -lresample... " >&6; } +if ${ac_cv_lib_resample_resample_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29808,35 +28593,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char resample_open (); int main () { -return ${pbxfuncname} (); +return resample_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_resample_resample_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_resample_resample_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resample_resample_open" >&5 +$as_echo "$ac_cv_lib_resample_resample_open" >&6; } +if test "x$ac_cv_lib_resample_resample_open" = xyes; then : AST_RESAMPLE_FOUND=yes else AST_RESAMPLE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_RESAMPLE_FOUND}" = "yes"; then @@ -29846,9 +28630,8 @@ fi RESAMPLE_INCLUDE="-I${RESAMPLE_DIR}/include" fi RESAMPLE_INCLUDE="${RESAMPLE_INCLUDE} " - if test "xlibresample.h" = "x" ; then # no header, assume found - RESAMPLE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libresample.h" "ac_cv_header_libresample_h" "$ac_includes_default" @@ -29860,14 +28643,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then RESAMPLE_LIB="" RESAMPLE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RESAMPLE_LIB="" - fi + PBX_RESAMPLE=1 cat >>confdefs.h <<_ACEOF #define HAVE_RESAMPLE 1 @@ -29889,16 +28670,12 @@ if test "x${PBX_FFTW3}" != "x1" -a "${USE_FFTW3}" != "no"; then pbxlibdir="-L${FFTW3_DIR}" fi fi - pbxfuncname="fftw_alloc_real" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_FFTW3_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_fftw3_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lfftw3" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lfftw3... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_alloc_real in -lfftw3" >&5 +$as_echo_n "checking for fftw_alloc_real in -lfftw3... " >&6; } +if ${ac_cv_lib_fftw3_fftw_alloc_real+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29912,35 +28689,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char fftw_alloc_real (); int main () { -return ${pbxfuncname} (); +return fftw_alloc_real (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_fftw3_fftw_alloc_real=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_fftw3_fftw_alloc_real=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_alloc_real" >&5 +$as_echo "$ac_cv_lib_fftw3_fftw_alloc_real" >&6; } +if test "x$ac_cv_lib_fftw3_fftw_alloc_real" = xyes; then : AST_FFTW3_FOUND=yes else AST_FFTW3_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_FFTW3_FOUND}" = "yes"; then @@ -29950,9 +28726,8 @@ fi FFTW3_INCLUDE="-I${FFTW3_DIR}/include" fi FFTW3_INCLUDE="${FFTW3_INCLUDE} " - if test "xfftw3.h" = "x" ; then # no header, assume found - FFTW3_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FFTW3_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default" @@ -29964,14 +28739,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${FFTW3_HEADER_FOUND}" = "x0" ; then FFTW3_LIB="" FFTW3_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - FFTW3_LIB="" - fi + PBX_FFTW3=1 cat >>confdefs.h <<_ACEOF #define HAVE_FFTW3 1 @@ -29993,16 +28766,12 @@ if test "x${PBX_SNDFILE}" != "x1" -a "${USE_SNDFILE}" != "no"; then pbxlibdir="-L${SNDFILE_DIR}" fi fi - pbxfuncname="sf_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SNDFILE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_sndfile_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsndfile" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsndfile... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sf_open in -lsndfile" >&5 +$as_echo_n "checking for sf_open in -lsndfile... " >&6; } +if ${ac_cv_lib_sndfile_sf_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30016,35 +28785,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char sf_open (); int main () { -return ${pbxfuncname} (); +return sf_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_sndfile_sf_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_sndfile_sf_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndfile_sf_open" >&5 +$as_echo "$ac_cv_lib_sndfile_sf_open" >&6; } +if test "x$ac_cv_lib_sndfile_sf_open" = xyes; then : AST_SNDFILE_FOUND=yes else AST_SNDFILE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SNDFILE_FOUND}" = "yes"; then @@ -30054,9 +28822,8 @@ fi SNDFILE_INCLUDE="-I${SNDFILE_DIR}/include" fi SNDFILE_INCLUDE="${SNDFILE_INCLUDE} " - if test "xsndfile.h" = "x" ; then # no header, assume found - SNDFILE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SNDFILE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sndfile.h" "ac_cv_header_sndfile_h" "$ac_includes_default" @@ -30068,14 +28835,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SNDFILE_HEADER_FOUND}" = "x0" ; then SNDFILE_LIB="" SNDFILE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SNDFILE_LIB="" - fi + PBX_SNDFILE=1 cat >>confdefs.h <<_ACEOF #define HAVE_SNDFILE 1 @@ -30089,21 +28854,8 @@ fi if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then - if test "xminimum version of SpanDSP" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5 $as_echo_n "checking for minimum version of SpanDSP... " >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if \" - #if SPANDSP_RELEASE_DATE < 20080516 - #error \"spandsp 0.0.5 or greater is required\" - #endif - \" compiles using spandsp/version.h" >&5 -$as_echo_n "checking if \" - #if SPANDSP_RELEASE_DATE < 20080516 - #error \"spandsp 0.0.5 or greater is required\" - #endif - \" compiles using spandsp/version.h... " >&6; } - fi saved_cppflags="${CPPFLAGS}" if test "x${SPANDSP_DIR}" != "x"; then SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" @@ -30160,16 +28912,12 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then pbxlibdir="-L${SPANDSP_DIR}" fi fi - pbxfuncname="span_set_message_handler" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SPANDSP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for span_set_message_handler in -lspandsp" >&5 +$as_echo_n "checking for span_set_message_handler in -lspandsp... " >&6; } +if ${ac_cv_lib_spandsp_span_set_message_handler+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30183,35 +28931,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char span_set_message_handler (); int main () { -return ${pbxfuncname} (); +return span_set_message_handler (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_spandsp_span_set_message_handler=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_spandsp_span_set_message_handler=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_span_set_message_handler" >&5 +$as_echo "$ac_cv_lib_spandsp_span_set_message_handler" >&6; } +if test "x$ac_cv_lib_spandsp_span_set_message_handler" = xyes; then : AST_SPANDSP_FOUND=yes else AST_SPANDSP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SPANDSP_FOUND}" = "yes"; then @@ -30221,9 +28968,8 @@ fi SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" fi SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " - if test "xspandsp.h" = "x" ; then # no header, assume found - SPANDSP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default" @@ -30235,14 +28981,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" SPANDSP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SPANDSP_LIB="" - fi + PBX_SPANDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPANDSP 1 @@ -30269,16 +29013,12 @@ if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then pbxlibdir="-L${SPANDSP_DIR}" fi fi - pbxfuncname="t38_terminal_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SPANDSP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_spandsp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspandsp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lspandsp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t38_terminal_init in -lspandsp" >&5 +$as_echo_n "checking for t38_terminal_init in -lspandsp... " >&6; } +if ${ac_cv_lib_spandsp_t38_terminal_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30292,35 +29032,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char t38_terminal_init (); int main () { -return ${pbxfuncname} (); +return t38_terminal_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_spandsp_t38_terminal_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_spandsp_t38_terminal_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_t38_terminal_init" >&5 +$as_echo "$ac_cv_lib_spandsp_t38_terminal_init" >&6; } +if test "x$ac_cv_lib_spandsp_t38_terminal_init" = xyes; then : AST_SPANDSP_FOUND=yes else AST_SPANDSP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SPANDSP_FOUND}" = "yes"; then @@ -30330,9 +29069,8 @@ fi SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include" fi SPANDSP_INCLUDE="${SPANDSP_INCLUDE} " - if test "xspandsp.h" = "x" ; then # no header, assume found - SPANDSP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default" @@ -30344,14 +29082,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then SPANDSP_LIB="" SPANDSP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SPANDSP_LIB="" - fi + PBX_SPANDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPANDSP 1 @@ -30376,16 +29112,12 @@ if test "x${PBX_SS7}" != "x1" -a "${USE_SS7}" != "no"; then pbxlibdir="-L${SS7_DIR}" fi fi - pbxfuncname="ss7_set_isup_timer" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SS7_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ss7_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lss7" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lss7... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ss7_set_isup_timer in -lss7" >&5 +$as_echo_n "checking for ss7_set_isup_timer in -lss7... " >&6; } +if ${ac_cv_lib_ss7_ss7_set_isup_timer+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30399,35 +29131,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char ss7_set_isup_timer (); int main () { -return ${pbxfuncname} (); +return ss7_set_isup_timer (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ss7_ss7_set_isup_timer=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ss7_ss7_set_isup_timer=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ss7_ss7_set_isup_timer" >&5 +$as_echo "$ac_cv_lib_ss7_ss7_set_isup_timer" >&6; } +if test "x$ac_cv_lib_ss7_ss7_set_isup_timer" = xyes; then : AST_SS7_FOUND=yes else AST_SS7_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SS7_FOUND}" = "yes"; then @@ -30437,9 +29168,8 @@ fi SS7_INCLUDE="-I${SS7_DIR}/include" fi SS7_INCLUDE="${SS7_INCLUDE} " - if test "xlibss7.h" = "x" ; then # no header, assume found - SS7_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "libss7.h" "ac_cv_header_libss7_h" "$ac_includes_default" @@ -30451,14 +29181,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SS7_HEADER_FOUND}" = "x0" ; then SS7_LIB="" SS7_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SS7_LIB="" - fi + PBX_SS7=1 cat >>confdefs.h <<_ACEOF #define HAVE_SS7 1 @@ -30481,16 +29209,12 @@ if test "x${PBX_OPENR2}" != "x1" -a "${USE_OPENR2}" != "no"; then pbxlibdir="-L${OPENR2_DIR}" fi fi - pbxfuncname="openr2_chan_new" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPENR2_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_openr2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopenr2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lopenr2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openr2_chan_new in -lopenr2" >&5 +$as_echo_n "checking for openr2_chan_new in -lopenr2... " >&6; } +if ${ac_cv_lib_openr2_openr2_chan_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30504,35 +29228,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char openr2_chan_new (); int main () { -return ${pbxfuncname} (); +return openr2_chan_new (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_openr2_openr2_chan_new=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_openr2_openr2_chan_new=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openr2_openr2_chan_new" >&5 +$as_echo "$ac_cv_lib_openr2_openr2_chan_new" >&6; } +if test "x$ac_cv_lib_openr2_openr2_chan_new" = xyes; then : AST_OPENR2_FOUND=yes else AST_OPENR2_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPENR2_FOUND}" = "yes"; then @@ -30542,9 +29265,8 @@ fi OPENR2_INCLUDE="-I${OPENR2_DIR}/include" fi OPENR2_INCLUDE="${OPENR2_INCLUDE} " - if test "xopenr2.h" = "x" ; then # no header, assume found - OPENR2_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "openr2.h" "ac_cv_header_openr2_h" "$ac_includes_default" @@ -30556,14 +29278,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPENR2_HEADER_FOUND}" = "x0" ; then OPENR2_LIB="" OPENR2_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPENR2_LIB="" - fi + PBX_OPENR2=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENR2 1 @@ -30586,16 +29306,12 @@ if test "x${PBX_OPUS}" != "x1" -a "${USE_OPUS}" != "no"; then pbxlibdir="-L${OPUS_DIR}" fi fi - pbxfuncname="opus_encoder_create" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPUS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_opus_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopus" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lopus... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_encoder_create in -lopus" >&5 +$as_echo_n "checking for opus_encoder_create in -lopus... " >&6; } +if ${ac_cv_lib_opus_opus_encoder_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30609,35 +29325,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char opus_encoder_create (); int main () { -return ${pbxfuncname} (); +return opus_encoder_create (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_opus_opus_encoder_create=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_opus_opus_encoder_create=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_encoder_create" >&5 +$as_echo "$ac_cv_lib_opus_opus_encoder_create" >&6; } +if test "x$ac_cv_lib_opus_opus_encoder_create" = xyes; then : AST_OPUS_FOUND=yes else AST_OPUS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPUS_FOUND}" = "yes"; then @@ -30647,9 +29362,8 @@ fi OPUS_INCLUDE="-I${OPUS_DIR}/include" fi OPUS_INCLUDE="${OPUS_INCLUDE} " - if test "xopus/opus.h" = "x" ; then # no header, assume found - OPUS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPUS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default" @@ -30661,14 +29375,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPUS_HEADER_FOUND}" = "x0" ; then OPUS_LIB="" OPUS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPUS_LIB="" - fi + PBX_OPUS=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPUS 1 @@ -30696,16 +29408,12 @@ if test "x${PBX_OPUSFILE}" != "x1" -a "${USE_OPUSFILE}" != "no"; then pbxlibdir="-L${OPUSFILE_DIR}" fi fi - pbxfuncname="op_open_callbacks" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPUSFILE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} $__opus_include" - as_ac_Lib=`$as_echo "ac_cv_lib_opusfile_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopusfile" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lopusfile... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5 +$as_echo_n "checking for op_open_callbacks in -lopusfile... " >&6; } +if ${ac_cv_lib_opusfile_op_open_callbacks+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30719,35 +29427,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char op_open_callbacks (); int main () { -return ${pbxfuncname} (); +return op_open_callbacks (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_opusfile_op_open_callbacks=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_opusfile_op_open_callbacks=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5 +$as_echo "$ac_cv_lib_opusfile_op_open_callbacks" >&6; } +if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes; then : AST_OPUSFILE_FOUND=yes else AST_OPUSFILE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPUSFILE_FOUND}" = "yes"; then @@ -30757,9 +29464,8 @@ fi OPUSFILE_INCLUDE="-I${OPUSFILE_DIR}/include" fi OPUSFILE_INCLUDE="${OPUSFILE_INCLUDE} $__opus_include" - if test "xopus/opusfile.h" = "x" ; then # no header, assume found - OPUSFILE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPUSFILE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default" @@ -30771,14 +29477,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPUSFILE_HEADER_FOUND}" = "x0" ; then OPUSFILE_LIB="" OPUSFILE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPUSFILE_LIB="" - fi + PBX_OPUSFILE=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPUSFILE 1 @@ -31019,11 +29723,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "xP[WT]LIB_VERSION" != "x"; then - VNAME="P[WT]LIB_VERSION" - else - VNAME="PWLIB_VERSION" - fi + VNAME="P[WT]LIB_VERSION" if test "${HAS_PWLIB:-unset}" != "unset"; then PWLIB_VERSION=`grep "$VNAME \"" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` @@ -31032,11 +29732,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.` PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER})) PWLIB_REQ=$((1*10000+9*100+2)) - if test "x" = "x"; then - PWLIB_MAX=9999999 - else - PWLIB_MAX=$((*10000+*100+)) - fi + PWLIB_MAX=9999999 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5 $as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; } @@ -31352,11 +30048,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x" != "x"; then - VNAME="" - else - VNAME="OPENH323_VERSION" - fi + VNAME="OPENH323_VERSION" if test "${HAS_OPENH323:-unset}" != "unset"; then OPENH323_VERSION=`grep "$VNAME \"" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` @@ -31365,11 +30057,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER})) OPENH323_REQ=$((1*10000+17*100+3)) - if test "x0" = "x"; then - OPENH323_MAX=9999999 - else - OPENH323_MAX=$((1*10000+19*100+0)) - fi + OPENH323_MAX=$((1*10000+19*100+0)) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5 $as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; } @@ -31541,16 +30229,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="-L${LUA_DIR}" fi fi - pbxfuncname="luaL_newstate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; } +if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31564,35 +30248,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char luaL_newstate (); int main () { -return ${pbxfuncname} (); +return luaL_newstate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_lua5_2_luaL_newstate=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_lua5_2_luaL_newstate=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_2_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -31602,9 +30285,8 @@ fi LUA_INCLUDE="-I${LUA_DIR}/include" fi LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.2/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default" @@ -31616,14 +30298,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" LUA_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" - fi + PBX_LUA=1 cat >>confdefs.h <<_ACEOF #define HAVE_LUA 1 @@ -31653,16 +30333,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="-L${LUA_DIR}" fi fi - pbxfuncname="luaL_newstate" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5 -$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; } +if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31676,35 +30352,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char luaL_newstate (); int main () { -return ${pbxfuncname} (); +return luaL_newstate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_lua5_1_luaL_newstate=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_lua5_1_luaL_newstate=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -31714,9 +30389,8 @@ fi LUA_INCLUDE="-I${LUA_DIR}/include" fi LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua5.1/lua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" @@ -31728,14 +30402,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" LUA_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" - fi + PBX_LUA=1 cat >>confdefs.h <<_ACEOF #define HAVE_LUA 1 @@ -31766,16 +30438,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="-L${LUA_DIR}" fi fi - pbxfuncname="luaL_openlib" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LUA_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_lua_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua" >&5 -$as_echo_n "checking for ${pbxfuncname} in -llua... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_openlib in -llua" >&5 +$as_echo_n "checking for luaL_openlib in -llua... " >&6; } +if ${ac_cv_lib_lua_luaL_openlib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31789,35 +30457,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char luaL_openlib (); int main () { -return ${pbxfuncname} (); +return luaL_openlib (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_lua_luaL_openlib=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_lua_luaL_openlib=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_openlib" >&5 +$as_echo "$ac_cv_lib_lua_luaL_openlib" >&6; } +if test "x$ac_cv_lib_lua_luaL_openlib" = xyes; then : AST_LUA_FOUND=yes else AST_LUA_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -31827,9 +30494,8 @@ fi LUA_INCLUDE="-I${LUA_DIR}/include" fi LUA_INCLUDE="${LUA_INCLUDE} " - if test "xlua.h" = "x" ; then # no header, assume found - LUA_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default" @@ -31841,14 +30507,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LUA_HEADER_FOUND}" = "x0" ; then LUA_LIB="" LUA_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LUA_LIB="" - fi + PBX_LUA=1 cat >>confdefs.h <<_ACEOF #define HAVE_LUA 1 @@ -31873,16 +30537,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="rc_read_config" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_freeradius-client_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lfreeradius-client" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lfreeradius-client... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5 +$as_echo_n "checking for rc_read_config in -lfreeradius-client... " >&6; } +if ${ac_cv_lib_freeradius_client_rc_read_config+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31896,35 +30556,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char rc_read_config (); int main () { -return ${pbxfuncname} (); +return rc_read_config (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_freeradius_client_rc_read_config=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_freeradius_client_rc_read_config=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5 +$as_echo "$ac_cv_lib_freeradius_client_rc_read_config" >&6; } +if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes; then : AST_RADIUS_FOUND=yes else AST_RADIUS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_RADIUS_FOUND}" = "yes"; then @@ -31934,9 +30593,8 @@ fi RADIUS_INCLUDE="-I${RADIUS_DIR}/include" fi RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xfreeradius-client.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "freeradius-client.h" "ac_cv_header_freeradius_client_h" "$ac_includes_default" @@ -31948,14 +30606,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then RADIUS_LIB="" RADIUS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" - fi + PBX_RADIUS=1 cat >>confdefs.h <<_ACEOF #define HAVE_RADIUS 1 @@ -31982,16 +30638,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="rc_read_config" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lradiusclient-ng" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lradiusclient-ng... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5 +$as_echo_n "checking for rc_read_config in -lradiusclient-ng... " >&6; } +if ${ac_cv_lib_radiusclient_ng_rc_read_config+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32005,35 +30657,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char rc_read_config (); int main () { -return ${pbxfuncname} (); +return rc_read_config (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_radiusclient_ng_rc_read_config=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_radiusclient_ng_rc_read_config=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; } +if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes; then : AST_RADIUS_FOUND=yes else AST_RADIUS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_RADIUS_FOUND}" = "yes"; then @@ -32043,9 +30694,8 @@ fi RADIUS_INCLUDE="-I${RADIUS_DIR}/include" fi RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xradiusclient-ng.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "radiusclient-ng.h" "ac_cv_header_radiusclient_ng_h" "$ac_includes_default" @@ -32057,14 +30707,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then RADIUS_LIB="" RADIUS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" - fi + PBX_RADIUS=1 cat >>confdefs.h <<_ACEOF #define HAVE_RADIUS 1 @@ -32091,16 +30739,12 @@ if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then pbxlibdir="-L${RADIUS_DIR}" fi fi - pbxfuncname="rc_read_config" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_RADIUS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_radcli_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lradcli" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lradcli... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5 +$as_echo_n "checking for rc_read_config in -lradcli... " >&6; } +if ${ac_cv_lib_radcli_rc_read_config+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32114,35 +30758,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char rc_read_config (); int main () { -return ${pbxfuncname} (); +return rc_read_config (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_radcli_rc_read_config=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_radcli_rc_read_config=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radcli_rc_read_config" >&6; } +if test "x$ac_cv_lib_radcli_rc_read_config" = xyes; then : AST_RADIUS_FOUND=yes else AST_RADIUS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_RADIUS_FOUND}" = "yes"; then @@ -32152,9 +30795,8 @@ fi RADIUS_INCLUDE="-I${RADIUS_DIR}/include" fi RADIUS_INCLUDE="${RADIUS_INCLUDE} " - if test "xradcli/radcli.h" = "x" ; then # no header, assume found - RADIUS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "radcli/radcli.h" "ac_cv_header_radcli_radcli_h" "$ac_includes_default" @@ -32166,14 +30808,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then RADIUS_LIB="" RADIUS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - RADIUS_LIB="" - fi + PBX_RADIUS=1 cat >>confdefs.h <<_ACEOF #define HAVE_RADIUS 1 @@ -32203,16 +30843,12 @@ if test "x${PBX_CODEC2}" != "x1" -a "${USE_CODEC2}" != "no"; then pbxlibdir="-L${CODEC2_DIR}" fi fi - pbxfuncname="codec2_create" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CODEC2_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_codec2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcodec2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcodec2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for codec2_create in -lcodec2" >&5 +$as_echo_n "checking for codec2_create in -lcodec2... " >&6; } +if ${ac_cv_lib_codec2_codec2_create+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32226,35 +30862,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char codec2_create (); int main () { -return ${pbxfuncname} (); +return codec2_create (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_codec2_codec2_create=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_codec2_codec2_create=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_codec2_codec2_create" >&5 +$as_echo "$ac_cv_lib_codec2_codec2_create" >&6; } +if test "x$ac_cv_lib_codec2_codec2_create" = xyes; then : AST_CODEC2_FOUND=yes else AST_CODEC2_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_CODEC2_FOUND}" = "yes"; then @@ -32264,9 +30899,8 @@ fi CODEC2_INCLUDE="-I${CODEC2_DIR}/include" fi CODEC2_INCLUDE="${CODEC2_INCLUDE} " - if test "xcodec2/codec2.h" = "x" ; then # no header, assume found - CODEC2_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CODEC2_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "codec2/codec2.h" "ac_cv_header_codec2_codec2_h" "$ac_includes_default" @@ -32278,14 +30912,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${CODEC2_HEADER_FOUND}" = "x0" ; then CODEC2_LIB="" CODEC2_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CODEC2_LIB="" - fi + PBX_CODEC2=1 cat >>confdefs.h <<_ACEOF #define HAVE_CODEC2 1 @@ -32308,16 +30940,12 @@ if test "x${PBX_COROSYNC}" != "x1" -a "${USE_COROSYNC}" != "no"; then pbxlibdir="-L${COROSYNC_DIR}" fi fi - pbxfuncname="cpg_join" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_COROSYNC_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_cpg_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcpg" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcpg... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpg_join in -lcpg" >&5 +$as_echo_n "checking for cpg_join in -lcpg... " >&6; } +if ${ac_cv_lib_cpg_cpg_join+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32331,35 +30959,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char cpg_join (); int main () { -return ${pbxfuncname} (); +return cpg_join (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_cpg_cpg_join=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cpg_cpg_join=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpg_cpg_join" >&5 +$as_echo "$ac_cv_lib_cpg_cpg_join" >&6; } +if test "x$ac_cv_lib_cpg_cpg_join" = xyes; then : AST_COROSYNC_FOUND=yes else AST_COROSYNC_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_COROSYNC_FOUND}" = "yes"; then @@ -32369,9 +30996,8 @@ fi COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include" fi COROSYNC_INCLUDE="${COROSYNC_INCLUDE} " - if test "xcorosync/cpg.h" = "x" ; then # no header, assume found - COROSYNC_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${COROSYNC_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "corosync/cpg.h" "ac_cv_header_corosync_cpg_h" "$ac_includes_default" @@ -32383,14 +31009,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${COROSYNC_HEADER_FOUND}" = "x0" ; then COROSYNC_LIB="" COROSYNC_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - COROSYNC_LIB="" - fi + PBX_COROSYNC=1 cat >>confdefs.h <<_ACEOF #define HAVE_COROSYNC 1 @@ -32412,16 +31036,12 @@ if test "x${PBX_COROSYNC_CFG_STATE_TRACK}" != "x1" -a "${USE_COROSYNC_CFG_STATE_ pbxlibdir="-L${COROSYNC_CFG_STATE_TRACK_DIR}" fi fi - pbxfuncname="corosync_cfg_state_track" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_COROSYNC_CFG_STATE_TRACK_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_cfg_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcfg" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcfg... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corosync_cfg_state_track in -lcfg" >&5 +$as_echo_n "checking for corosync_cfg_state_track in -lcfg... " >&6; } +if ${ac_cv_lib_cfg_corosync_cfg_state_track+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32435,35 +31055,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char corosync_cfg_state_track (); int main () { -return ${pbxfuncname} (); +return corosync_cfg_state_track (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_cfg_corosync_cfg_state_track=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_cfg_corosync_cfg_state_track=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfg_corosync_cfg_state_track" >&5 +$as_echo "$ac_cv_lib_cfg_corosync_cfg_state_track" >&6; } +if test "x$ac_cv_lib_cfg_corosync_cfg_state_track" = xyes; then : AST_COROSYNC_CFG_STATE_TRACK_FOUND=yes else AST_COROSYNC_CFG_STATE_TRACK_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_COROSYNC_CFG_STATE_TRACK_FOUND}" = "yes"; then @@ -32473,9 +31092,8 @@ fi COROSYNC_CFG_STATE_TRACK_INCLUDE="-I${COROSYNC_CFG_STATE_TRACK_DIR}/include" fi COROSYNC_CFG_STATE_TRACK_INCLUDE="${COROSYNC_CFG_STATE_TRACK_INCLUDE} " - if test "xcorosync/cfg.h" = "x" ; then # no header, assume found - COROSYNC_CFG_STATE_TRACK_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${COROSYNC_CFG_STATE_TRACK_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "corosync/cfg.h" "ac_cv_header_corosync_cfg_h" "$ac_includes_default" @@ -32487,14 +31105,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${COROSYNC_CFG_STATE_TRACK_HEADER_FOUND}" = "x0" ; then COROSYNC_CFG_STATE_TRACK_LIB="" COROSYNC_CFG_STATE_TRACK_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - COROSYNC_CFG_STATE_TRACK_LIB="" - fi + PBX_COROSYNC_CFG_STATE_TRACK=1 cat >>confdefs.h <<_ACEOF #define HAVE_COROSYNC_CFG_STATE_TRACK 1 @@ -32517,16 +31133,12 @@ if test "x${PBX_SPEEX}" != "x1" -a "${USE_SPEEX}" != "no"; then pbxlibdir="-L${SPEEX_DIR}" fi fi - pbxfuncname="speex_encode" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SPEEX_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_encode in -lspeex" >&5 +$as_echo_n "checking for speex_encode in -lspeex... " >&6; } +if ${ac_cv_lib_speex_speex_encode+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32540,35 +31152,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char speex_encode (); int main () { -return ${pbxfuncname} (); +return speex_encode (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_speex_speex_encode=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_speex_speex_encode=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_encode" >&5 +$as_echo "$ac_cv_lib_speex_speex_encode" >&6; } +if test "x$ac_cv_lib_speex_speex_encode" = xyes; then : AST_SPEEX_FOUND=yes else AST_SPEEX_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SPEEX_FOUND}" = "yes"; then @@ -32578,9 +31189,8 @@ fi SPEEX_INCLUDE="-I${SPEEX_DIR}/include" fi SPEEX_INCLUDE="${SPEEX_INCLUDE} " - if test "xspeex/speex.h" = "x" ; then # no header, assume found - SPEEX_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" @@ -32592,14 +31202,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then SPEEX_LIB="" SPEEX_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SPEEX_LIB="" - fi + PBX_SPEEX=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEX 1 @@ -32623,16 +31231,12 @@ if test "x${PBX_SPEEX_PREPROCESS}" != "x1" -a "${USE_SPEEX_PREPROCESS}" != "no"; pbxlibdir="-L${SPEEX_PREPROCESS_DIR}" fi fi - pbxfuncname="speex_preprocess_ctl" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SPEEX_PREPROCESS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_speex_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeex" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lspeex... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeex" >&5 +$as_echo_n "checking for speex_preprocess_ctl in -lspeex... " >&6; } +if ${ac_cv_lib_speex_speex_preprocess_ctl+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32646,35 +31250,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char speex_preprocess_ctl (); int main () { -return ${pbxfuncname} (); +return speex_preprocess_ctl (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_speex_speex_preprocess_ctl=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_speex_speex_preprocess_ctl=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5 +$as_echo "$ac_cv_lib_speex_speex_preprocess_ctl" >&6; } +if test "x$ac_cv_lib_speex_speex_preprocess_ctl" = xyes; then : AST_SPEEX_PREPROCESS_FOUND=yes else AST_SPEEX_PREPROCESS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SPEEX_PREPROCESS_FOUND}" = "yes"; then @@ -32684,9 +31287,8 @@ fi SPEEX_PREPROCESS_INCLUDE="-I${SPEEX_PREPROCESS_DIR}/include" fi SPEEX_PREPROCESS_INCLUDE="${SPEEX_PREPROCESS_INCLUDE} " - if test "xspeex/speex.h" = "x" ; then # no header, assume found - SPEEX_PREPROCESS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" @@ -32698,14 +31300,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SPEEX_PREPROCESS_HEADER_FOUND}" = "x0" ; then SPEEX_PREPROCESS_LIB="" SPEEX_PREPROCESS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SPEEX_PREPROCESS_LIB="" - fi + PBX_SPEEX_PREPROCESS=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEX_PREPROCESS 1 @@ -32731,16 +31331,12 @@ if test "x${PBX_SPEEXDSP}" != "x1" -a "${USE_SPEEXDSP}" != "no"; then pbxlibdir="-L${SPEEXDSP_DIR}" fi fi - pbxfuncname="speex_preprocess_ctl" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SPEEXDSP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_speexdsp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lspeexdsp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lspeexdsp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeexdsp" >&5 +$as_echo_n "checking for speex_preprocess_ctl in -lspeexdsp... " >&6; } +if ${ac_cv_lib_speexdsp_speex_preprocess_ctl+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32754,35 +31350,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char speex_preprocess_ctl (); int main () { -return ${pbxfuncname} (); +return speex_preprocess_ctl (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_speexdsp_speex_preprocess_ctl=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_speexdsp_speex_preprocess_ctl=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5 +$as_echo "$ac_cv_lib_speexdsp_speex_preprocess_ctl" >&6; } +if test "x$ac_cv_lib_speexdsp_speex_preprocess_ctl" = xyes; then : AST_SPEEXDSP_FOUND=yes else AST_SPEEXDSP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SPEEXDSP_FOUND}" = "yes"; then @@ -32792,9 +31387,8 @@ fi SPEEXDSP_INCLUDE="-I${SPEEXDSP_DIR}/include" fi SPEEXDSP_INCLUDE="${SPEEXDSP_INCLUDE} " - if test "xspeex/speex.h" = "x" ; then # no header, assume found - SPEEXDSP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default" @@ -32806,14 +31400,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then SPEEXDSP_LIB="" SPEEXDSP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SPEEXDSP_LIB="" - fi + PBX_SPEEXDSP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SPEEXDSP 1 @@ -32841,16 +31433,12 @@ if test "x${PBX_SQLITE}" != "x1" -a "${USE_SQLITE}" != "no"; then pbxlibdir="-L${SQLITE_DIR}" fi fi - pbxfuncname="sqlite_exec" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SQLITE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_sqlite_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsqlite... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_exec in -lsqlite" >&5 +$as_echo_n "checking for sqlite_exec in -lsqlite... " >&6; } +if ${ac_cv_lib_sqlite_sqlite_exec+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32864,35 +31452,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char sqlite_exec (); int main () { -return ${pbxfuncname} (); +return sqlite_exec (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_sqlite_sqlite_exec=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_sqlite_sqlite_exec=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_exec" >&5 +$as_echo "$ac_cv_lib_sqlite_sqlite_exec" >&6; } +if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes; then : AST_SQLITE_FOUND=yes else AST_SQLITE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SQLITE_FOUND}" = "yes"; then @@ -32902,9 +31489,8 @@ fi SQLITE_INCLUDE="-I${SQLITE_DIR}/include" fi SQLITE_INCLUDE="${SQLITE_INCLUDE} " - if test "xsqlite.h" = "x" ; then # no header, assume found - SQLITE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default" @@ -32916,14 +31502,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then SQLITE_LIB="" SQLITE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SQLITE_LIB="" - fi + PBX_SQLITE=1 cat >>confdefs.h <<_ACEOF #define HAVE_SQLITE 1 @@ -32946,16 +31530,12 @@ if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then pbxlibdir="-L${SQLITE3_DIR}" fi fi - pbxfuncname="sqlite3_open" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SQLITE3_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`$as_echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite3" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsqlite3... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5 +$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; } +if ${ac_cv_lib_sqlite3_sqlite3_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32969,35 +31549,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char sqlite3_open (); int main () { -return ${pbxfuncname} (); +return sqlite3_open (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_sqlite3_sqlite3_open=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_sqlite3_sqlite3_open=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5 +$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } +if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then : AST_SQLITE3_FOUND=yes else AST_SQLITE3_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SQLITE3_FOUND}" = "yes"; then @@ -33007,9 +31586,8 @@ fi SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include" fi SQLITE3_INCLUDE="${SQLITE3_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xsqlite3.h" = "x" ; then # no header, assume found - SQLITE3_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default" @@ -33021,14 +31599,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SQLITE3_HEADER_FOUND}" = "x0" ; then SQLITE3_LIB="" SQLITE3_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SQLITE3_LIB="" - fi + PBX_SQLITE3=1 cat >>confdefs.h <<_ACEOF #define HAVE_SQLITE3 1 @@ -33060,16 +31636,12 @@ if test "x${PBX_LIBCRYPT}" != "x1" -a "${USE_LIBCRYPT}" != "no"; then pbxlibdir="-L${LIBCRYPT_DIR}" fi fi - pbxfuncname="crypt" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_LIBCRYPT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_crypt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcrypt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcrypt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 +$as_echo_n "checking for crypt in -lcrypt... " >&6; } +if ${ac_cv_lib_crypt_crypt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33083,35 +31655,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char crypt (); int main () { -return ${pbxfuncname} (); +return crypt (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_crypt_crypt=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_crypt_crypt=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 +$as_echo "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = xyes; then : AST_LIBCRYPT_FOUND=yes else AST_LIBCRYPT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_LIBCRYPT_FOUND}" = "yes"; then @@ -33121,9 +31692,8 @@ fi LIBCRYPT_INCLUDE="-I${LIBCRYPT_DIR}/include" fi LIBCRYPT_INCLUDE="${LIBCRYPT_INCLUDE} " - if test "xcrypt.h" = "x" ; then # no header, assume found - LIBCRYPT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBCRYPT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" @@ -33135,14 +31705,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${LIBCRYPT_HEADER_FOUND}" = "x0" ; then LIBCRYPT_LIB="" LIBCRYPT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - LIBCRYPT_LIB="" - fi + PBX_LIBCRYPT=1 cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 @@ -33233,16 +31801,12 @@ if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then pbxlibdir="-L${CRYPTO_DIR}" fi fi - pbxfuncname="AES_encrypt" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CRYPTO_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_crypto_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcrypto" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcrypto... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AES_encrypt in -lcrypto" >&5 +$as_echo_n "checking for AES_encrypt in -lcrypto... " >&6; } +if ${ac_cv_lib_crypto_AES_encrypt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33256,35 +31820,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char AES_encrypt (); int main () { -return ${pbxfuncname} (); +return AES_encrypt (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_crypto_AES_encrypt=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_crypto_AES_encrypt=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5 +$as_echo "$ac_cv_lib_crypto_AES_encrypt" >&6; } +if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes; then : AST_CRYPTO_FOUND=yes else AST_CRYPTO_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_CRYPTO_FOUND}" = "yes"; then @@ -33294,9 +31857,8 @@ fi CRYPTO_INCLUDE="-I${CRYPTO_DIR}/include" fi CRYPTO_INCLUDE="${CRYPTO_INCLUDE} " - if test "xopenssl/aes.h" = "x" ; then # no header, assume found - CRYPTO_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default" @@ -33308,14 +31870,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${CRYPTO_HEADER_FOUND}" = "x0" ; then CRYPTO_LIB="" CRYPTO_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CRYPTO_LIB="" - fi + PBX_CRYPTO=1 cat >>confdefs.h <<_ACEOF #define HAVE_CRYPTO 1 @@ -33340,16 +31900,12 @@ if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then pbxlibdir="-L${OPENSSL_DIR}" fi fi - pbxfuncname="SSL_connect" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPENSSL_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5 +$as_echo_n "checking for SSL_connect in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33363,35 +31919,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char SSL_connect (); int main () { -return ${pbxfuncname} (); +return SSL_connect (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ssl_SSL_connect=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ssl_SSL_connect=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; } +if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then : AST_OPENSSL_FOUND=yes else AST_OPENSSL_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPENSSL_FOUND}" = "yes"; then @@ -33401,9 +31956,8 @@ fi OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include" fi OPENSSL_INCLUDE="${OPENSSL_INCLUDE} " - if test "xopenssl/ssl.h" = "x" ; then # no header, assume found - OPENSSL_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" @@ -33415,14 +31969,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then OPENSSL_LIB="" OPENSSL_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPENSSL_LIB="" - fi + PBX_OPENSSL=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL 1 @@ -33575,16 +32127,12 @@ if test "x${PBX_OPENSSL_SRTP}" != "x1" -a "${USE_OPENSSL_SRTP}" != "no"; then pbxlibdir="-L${OPENSSL_SRTP_DIR}" fi fi - pbxfuncname="SSL_CTX_set_tlsext_use_srtp" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPENSSL_SRTP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_tlsext_use_srtp in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_set_tlsext_use_srtp in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33598,35 +32146,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char SSL_CTX_set_tlsext_use_srtp (); int main () { -return ${pbxfuncname} (); +return SSL_CTX_set_tlsext_use_srtp (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_set_tlsext_use_srtp" = xyes; then : AST_OPENSSL_SRTP_FOUND=yes else AST_OPENSSL_SRTP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPENSSL_SRTP_FOUND}" = "yes"; then @@ -33636,9 +32183,8 @@ fi OPENSSL_SRTP_INCLUDE="-I${OPENSSL_SRTP_DIR}/include" fi OPENSSL_SRTP_INCLUDE="${OPENSSL_SRTP_INCLUDE} " - if test "xopenssl/ssl.h" = "x" ; then # no header, assume found - OPENSSL_SRTP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENSSL_SRTP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" @@ -33650,14 +32196,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPENSSL_SRTP_HEADER_FOUND}" = "x0" ; then OPENSSL_SRTP_LIB="" OPENSSL_SRTP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPENSSL_SRTP_LIB="" - fi + PBX_OPENSSL_SRTP=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_SRTP 1 @@ -33683,16 +32227,12 @@ if test "x${PBX_OPENSSL_EC}" != "x1" -a "${USE_OPENSSL_EC}" != "no"; then pbxlibdir="-L${OPENSSL_EC_DIR}" fi fi - pbxfuncname="EC_KEY_new_by_curve_name" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_OPENSSL_EC_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ssl_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lssl" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lssl... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EC_KEY_new_by_curve_name in -lssl" >&5 +$as_echo_n "checking for EC_KEY_new_by_curve_name in -lssl... " >&6; } +if ${ac_cv_lib_ssl_EC_KEY_new_by_curve_name+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33706,35 +32246,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char EC_KEY_new_by_curve_name (); int main () { -return ${pbxfuncname} (); +return EC_KEY_new_by_curve_name (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ssl_EC_KEY_new_by_curve_name=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ssl_EC_KEY_new_by_curve_name=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_EC_KEY_new_by_curve_name" >&5 +$as_echo "$ac_cv_lib_ssl_EC_KEY_new_by_curve_name" >&6; } +if test "x$ac_cv_lib_ssl_EC_KEY_new_by_curve_name" = xyes; then : AST_OPENSSL_EC_FOUND=yes else AST_OPENSSL_EC_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_OPENSSL_EC_FOUND}" = "yes"; then @@ -33744,9 +32283,8 @@ fi OPENSSL_EC_INCLUDE="-I${OPENSSL_EC_DIR}/include" fi OPENSSL_EC_INCLUDE="${OPENSSL_EC_INCLUDE} " - if test "xopenssl/ec.h" = "x" ; then # no header, assume found - OPENSSL_EC_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${OPENSSL_EC_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "openssl/ec.h" "ac_cv_header_openssl_ec_h" "$ac_includes_default" @@ -33758,14 +32296,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${OPENSSL_EC_HEADER_FOUND}" = "x0" ; then OPENSSL_EC_LIB="" OPENSSL_EC_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - OPENSSL_EC_LIB="" - fi + PBX_OPENSSL_EC=1 cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_EC 1 @@ -33885,16 +32421,12 @@ if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then pbxlibdir="-L${SRTP_DIR}" fi fi - pbxfuncname="srtp_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp2" >&5 +$as_echo_n "checking for srtp_init in -lsrtp2... " >&6; } +if ${ac_cv_lib_srtp2_srtp_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33908,35 +32440,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_init (); int main () { -return ${pbxfuncname} (); +return srtp_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp2_srtp_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp2_srtp_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_init" >&5 +$as_echo "$ac_cv_lib_srtp2_srtp_init" >&6; } +if test "x$ac_cv_lib_srtp2_srtp_init" = xyes; then : AST_SRTP_FOUND=yes else AST_SRTP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_FOUND}" = "yes"; then @@ -33946,9 +32477,8 @@ fi SRTP_INCLUDE="-I${SRTP_DIR}/include" fi SRTP_INCLUDE="${SRTP_INCLUDE} " - if test "xsrtp2/srtp.h" = "x" ; then # no header, assume found - SRTP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default" @@ -33960,14 +32490,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SRTP_HEADER_FOUND}" = "x0" ; then SRTP_LIB="" SRTP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_LIB="" - fi + PBX_SRTP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP 1 @@ -34067,16 +32595,12 @@ if test "x${PBX_SRTP_256}" != "x1" -a "${USE_SRTP_256}" != "no"; then pbxlibdir="-L${SRTP_256_DIR}" fi fi - pbxfuncname="srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_256_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2" >&5 +$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2... " >&6; } +if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34090,35 +32614,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 (); int main () { -return ${pbxfuncname} (); +return srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5 +$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; } +if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then : AST_SRTP_256_FOUND=yes else AST_SRTP_256_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_256_FOUND}" = "yes"; then @@ -34128,28 +32651,15 @@ fi SRTP_256_INCLUDE="-I${SRTP_256_DIR}/include" fi SRTP_256_INCLUDE="${SRTP_256_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_256_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_256_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_256_HEADER_FOUND=1 -else - SRTP_256_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_256_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_256_HEADER_FOUND}" = "x0" ; then SRTP_256_LIB="" SRTP_256_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_256_LIB="" - fi + PBX_SRTP_256=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_256 1 @@ -34171,16 +32681,12 @@ if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then pbxlibdir="-L${SRTP_192_DIR}" fi fi - pbxfuncname="srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_192_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2" >&5 +$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2... " >&6; } +if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34194,35 +32700,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 (); int main () { -return ${pbxfuncname} (); +return srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5 +$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; } +if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then : AST_SRTP_192_FOUND=yes else AST_SRTP_192_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_192_FOUND}" = "yes"; then @@ -34232,28 +32737,15 @@ fi SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include" fi SRTP_192_INCLUDE="${SRTP_192_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_192_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_192_HEADER_FOUND=1 -else - SRTP_192_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_192_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then SRTP_192_LIB="" SRTP_192_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_192_LIB="" - fi + PBX_SRTP_192=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_192 1 @@ -34275,16 +32767,12 @@ if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then pbxlibdir="-L${SRTP_GCM_DIR}" fi fi - pbxfuncname="srtp_crypto_policy_set_aes_gcm_128_8_auth" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_GCM_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2" >&5 +$as_echo_n "checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2... " >&6; } +if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34298,35 +32786,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_crypto_policy_set_aes_gcm_128_8_auth (); int main () { -return ${pbxfuncname} (); +return srtp_crypto_policy_set_aes_gcm_128_8_auth (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5 +$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; } +if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then : AST_SRTP_GCM_FOUND=yes else AST_SRTP_GCM_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_GCM_FOUND}" = "yes"; then @@ -34336,28 +32823,15 @@ fi SRTP_GCM_INCLUDE="-I${SRTP_GCM_DIR}/include" fi SRTP_GCM_INCLUDE="${SRTP_GCM_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_GCM_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_GCM_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_GCM_HEADER_FOUND=1 -else - SRTP_GCM_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_GCM_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_GCM_HEADER_FOUND}" = "x0" ; then SRTP_GCM_LIB="" SRTP_GCM_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_GCM_LIB="" - fi + PBX_SRTP_GCM=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_GCM 1 @@ -34379,16 +32853,12 @@ if test "x${PBX_SRTP_SHUTDOWN}" != "x1" -a "${USE_SRTP_SHUTDOWN}" != "no"; then pbxlibdir="-L${SRTP_SHUTDOWN_DIR}" fi fi - pbxfuncname="srtp_shutdown" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_SHUTDOWN_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp2_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp2" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp2... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp2" >&5 +$as_echo_n "checking for srtp_shutdown in -lsrtp2... " >&6; } +if ${ac_cv_lib_srtp2_srtp_shutdown+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34402,35 +32872,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_shutdown (); int main () { -return ${pbxfuncname} (); +return srtp_shutdown (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp2_srtp_shutdown=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp2_srtp_shutdown=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_shutdown" >&5 +$as_echo "$ac_cv_lib_srtp2_srtp_shutdown" >&6; } +if test "x$ac_cv_lib_srtp2_srtp_shutdown" = xyes; then : AST_SRTP_SHUTDOWN_FOUND=yes else AST_SRTP_SHUTDOWN_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_SHUTDOWN_FOUND}" = "yes"; then @@ -34440,9 +32909,8 @@ fi SRTP_SHUTDOWN_INCLUDE="-I${SRTP_SHUTDOWN_DIR}/include" fi SRTP_SHUTDOWN_INCLUDE="${SRTP_SHUTDOWN_INCLUDE} " - if test "xsrtp2/srtp.h" = "x" ; then # no header, assume found - SRTP_SHUTDOWN_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default" @@ -34454,14 +32922,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then SRTP_SHUTDOWN_LIB="" SRTP_SHUTDOWN_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_SHUTDOWN_LIB="" - fi + PBX_SRTP_SHUTDOWN=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_SHUTDOWN 1 @@ -34499,16 +32965,12 @@ if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then pbxlibdir="-L${SRTP_DIR}" fi fi - pbxfuncname="srtp_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp" >&5 +$as_echo_n "checking for srtp_init in -lsrtp... " >&6; } +if ${ac_cv_lib_srtp_srtp_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34522,35 +32984,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_init (); int main () { -return ${pbxfuncname} (); +return srtp_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp_srtp_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp_srtp_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_init" >&5 +$as_echo "$ac_cv_lib_srtp_srtp_init" >&6; } +if test "x$ac_cv_lib_srtp_srtp_init" = xyes; then : AST_SRTP_FOUND=yes else AST_SRTP_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_FOUND}" = "yes"; then @@ -34560,9 +33021,8 @@ fi SRTP_INCLUDE="-I${SRTP_DIR}/include" fi SRTP_INCLUDE="${SRTP_INCLUDE} " - if test "xsrtp/srtp.h" = "x" ; then # no header, assume found - SRTP_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default" @@ -34574,14 +33034,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SRTP_HEADER_FOUND}" = "x0" ; then SRTP_LIB="" SRTP_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_LIB="" - fi + PBX_SRTP=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP 1 @@ -34677,16 +33135,12 @@ if test "x${PBX_SRTP_256}" != "x1" -a "${USE_SRTP_256}" != "no"; then pbxlibdir="-L${SRTP_256_DIR}" fi fi - pbxfuncname="crypto_policy_set_aes_cm_256_hmac_sha1_80" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_256_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp" >&5 +$as_echo_n "checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp... " >&6; } +if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34700,35 +33154,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char crypto_policy_set_aes_cm_256_hmac_sha1_80 (); int main () { -return ${pbxfuncname} (); +return crypto_policy_set_aes_cm_256_hmac_sha1_80 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5 +$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; } +if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then : AST_SRTP_256_FOUND=yes else AST_SRTP_256_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_256_FOUND}" = "yes"; then @@ -34738,28 +33191,15 @@ fi SRTP_256_INCLUDE="-I${SRTP_256_DIR}/include" fi SRTP_256_INCLUDE="${SRTP_256_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_256_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_256_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_256_HEADER_FOUND=1 -else - SRTP_256_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_256_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_256_HEADER_FOUND}" = "x0" ; then SRTP_256_LIB="" SRTP_256_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_256_LIB="" - fi + PBX_SRTP_256=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_256 1 @@ -34781,16 +33221,12 @@ if test "x${PBX_SRTP_192}" != "x1" -a "${USE_SRTP_192}" != "no"; then pbxlibdir="-L${SRTP_192_DIR}" fi fi - pbxfuncname="crypto_policy_set_aes_cm_192_hmac_sha1_80" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_192_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp" >&5 +$as_echo_n "checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp... " >&6; } +if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34804,35 +33240,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char crypto_policy_set_aes_cm_192_hmac_sha1_80 (); int main () { -return ${pbxfuncname} (); +return crypto_policy_set_aes_cm_192_hmac_sha1_80 (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5 +$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; } +if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then : AST_SRTP_192_FOUND=yes else AST_SRTP_192_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_192_FOUND}" = "yes"; then @@ -34842,28 +33277,15 @@ fi SRTP_192_INCLUDE="-I${SRTP_192_DIR}/include" fi SRTP_192_INCLUDE="${SRTP_192_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_192_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_192_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_192_HEADER_FOUND=1 -else - SRTP_192_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_192_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_192_HEADER_FOUND}" = "x0" ; then SRTP_192_LIB="" SRTP_192_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_192_LIB="" - fi + PBX_SRTP_192=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_192 1 @@ -34885,16 +33307,12 @@ if test "x${PBX_SRTP_GCM}" != "x1" -a "${USE_SRTP_GCM}" != "no"; then pbxlibdir="-L${SRTP_GCM_DIR}" fi fi - pbxfuncname="crypto_policy_set_aes_gcm_128_8_auth" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_GCM_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp" >&5 +$as_echo_n "checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp... " >&6; } +if ${ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34908,35 +33326,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char crypto_policy_set_aes_gcm_128_8_auth (); int main () { -return ${pbxfuncname} (); +return crypto_policy_set_aes_gcm_128_8_auth (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5 +$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; } +if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then : AST_SRTP_GCM_FOUND=yes else AST_SRTP_GCM_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_GCM_FOUND}" = "yes"; then @@ -34946,28 +33363,15 @@ fi SRTP_GCM_INCLUDE="-I${SRTP_GCM_DIR}/include" fi SRTP_GCM_INCLUDE="${SRTP_GCM_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - SRTP_GCM_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SRTP_GCM_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - SRTP_GCM_HEADER_FOUND=1 -else - SRTP_GCM_HEADER_FOUND=0 -fi + # no header, assume found + SRTP_GCM_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${SRTP_GCM_HEADER_FOUND}" = "x0" ; then SRTP_GCM_LIB="" SRTP_GCM_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_GCM_LIB="" - fi + PBX_SRTP_GCM=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_GCM 1 @@ -34989,16 +33393,12 @@ if test "x${PBX_SRTP_SHUTDOWN}" != "x1" -a "${USE_SRTP_SHUTDOWN}" != "no"; then pbxlibdir="-L${SRTP_SHUTDOWN_DIR}" fi fi - pbxfuncname="srtp_shutdown" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SRTP_SHUTDOWN_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_srtp_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsrtp" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsrtp... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp" >&5 +$as_echo_n "checking for srtp_shutdown in -lsrtp... " >&6; } +if ${ac_cv_lib_srtp_srtp_shutdown+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35012,35 +33412,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char srtp_shutdown (); int main () { -return ${pbxfuncname} (); +return srtp_shutdown (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_srtp_srtp_shutdown=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_srtp_srtp_shutdown=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5 +$as_echo "$ac_cv_lib_srtp_srtp_shutdown" >&6; } +if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes; then : AST_SRTP_SHUTDOWN_FOUND=yes else AST_SRTP_SHUTDOWN_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SRTP_SHUTDOWN_FOUND}" = "yes"; then @@ -35050,9 +33449,8 @@ fi SRTP_SHUTDOWN_INCLUDE="-I${SRTP_SHUTDOWN_DIR}/include" fi SRTP_SHUTDOWN_INCLUDE="${SRTP_SHUTDOWN_INCLUDE} " - if test "xsrtp/srtp.h" = "x" ; then # no header, assume found - SRTP_SHUTDOWN_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default" @@ -35064,14 +33462,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then SRTP_SHUTDOWN_LIB="" SRTP_SHUTDOWN_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SRTP_SHUTDOWN_LIB="" - fi + PBX_SRTP_SHUTDOWN=1 cat >>confdefs.h <<_ACEOF #define HAVE_SRTP_SHUTDOWN 1 @@ -35190,16 +33586,12 @@ if test "x${PBX_HOARD}" != "x1" -a "${USE_HOARD}" != "no"; then pbxlibdir="-L${HOARD_DIR}" fi fi - pbxfuncname="malloc" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_HOARD_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_hoard_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lhoard" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lhoard... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5 +$as_echo_n "checking for malloc in -lhoard... " >&6; } +if ${ac_cv_lib_hoard_malloc+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35213,35 +33605,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char malloc (); int main () { -return ${pbxfuncname} (); +return malloc (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_hoard_malloc=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_hoard_malloc=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5 +$as_echo "$ac_cv_lib_hoard_malloc" >&6; } +if test "x$ac_cv_lib_hoard_malloc" = xyes; then : AST_HOARD_FOUND=yes else AST_HOARD_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_HOARD_FOUND}" = "yes"; then @@ -35251,28 +33642,15 @@ fi HOARD_INCLUDE="-I${HOARD_DIR}/include" fi HOARD_INCLUDE="${HOARD_INCLUDE} " - if test "x" = "x" ; then # no header, assume found - HOARD_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${HOARD_INCLUDE}" - ac_fn_c_check_header_mongrel "$LINENO" "" "ac_cv_header_" "$ac_includes_default" -if test "x$ac_cv_header_" = xyes; then : - HOARD_HEADER_FOUND=1 -else - HOARD_HEADER_FOUND=0 -fi + # no header, assume found + HOARD_HEADER_FOUND="1" - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi if test "x${HOARD_HEADER_FOUND}" = "x0" ; then HOARD_LIB="" HOARD_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - HOARD_LIB="" - fi + PBX_HOARD=1 cat >>confdefs.h <<_ACEOF #define HAVE_HOARD 1 @@ -35295,16 +33673,12 @@ if test "x${PBX_FREETDS}" != "x1" -a "${USE_FREETDS}" != "no"; then pbxlibdir="-L${FREETDS_DIR}" fi fi - pbxfuncname="dbinit" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_FREETDS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_sybdb_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsybdb" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lsybdb... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbinit in -lsybdb" >&5 +$as_echo_n "checking for dbinit in -lsybdb... " >&6; } +if ${ac_cv_lib_sybdb_dbinit+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35318,35 +33692,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char dbinit (); int main () { -return ${pbxfuncname} (); +return dbinit (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_sybdb_dbinit=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_sybdb_dbinit=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbinit" >&5 +$as_echo "$ac_cv_lib_sybdb_dbinit" >&6; } +if test "x$ac_cv_lib_sybdb_dbinit" = xyes; then : AST_FREETDS_FOUND=yes else AST_FREETDS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_FREETDS_FOUND}" = "yes"; then @@ -35356,9 +33729,8 @@ fi FREETDS_INCLUDE="-I${FREETDS_DIR}/include" fi FREETDS_INCLUDE="${FREETDS_INCLUDE} " - if test "xsybdb.h" = "x" ; then # no header, assume found - FREETDS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "sybdb.h" "ac_cv_header_sybdb_h" "$ac_includes_default" @@ -35370,14 +33742,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then FREETDS_LIB="" FREETDS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - FREETDS_LIB="" - fi + PBX_FREETDS=1 cat >>confdefs.h <<_ACEOF #define HAVE_FREETDS 1 @@ -35447,16 +33817,12 @@ if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then pbxlibdir="-L${TONEZONE_DIR}" fi fi - pbxfuncname="tone_zone_find" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_TONEZONE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_tonezone_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -ltonezone" >&5 -$as_echo_n "checking for ${pbxfuncname} in -ltonezone... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find in -ltonezone" >&5 +$as_echo_n "checking for tone_zone_find in -ltonezone... " >&6; } +if ${ac_cv_lib_tonezone_tone_zone_find+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35470,35 +33836,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char tone_zone_find (); int main () { -return ${pbxfuncname} (); +return tone_zone_find (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_tonezone_tone_zone_find=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_tonezone_tone_zone_find=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find" >&5 +$as_echo "$ac_cv_lib_tonezone_tone_zone_find" >&6; } +if test "x$ac_cv_lib_tonezone_tone_zone_find" = xyes; then : AST_TONEZONE_FOUND=yes else AST_TONEZONE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_TONEZONE_FOUND}" = "yes"; then @@ -35508,9 +33873,8 @@ fi TONEZONE_INCLUDE="-I${TONEZONE_DIR}/include" fi TONEZONE_INCLUDE="${TONEZONE_INCLUDE} " - if test "xdahdi/tonezone.h" = "x" ; then # no header, assume found - TONEZONE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "dahdi/tonezone.h" "ac_cv_header_dahdi_tonezone_h" "$ac_includes_default" @@ -35522,14 +33886,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then TONEZONE_LIB="" TONEZONE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - TONEZONE_LIB="" - fi + PBX_TONEZONE=1 cat >>confdefs.h <<_ACEOF #define HAVE_TONEZONE 1 @@ -35554,16 +33916,12 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then pbxlibdir="-L${VORBIS_DIR}" fi fi - pbxfuncname="vorbis_info_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_VORBIS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5 +$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; } +if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35577,35 +33935,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char vorbis_info_init (); int main () { -return ${pbxfuncname} (); +return vorbis_info_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_vorbis_vorbis_info_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_vorbis_vorbis_info_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5 +$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; } +if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then : AST_VORBIS_FOUND=yes else AST_VORBIS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_VORBIS_FOUND}" = "yes"; then @@ -35615,9 +33972,8 @@ fi VORBIS_INCLUDE="-I${VORBIS_DIR}/include" fi VORBIS_INCLUDE="${VORBIS_INCLUDE} " - if test "xvorbis/codec.h" = "x" ; then # no header, assume found - VORBIS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default" @@ -35629,14 +33985,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then VORBIS_LIB="" VORBIS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - VORBIS_LIB="" - fi + PBX_VORBIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_VORBIS 1 @@ -35659,16 +34013,12 @@ if test "x${PBX_VORBIS}" != "x1" -a "${USE_VORBIS}" != "no"; then pbxlibdir="-L${VORBIS_DIR}" fi fi - pbxfuncname="vorbis_info_init" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_VORBIS_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_vorbis_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lvorbis" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lvorbis... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5 +$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; } +if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35682,35 +34032,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char vorbis_info_init (); int main () { -return ${pbxfuncname} (); +return vorbis_info_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_vorbis_vorbis_info_init=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_vorbis_vorbis_info_init=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5 +$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; } +if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then : AST_VORBIS_FOUND=yes else AST_VORBIS_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_VORBIS_FOUND}" = "yes"; then @@ -35720,9 +34069,8 @@ fi VORBIS_INCLUDE="-I${VORBIS_DIR}/include" fi VORBIS_INCLUDE="${VORBIS_INCLUDE} " - if test "xvorbis/codec.h" = "x" ; then # no header, assume found - VORBIS_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default" @@ -35734,14 +34082,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then VORBIS_LIB="" VORBIS_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - VORBIS_LIB="" - fi + PBX_VORBIS=1 cat >>confdefs.h <<_ACEOF #define HAVE_VORBIS 1 @@ -35880,16 +34226,12 @@ if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then pbxlibdir="-L${ZLIB_DIR}" fi fi - pbxfuncname="compress" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ZLIB_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_z_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lz" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lz... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 +$as_echo_n "checking for compress in -lz... " >&6; } +if ${ac_cv_lib_z_compress+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35903,35 +34245,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char compress (); int main () { -return ${pbxfuncname} (); +return compress (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_z_compress=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_z_compress=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 +$as_echo "$ac_cv_lib_z_compress" >&6; } +if test "x$ac_cv_lib_z_compress" = xyes; then : AST_ZLIB_FOUND=yes else AST_ZLIB_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_ZLIB_FOUND}" = "yes"; then @@ -35941,9 +34282,8 @@ fi ZLIB_INCLUDE="-I${ZLIB_DIR}/include" fi ZLIB_INCLUDE="${ZLIB_INCLUDE} " - if test "xzlib.h" = "x" ; then # no header, assume found - ZLIB_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" @@ -35955,14 +34295,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then ZLIB_LIB="" ZLIB_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ZLIB_LIB="" - fi + PBX_ZLIB=1 cat >>confdefs.h <<_ACEOF #define HAVE_ZLIB 1 @@ -36230,47 +34568,18 @@ else fi if test ! "x${CONFIG_SDL}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - SDL_INCLUDE=$(${CONFIG_SDL} $A) + SDL_INCLUDE=$(${CONFIG_SDL} --cflags) SDL_INCLUDE=$(echo ${SDL_INCLUDE} | $SED -e "s|-I|-I${SDL_DIR}|g") - if test x"" = x ; then A=--libs ; else A="" ; fi - SDL_LIB=$(${CONFIG_SDL} $A) + SDL_LIB=$(${CONFIG_SDL} --libs) SDL_LIB=$(echo ${SDL_LIB} | $SED -e "s|-L|-L${SDL_DIR}|g") - if test x"" != x ; then - saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}" - - saved_libs="${LIBS}" - LIBS=${SDL_LIB} - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - ; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - PBX_SDL=1 -$as_echo "#define HAVE_SDL 1" >>confdefs.h -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - LIBS="${saved_libs}" - else PBX_SDL=1 $as_echo "#define HAVE_SDL 1" >>confdefs.h - fi + fi fi @@ -36285,16 +34594,12 @@ if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then pbxlibdir="-L${SDL_IMAGE_DIR}" fi fi - pbxfuncname="IMG_Load" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_SDL_IMAGE_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${SDL_INCLUDE}" - as_ac_Lib=`$as_echo "ac_cv_lib_SDL_image_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lSDL_image" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lSDL_image... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5 +$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; } +if ${ac_cv_lib_SDL_image_IMG_Load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36308,35 +34613,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char IMG_Load (); int main () { -return ${pbxfuncname} (); +return IMG_Load (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_SDL_image_IMG_Load=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_SDL_image_IMG_Load=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5 +$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; } +if test "x$ac_cv_lib_SDL_image_IMG_Load" = xyes; then : AST_SDL_IMAGE_FOUND=yes else AST_SDL_IMAGE_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_SDL_IMAGE_FOUND}" = "yes"; then @@ -36346,9 +34650,8 @@ fi SDL_IMAGE_INCLUDE="-I${SDL_IMAGE_DIR}/include" fi SDL_IMAGE_INCLUDE="${SDL_IMAGE_INCLUDE} ${SDL_INCLUDE}" - if test "xSDL_image.h" = "x" ; then # no header, assume found - SDL_IMAGE_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default" @@ -36360,14 +34663,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${SDL_IMAGE_HEADER_FOUND}" = "x0" ; then SDL_IMAGE_LIB="" SDL_IMAGE_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - SDL_IMAGE_LIB="" - fi + PBX_SDL_IMAGE=1 cat >>confdefs.h <<_ACEOF #define HAVE_SDL_IMAGE 1 @@ -36389,16 +34690,12 @@ if test "x${PBX_FFMPEG}" != "x1" -a "${USE_FFMPEG}" != "no"; then pbxlibdir="-L${FFMPEG_DIR}" fi fi - pbxfuncname="sws_getContext" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_FFMPEG_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`$as_echo "ac_cv_lib_avcodec_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lavcodec" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lavcodec... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_getContext in -lavcodec" >&5 +$as_echo_n "checking for sws_getContext in -lavcodec... " >&6; } +if ${ac_cv_lib_avcodec_sws_getContext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36412,35 +34709,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char sws_getContext (); int main () { -return ${pbxfuncname} (); +return sws_getContext (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_avcodec_sws_getContext=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_avcodec_sws_getContext=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5 +$as_echo "$ac_cv_lib_avcodec_sws_getContext" >&6; } +if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes; then : AST_FFMPEG_FOUND=yes else AST_FFMPEG_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_FFMPEG_FOUND}" = "yes"; then @@ -36450,9 +34746,8 @@ fi FFMPEG_INCLUDE="-I${FFMPEG_DIR}/include" fi FFMPEG_INCLUDE="${FFMPEG_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xffmpeg/avcodec.h" = "x" ; then # no header, assume found - FFMPEG_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default" @@ -36464,14 +34759,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then FFMPEG_LIB="" FFMPEG_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - FFMPEG_LIB="" - fi + PBX_FFMPEG=1 cat >>confdefs.h <<_ACEOF #define HAVE_FFMPEG 1 @@ -36507,16 +34800,12 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then pbxlibdir="-L${X11_DIR}" fi fi - pbxfuncname="XOpenDisplay" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_X11_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 +$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } +if ${ac_cv_lib_X11_XOpenDisplay+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36530,35 +34819,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char XOpenDisplay (); int main () { -return ${pbxfuncname} (); +return XOpenDisplay (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_X11_XOpenDisplay=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_X11_XOpenDisplay=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then : AST_X11_FOUND=yes else AST_X11_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_X11_FOUND}" = "yes"; then @@ -36568,9 +34856,8 @@ fi X11_INCLUDE="-I${X11_DIR}/include" fi X11_INCLUDE="${X11_INCLUDE} " - if test "xX11/Xlib.h" = "x" ; then # no header, assume found - X11_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" @@ -36582,14 +34869,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" X11_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - X11_LIB="" - fi + PBX_X11=1 cat >>confdefs.h <<_ACEOF #define HAVE_X11 1 @@ -36615,16 +34900,12 @@ if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then pbxlibdir="-L${X11_DIR}" fi fi - pbxfuncname="XOpenDisplay" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_X11_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -I/usr/X11R6/include" - as_ac_Lib=`$as_echo "ac_cv_lib_X11_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lX11" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lX11... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 +$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } +if ${ac_cv_lib_X11_XOpenDisplay+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36638,35 +34919,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char XOpenDisplay (); int main () { -return ${pbxfuncname} (); +return XOpenDisplay (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_X11_XOpenDisplay=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_X11_XOpenDisplay=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then : AST_X11_FOUND=yes else AST_X11_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_X11_FOUND}" = "yes"; then @@ -36676,9 +34956,8 @@ fi X11_INCLUDE="-I${X11_DIR}/include" fi X11_INCLUDE="${X11_INCLUDE} -I/usr/X11R6/include" - if test "xX11/Xlib.h" = "x" ; then # no header, assume found - X11_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" @@ -36690,14 +34969,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${X11_HEADER_FOUND}" = "x0" ; then X11_LIB="" X11_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - X11_LIB="" - fi + PBX_X11=1 cat >>confdefs.h <<_ACEOF #define HAVE_X11 1 diff --git a/configure.ac b/configure.ac index 170694d0f..0a4fb4789 100644 --- a/configure.ac +++ b/configure.ac @@ -17,10 +17,9 @@ AC_CANONICAL_HOST # check existence of the package AC_CONFIG_SRCDIR([main/asterisk.c]) -AC_CONFIG_AUX_DIR(`pwd`) +AC_CONFIG_AUX_DIR() AC_COPYRIGHT("Asterisk") -AC_REVISION($Revision$) # preserve any CFLAGS or LDFLAGS that may be set # NOTE: This must be done before calling any macros that end up diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index 3ed88eb61..30c5dc798 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -287,11 +287,12 @@ int ast_cli_unregister_multiple(struct ast_cli_entry *e, int len); * Useful for readline, that's about it * \retval 0 on success * \retval -1 on failure + * + * Only call this function to proxy the CLI generator to + * another. */ char *ast_cli_generator(const char *, const char *, int); -int ast_cli_generatornummatches(const char *, const char *); - /*! * \brief Generates a NULL-terminated array of strings that * 1) begin with the string in the second parameter, and @@ -302,6 +303,9 @@ int ast_cli_generatornummatches(const char *, const char *); * Subsequent entries are all possible values, followed by a NULL. * All strings and the array itself are malloc'ed and must be freed * by the caller. + * + * \warning This function cannot be called recursively so it will always + * fail if called from a CLI_GENERATE callback. */ char **ast_cli_completion_matches(const char *, const char *); @@ -323,10 +327,30 @@ char **ast_cli_completion_matches(const char *, const char *); * by the caller. * * \note The vector is sorted and does not contain any duplicates. + * + * \warning This function cannot be called recursively so it will always + * fail if called from a CLI_GENERATE callback. */ struct ast_vector_string *ast_cli_completion_vector(const char *text, const char *word); /*! + * \brief Add a result to a request for completion options. + * + * \param value A completion option text. + * + * \retval 0 Success + * \retval -1 Failure + * + * This is an alternative to returning individual values from CLI_GENERATE. Instead + * of repeatedly being asked for the next match and having to start over, you can + * call this function repeatedly from your own stateful loop. When all matches have + * been added you can return NULL from the CLI_GENERATE function. + * + * \note This function always eventually results in calling ast_free on \a value. + */ +int ast_cli_completion_add(char *value); + +/*! * \brief Command completion for the list of active channels. * * This can be called from a CLI command completion function that wants to diff --git a/main/asterisk.c b/main/asterisk.c index 77046f272..dd66867b8 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3001,121 +3001,64 @@ static char *cli_prompt(EditLine *editline) return ast_str_buffer(prompt); } -static void destroy_match_list(char **match_list, int matches) +static struct ast_vector_string *ast_el_strtoarr(char *buf) { - if (match_list) { - int idx; + char *retstr; + struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec)); - for (idx = 0; idx < matches; ++idx) { - ast_free(match_list[idx]); - } - ast_free(match_list); + if (!vec) { + return NULL; } -} - -static char **ast_el_strtoarr(char *buf) -{ - char *retstr; - char **match_list = NULL; - char **new_list; - size_t match_list_len = 1; - int matches = 0; while ((retstr = strsep(&buf, " "))) { if (!strcmp(retstr, AST_CLI_COMPLETE_EOF)) { break; } - if (matches + 1 >= match_list_len) { - match_list_len <<= 1; - new_list = ast_realloc(match_list, match_list_len * sizeof(char *)); - if (!new_list) { - destroy_match_list(match_list, matches); - return NULL; - } - match_list = new_list; - } retstr = ast_strdup(retstr); - if (!retstr) { - destroy_match_list(match_list, matches); - return NULL; + if (!retstr || AST_VECTOR_APPEND(vec, retstr)) { + ast_free(retstr); + goto vector_cleanup; } - match_list[matches++] = retstr; } - if (!match_list) { - return NULL; - } - - if (matches >= match_list_len) { - new_list = ast_realloc(match_list, (match_list_len + 1) * sizeof(char *)); - if (!new_list) { - destroy_match_list(match_list, matches); - return NULL; - } - match_list = new_list; + if (!AST_VECTOR_SIZE(vec)) { + goto vector_cleanup; } - match_list[matches] = NULL; - - return match_list; -} + return vec; -static int ast_el_sort_compare(const void *i1, const void *i2) -{ - char *s1, *s2; +vector_cleanup: + AST_VECTOR_CALLBACK_VOID(vec, ast_free); + AST_VECTOR_PTR_FREE(vec); - s1 = ((char **)i1)[0]; - s2 = ((char **)i2)[0]; - - return strcasecmp(s1, s2); + return NULL; } -static int ast_cli_display_match_list(char **matches, int len, int max) +static void ast_cli_display_match_list(struct ast_vector_string *matches, int max) { - int i, idx, limit, count; - int screenwidth = 0; - int numoutput = 0, numoutputline = 0; - - screenwidth = ast_get_termcols(STDOUT_FILENO); - + int idx = 1; /* find out how many entries can be put on one line, with two spaces between strings */ - limit = screenwidth / (max + 2); - if (limit == 0) - limit = 1; - - /* how many lines of output */ - count = len / limit; - if (count * limit < len) - count++; + int limit = ast_get_termcols(STDOUT_FILENO) / (max + 2); - idx = 1; - - qsort(&matches[0], (size_t)(len), sizeof(char *), ast_el_sort_compare); - - for (; count > 0; count--) { - numoutputline = 0; - for (i = 0; i < limit && matches[idx]; i++, idx++) { + if (limit == 0) { + limit = 1; + } - /* Don't print dupes */ - if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) { - i--; - ast_free(matches[idx]); - matches[idx] = NULL; - continue; - } + for (;;) { + int numoutputline; - numoutput++; + for (numoutputline = 0; numoutputline < limit && idx < AST_VECTOR_SIZE(matches); idx++) { numoutputline++; - fprintf(stdout, "%-*s ", max, matches[idx]); - ast_free(matches[idx]); - matches[idx] = NULL; + fprintf(stdout, "%-*s ", max, AST_VECTOR_GET(matches, idx)); + } + + if (!numoutputline) { + break; } - if (numoutputline > 0) - fprintf(stdout, "\n"); - } - return numoutput; + fprintf(stdout, "\n"); + } } @@ -3123,10 +3066,9 @@ static char *cli_complete(EditLine *editline, int ch) { int len = 0; char *ptr; - int nummatches = 0; - char **matches; + struct ast_vector_string *matches; int retval = CC_ERROR; - char buf[2048], savechr; + char savechr; int res; LineInfo *lf = (LineInfo *)el_line(editline); @@ -3147,96 +3089,90 @@ static char *cli_complete(EditLine *editline, int ch) len = lf->cursor - ptr; if (ast_opt_remote) { - snprintf(buf, sizeof(buf), "_COMMAND NUMMATCHES \"%s\" \"%s\"", lf->buffer, ptr); - fdsend(ast_consock, buf); - if ((res = read(ast_consock, buf, sizeof(buf) - 1)) < 0) { - return (char*)(CC_ERROR); +#define CMD_MATCHESARRAY "_COMMAND MATCHESARRAY \"%s\" \"%s\"" + char *mbuf; + char *new_mbuf; + int mlen = 0, maxmbuf = 2048; + + /* Start with a 2048 byte buffer */ + mbuf = ast_malloc(maxmbuf); + + /* This will run snprintf twice at most. */ + while (mbuf && (mlen = snprintf(mbuf, maxmbuf, CMD_MATCHESARRAY, lf->buffer, ptr)) > maxmbuf) { + /* Return value does not include space for NULL terminator. */ + maxmbuf = mlen + 1; + ast_free(mbuf); + mbuf = ast_malloc(maxmbuf); } - buf[res] = '\0'; - nummatches = atoi(buf); - - if (nummatches > 0) { - char *mbuf; - char *new_mbuf; - int mlen = 0, maxmbuf = 2048; - - /* Start with a 2048 byte buffer */ - if (!(mbuf = ast_malloc(maxmbuf))) { - *((char *) lf->cursor) = savechr; - return (char *)(CC_ERROR); - } - snprintf(buf, sizeof(buf), "_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr); - fdsend(ast_consock, buf); - res = 0; - mbuf[0] = '\0'; - while (!strstr(mbuf, AST_CLI_COMPLETE_EOF) && res != -1) { - if (mlen + 1024 > maxmbuf) { - /* Every step increment buffer 1024 bytes */ - maxmbuf += 1024; - new_mbuf = ast_realloc(mbuf, maxmbuf); - if (!new_mbuf) { - ast_free(mbuf); - *((char *) lf->cursor) = savechr; - return (char *)(CC_ERROR); - } - mbuf = new_mbuf; + + if (!mbuf) { + *((char *) lf->cursor) = savechr; + + return (char *)(CC_ERROR); + } + + fdsend(ast_consock, mbuf); + res = 0; + mlen = 0; + mbuf[0] = '\0'; + + while (!strstr(mbuf, AST_CLI_COMPLETE_EOF) && res != -1) { + if (mlen + 1024 > maxmbuf) { + /* Expand buffer to the next 1024 byte increment. */ + maxmbuf = mlen + 1024; + new_mbuf = ast_realloc(mbuf, maxmbuf); + if (!new_mbuf) { + ast_free(mbuf); + *((char *) lf->cursor) = savechr; + + return (char *)(CC_ERROR); } - /* Only read 1024 bytes at a time */ - res = read(ast_consock, mbuf + mlen, 1024); - if (res > 0) - mlen += res; + mbuf = new_mbuf; } - mbuf[mlen] = '\0'; + /* Only read 1024 bytes at a time */ + res = read(ast_consock, mbuf + mlen, 1024); + if (res > 0) { + mlen += res; + } + } + mbuf[mlen] = '\0'; - matches = ast_el_strtoarr(mbuf); - ast_free(mbuf); - } else - matches = (char **) NULL; + matches = ast_el_strtoarr(mbuf); + ast_free(mbuf); } else { - char **p, *oldbuf=NULL; - nummatches = 0; - matches = ast_cli_completion_matches((char *)lf->buffer,ptr); - for (p = matches; p && *p; p++) { - if (!oldbuf || strcmp(*p,oldbuf)) - nummatches++; - oldbuf = *p; - } + matches = ast_cli_completion_vector((char *)lf->buffer, ptr); } if (matches) { int i; - int matches_num, maxlen, match_len; + int maxlen, match_len; + const char *best_match = AST_VECTOR_GET(matches, 0); - if (matches[0][0] != '\0') { + if (!ast_strlen_zero(best_match)) { el_deletestr(editline, (int) len); - el_insertstr(editline, matches[0]); + el_insertstr(editline, best_match); retval = CC_REFRESH; } - if (nummatches == 1) { + if (AST_VECTOR_SIZE(matches) == 2) { /* Found an exact match */ el_insertstr(editline, " "); retval = CC_REFRESH; } else { /* Must be more than one match */ - for (i = 1, maxlen = 0; matches[i]; i++) { - match_len = strlen(matches[i]); - if (match_len > maxlen) + for (i = 1, maxlen = 0; i < AST_VECTOR_SIZE(matches); i++) { + match_len = strlen(AST_VECTOR_GET(matches, i)); + if (match_len > maxlen) { maxlen = match_len; + } } - matches_num = i - 1; - if (matches_num >1) { - fprintf(stdout, "\n"); - ast_cli_display_match_list(matches, nummatches, maxlen); - retval = CC_REDISPLAY; - } else { - el_insertstr(editline," "); - retval = CC_REFRESH; - } + + fprintf(stdout, "\n"); + ast_cli_display_match_list(matches, maxlen); + retval = CC_REDISPLAY; } - for (i = 0; matches[i]; i++) - ast_free(matches[i]); - ast_free(matches); + AST_VECTOR_CALLBACK_VOID(matches, ast_free); + AST_VECTOR_PTR_FREE(matches); } *((char *) lf->cursor) = savechr; diff --git a/main/cli.c b/main/cli.c index eae14adc4..75846b8c9 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1336,33 +1336,6 @@ static char *handle_commandmatchesarray(struct ast_cli_entry *e, int cmd, struct } - -static char *handle_commandnummatches(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) -{ - int matches = 0; - - switch (cmd) { - case CLI_INIT: - e->command = "_command nummatches"; - e->usage = - "Usage: _command nummatches \"<line>\" text \n" - " This function is used internally to help with command completion and should.\n" - " never be called by the user directly.\n"; - return NULL; - case CLI_GENERATE: - return NULL; - } - - if (a->argc != 4) - return CLI_SHOWUSAGE; - - matches = ast_cli_generatornummatches(a->argv[2], a->argv[3]); - - ast_cli(a->fd, "%d", matches); - - return CLI_SUCCESS; -} - struct channel_set_debug_args { int fd; int is_off; @@ -1794,7 +1767,6 @@ static char *handle_cli_wait_fullybooted(struct ast_cli_entry *e, int cmd, struc static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); static struct ast_cli_entry cli_cli[] = { - AST_CLI_DEFINE(handle_commandnummatches, "Returns number of command matches"), AST_CLI_DEFINE(handle_commandmatchesarray, "Returns command matches array"), AST_CLI_DEFINE(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"), @@ -2472,24 +2444,6 @@ static char *parse_args(const char *s, int *argc, const char *argv[], int max, i return duplicate; } -/*! \brief Return the number of unique matches for the generator */ -int ast_cli_generatornummatches(const char *text, const char *word) -{ - int matches = 0, i = 0; - char *buf = NULL, *oldbuf = NULL; - - while ((buf = ast_cli_generator(text, word, i++))) { - if (!oldbuf || strcmp(buf,oldbuf)) - matches++; - if (oldbuf) - ast_free(oldbuf); - oldbuf = buf; - } - if (oldbuf) - ast_free(oldbuf); - return matches; -} - char **ast_cli_completion_matches(const char *text, const char *word) { struct ast_vector_string *vec = ast_cli_completion_vector(text, word); @@ -2513,6 +2467,44 @@ char **ast_cli_completion_matches(const char *text, const char *word) return match_list; } +AST_THREADSTORAGE_RAW(completion_storage); + +/*! + * \internal + * \brief Add a value to the vector. + * + * \param vec Vector to add \a value to. Must be from threadstorage. + * \param value The value to add. + * + * \retval 0 Success + * \retval -1 Failure + */ +static int cli_completion_vector_add(struct ast_vector_string *vec, char *value) +{ + if (!value) { + return 0; + } + + if (!vec || AST_VECTOR_ADD_SORTED(vec, value, strcasecmp)) { + if (vec) { + ast_threadstorage_set_ptr(&completion_storage, NULL); + + AST_VECTOR_CALLBACK_VOID(vec, ast_free); + AST_VECTOR_FREE(vec); + } + ast_free(value); + + return -1; + } + + return 0; +} + +int ast_cli_completion_add(char *value) +{ + return cli_completion_vector_add(ast_threadstorage_get_ptr(&completion_storage), value); +} + struct ast_vector_string *ast_cli_completion_vector(const char *text, const char *word) { char *retstr, *prevstr; @@ -2520,13 +2512,23 @@ struct ast_vector_string *ast_cli_completion_vector(const char *text, const char size_t which = 0; struct ast_vector_string *vec = ast_calloc(1, sizeof(*vec)); + /* Recursion into this function is a coding error. */ + ast_assert(!ast_threadstorage_get_ptr(&completion_storage)); + if (!vec) { return NULL; } + if (ast_threadstorage_set_ptr(&completion_storage, vec)) { + ast_log(LOG_ERROR, "Failed to initialize threadstorage for completion.\n"); + ast_free(vec); + + return NULL; + } + while ((retstr = ast_cli_generator(text, word, which)) != NULL) { - if (AST_VECTOR_ADD_SORTED(vec, retstr, strcasecmp)) { - ast_free(retstr); + if (cli_completion_vector_add(vec, retstr)) { + ast_threadstorage_set_ptr(&completion_storage, NULL); goto vector_cleanup; } @@ -2534,6 +2536,8 @@ struct ast_vector_string *ast_cli_completion_vector(const char *text, const char ++which; } + ast_threadstorage_set_ptr(&completion_storage, NULL); + if (!AST_VECTOR_SIZE(vec)) { AST_VECTOR_PTR_FREE(vec); @@ -2572,6 +2576,7 @@ struct ast_vector_string *ast_cli_completion_vector(const char *text, const char retstr = ast_strndup(AST_VECTOR_GET(vec, 0), max_equal); if (!retstr || AST_VECTOR_INSERT_AT(vec, 0, retstr)) { ast_free(retstr); + goto vector_cleanup; } diff --git a/main/translate.c b/main/translate.c index 92c0cb9ea..70e97f955 100644 --- a/main/translate.c +++ b/main/translate.c @@ -946,7 +946,8 @@ static void handle_cli_recalc(struct ast_cli_args *a) static char *handle_show_translation_table(struct ast_cli_args *a) { int x, y, i, k; - int longest = 0, num_codecs = 0, curlen = 0; + int longest = 7; /* slin192 */ + int num_codecs = 0, curlen = 0; struct ast_str *out = ast_str_create(1024); struct ast_codec *codec; @@ -983,6 +984,7 @@ static char *handle_show_translation_table(struct ast_cli_args *a) ast_str_set(&out, 0, " "); for (k = 0; k < num_codecs; k++) { + int adjust = 0; struct ast_codec *col = k ? ast_codec_get_by_id(k) : NULL; y = -1; @@ -998,6 +1000,12 @@ static char *handle_show_translation_table(struct ast_cli_args *a) if (k > 0) { curlen = strlen(col->name); + if (!strcmp(col->name, "slin") || + !strcmp(col->name, "speex") || + !strcmp(col->name, "silk")) { + adjust = log10(col->sample_rate / 1000) + 1; + curlen = curlen + adjust; + } } if (curlen < 5) { @@ -1009,10 +1017,25 @@ static char *handle_show_translation_table(struct ast_cli_args *a) ast_str_append(&out, 0, "%*u", curlen + 1, (matrix_get(x, y)->table_cost/100)); } else if (i == 0 && k > 0) { /* Top row - use a dynamic size */ - ast_str_append(&out, 0, "%*s", curlen + 1, col->name); + if (!strcmp(col->name, "slin") || + !strcmp(col->name, "speex") || + !strcmp(col->name, "silk")) { + ast_str_append(&out, 0, "%*s%u", curlen - adjust + 1, + col->name, col->sample_rate / 1000); + } else { + ast_str_append(&out, 0, "%*s", curlen + 1, col->name); + } } else if (k == 0 && i > 0) { /* Left column - use a static size. */ - ast_str_append(&out, 0, "%*s", longest, row->name); + if (!strcmp(row->name, "slin") || + !strcmp(row->name, "speex") || + !strcmp(row->name, "silk")) { + int adjust_row = log10(row->sample_rate / 1000) + 1; + ast_str_append(&out, 0, "%*s%u", longest - adjust_row, + row->name, row->sample_rate / 1000); + } else { + ast_str_append(&out, 0, "%*s", longest, row->name); + } } else if (x >= 0 && y >= 0) { /* Codec not supported */ ast_str_append(&out, 0, "%*s", curlen + 1, "-"); diff --git a/menuselect/configure b/menuselect/configure index 13a330b07..6e5331edd 100755 --- a/menuselect/configure +++ b/menuselect/configure @@ -3941,16 +3941,12 @@ if test "x${PBX_NEWT}" != "x1" -a "${USE_NEWT}" != "no"; then pbxlibdir="-L${NEWT_DIR}" fi fi - pbxfuncname="newtBell" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NEWT_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5 +$as_echo_n "checking for newtBell in -lnewt... " >&6; } +if ${ac_cv_lib_newt_newtBell+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3964,35 +3960,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char newtBell (); int main () { -return ${pbxfuncname} (); +return newtBell (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_newt_newtBell=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_newt_newtBell=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5 +$as_echo "$ac_cv_lib_newt_newtBell" >&6; } +if test "x$ac_cv_lib_newt_newtBell" = xyes; then : AST_NEWT_FOUND=yes else AST_NEWT_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_NEWT_FOUND}" = "yes"; then @@ -4002,9 +3997,8 @@ fi NEWT_INCLUDE="-I${NEWT_DIR}/include" fi NEWT_INCLUDE="${NEWT_INCLUDE} " - if test "xnewt.h" = "x" ; then # no header, assume found - NEWT_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default" @@ -4016,14 +4010,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${NEWT_HEADER_FOUND}" = "x0" ; then NEWT_LIB="" NEWT_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NEWT_LIB="" - fi + PBX_NEWT=1 cat >>confdefs.h <<_ACEOF #define HAVE_NEWT 1 @@ -4045,16 +4037,12 @@ if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then pbxlibdir="-L${CURSES_DIR}" fi fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_CURSES_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lcurses" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lcurses... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 +$as_echo_n "checking for initscr in -lcurses... " >&6; } +if ${ac_cv_lib_curses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4068,35 +4056,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char initscr (); int main () { -return ${pbxfuncname} (); +return initscr (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_curses_initscr=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_curses_initscr=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 +$as_echo "$ac_cv_lib_curses_initscr" >&6; } +if test "x$ac_cv_lib_curses_initscr" = xyes; then : AST_CURSES_FOUND=yes else AST_CURSES_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_CURSES_FOUND}" = "yes"; then @@ -4106,9 +4093,8 @@ fi CURSES_INCLUDE="-I${CURSES_DIR}/include" fi CURSES_INCLUDE="${CURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - CURSES_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" @@ -4120,14 +4106,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${CURSES_HEADER_FOUND}" = "x0" ; then CURSES_LIB="" CURSES_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - CURSES_LIB="" - fi + PBX_CURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_CURSES 1 @@ -4149,16 +4133,12 @@ if test "x${PBX_NCURSES}" != "x1" -a "${USE_NCURSES}" != "no"; then pbxlibdir="-L${NCURSES_DIR}" fi fi - pbxfuncname="initscr" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_NCURSES_FOUND=yes - else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_ncurses_${pbxfuncname}" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lncurses" >&5 -$as_echo_n "checking for ${pbxfuncname} in -lncurses... " >&6; } -if eval \${$as_ac_Lib+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 +$as_echo_n "checking for initscr in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4172,35 +4152,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ${pbxfuncname} (); +char initscr (); int main () { -return ${pbxfuncname} (); +return initscr (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" + ac_cv_lib_ncurses_initscr=yes else - eval "$as_ac_Lib=no" + ac_cv_lib_ncurses_initscr=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 : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 +$as_echo "$ac_cv_lib_ncurses_initscr" >&6; } +if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : AST_NCURSES_FOUND=yes else AST_NCURSES_FOUND=no fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi + # now check for the header. if test "${AST_NCURSES_FOUND}" = "yes"; then @@ -4210,9 +4189,8 @@ fi NCURSES_INCLUDE="-I${NCURSES_DIR}/include" fi NCURSES_INCLUDE="${NCURSES_INCLUDE} " - if test "xcurses.h" = "x" ; then # no header, assume found - NCURSES_HEADER_FOUND="1" - else # check for the header + + # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}" ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" @@ -4224,14 +4202,12 @@ fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi + if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then NCURSES_LIB="" NCURSES_INCLUDE="" else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - NCURSES_LIB="" - fi + PBX_NCURSES=1 cat >>confdefs.h <<_ACEOF #define HAVE_NCURSES 1 @@ -4415,16 +4391,13 @@ else fi if test ! "x${CONFIG_LIBXML2}" = xNo; then - if test x"" = x ; then A=--cflags ; else A="" ; fi - LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} $A) + LIBXML2_INCLUDE=$(${CONFIG_LIBXML2} --cflags) LIBXML2_INCLUDE=$(echo ${LIBXML2_INCLUDE} | $SED -e "s|-I|-I${LIBXML2_DIR}|g") - if test x"" = x ; then A=--libs ; else A="" ; fi - LIBXML2_LIB=$(${CONFIG_LIBXML2} $A) + LIBXML2_LIB=$(${CONFIG_LIBXML2} --libs) LIBXML2_LIB=$(echo ${LIBXML2_LIB} | $SED -e "s|-L|-L${LIBXML2_DIR}|g") - if test x"#include <libxml/tree.h> - #include <libxml/parser.h>" != x ; then + saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LIBXML2_INCLUDE}" @@ -4452,12 +4425,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else - PBX_LIBXML2=1 - -$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h - fi fi fi diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index cd289aa12..a320c2987 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -968,13 +968,12 @@ void ast_ari_bridges_create_with_id(struct ast_variable *headers, if (bridge) { /* update */ - if (!ast_strlen_zero(args->name)) { - if (!strcmp(args->name, bridge->name)) { - ast_ari_response_error( - response, 500, "Internal Error", - "Changing bridge name is not implemented"); - return; - } + if (!ast_strlen_zero(args->name) + && strcmp(args->name, bridge->name)) { + ast_ari_response_error( + response, 500, "Internal Error", + "Changing bridge name is not implemented"); + return; } if (!ast_strlen_zero(args->type)) { ast_ari_response_error( diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 839753e41..273061124 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -113,6 +113,20 @@ #define ZFONE_PROFILE_ID 0x505a #define DEFAULT_LEARNING_MIN_SEQUENTIAL 4 +/*! + * \brief Calculate the min learning duration in ms. + * + * \details + * The min supported packet size represents 10 ms and we need to account + * for some jitter and fast clocks while learning. Some messed up devices + * have very bad jitter for a small packet sample size. Jitter can also + * be introduced by the network itself. + * + * So we'll allow packets to come in every 9ms on average for fast clocking + * with the last one coming in 5ms early for jitter. + */ +#define CALC_LEARNING_MIN_DURATION(count) (((count) - 1) * 9 - 5) +#define DEFAULT_LEARNING_MIN_DURATION CALC_LEARNING_MIN_DURATION(DEFAULT_LEARNING_MIN_SEQUENTIAL) #define SRTP_MASTER_KEY_LEN 16 #define SRTP_MASTER_SALT_LEN 14 @@ -151,6 +165,7 @@ static int nochecksums; #endif static int strictrtp = DEFAULT_STRICT_RTP; /*!< Only accept RTP frames from a defined source. If we receive an indication of a changing source, enter learning mode. */ static int learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; /*!< Number of sequential RTP frames needed from a single source during learning mode to accept new source. */ +static int learning_min_duration = DEFAULT_LEARNING_MIN_DURATION; /*!< Lowest acceptable timeout between the first and the last sequential RTP frame. */ #ifdef HAVE_PJPROJECT static int icesupport = DEFAULT_ICESUPPORT; static struct sockaddr_in stunaddr; @@ -231,7 +246,7 @@ static AST_RWLIST_HEAD_STATIC(host_candidates, ast_ice_host_candidate); struct rtp_learning_info { struct ast_sockaddr proposed_address; /*!< Proposed remote address for strict RTP */ struct timeval start; /*!< The time learning mode was started */ - struct timeval received; /*!< The time of the last received packet */ + struct timeval received; /*!< The time of the first received packet */ int max_seq; /*!< The highest sequence number received */ int packets; /*!< The number of remaining packets before the source is accepted */ }; @@ -3065,25 +3080,28 @@ static void rtp_learning_seq_init(struct rtp_learning_info *info, uint16_t seq) */ static int rtp_learning_rtp_seq_update(struct rtp_learning_info *info, uint16_t seq) { - /* - * During the learning mode the minimum amount of media we'll accept is - * 10ms so give a reasonable 5ms buffer just in case we get it sporadically. - */ - if (!ast_tvzero(info->received) && ast_tvdiff_ms(ast_tvnow(), info->received) < 5) { - /* - * Reject a flood of packets as acceptable for learning. - * Reset the needed packets. - */ - info->packets = learning_min_sequential - 1; - } else if (seq == (uint16_t) (info->max_seq + 1)) { + if (seq == (uint16_t) (info->max_seq + 1)) { /* packet is in sequence */ info->packets--; } else { /* Sequence discontinuity; reset */ info->packets = learning_min_sequential - 1; + info->received = ast_tvnow(); + } + + /* + * Protect against packet floods by checking that we + * received the packet sequence in at least the minimum + * allowed time. + */ + if (ast_tvzero(info->received)) { + info->received = ast_tvnow(); + } else if (!info->packets && (ast_tvdiff_ms(ast_tvnow(), info->received) < learning_min_duration )) { + /* Packet flood; reset */ + info->packets = learning_min_sequential - 1; + info->received = ast_tvnow(); } info->max_seq = seq; - info->received = ast_tvnow(); return info->packets; } @@ -7153,6 +7171,7 @@ static int rtp_reload(int reload) dtmftimeout = DEFAULT_DTMF_TIMEOUT; strictrtp = DEFAULT_STRICT_RTP; learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; + learning_min_duration = DEFAULT_LEARNING_MIN_DURATION; /** This resource is not "reloaded" so much as unloaded and loaded again. * In the case of the TURN related variables, the memory referenced by a @@ -7217,10 +7236,12 @@ static int rtp_reload(int reload) strictrtp = ast_true(s); } if ((s = ast_variable_retrieve(cfg, "general", "probation"))) { - if ((sscanf(s, "%d", &learning_min_sequential) <= 0) || learning_min_sequential <= 0) { + if ((sscanf(s, "%d", &learning_min_sequential) != 1) || learning_min_sequential <= 1) { ast_log(LOG_WARNING, "Value for 'probation' could not be read, using default of '%d' instead\n", DEFAULT_LEARNING_MIN_SEQUENTIAL); + learning_min_sequential = DEFAULT_LEARNING_MIN_SEQUENTIAL; } + learning_min_duration = CALC_LEARNING_MIN_DURATION(learning_min_sequential); } #ifdef HAVE_PJPROJECT if ((s = ast_variable_retrieve(cfg, "general", "icesupport"))) { diff --git a/tests/test_substitution.c b/tests/test_substitution.c index 3a1dc1fba..8b9a164aa 100644 --- a/tests/test_substitution.c +++ b/tests/test_substitution.c @@ -43,6 +43,7 @@ #include "asterisk/stringfields.h" #include "asterisk/threadstorage.h" #include "asterisk/test.h" +#include "asterisk/vector.h" static enum ast_test_result_state test_chan_integer(struct ast_test *test, struct ast_channel *c, int *ifield, const char *expression) @@ -225,6 +226,7 @@ AST_TEST_DEFINE(test_substitution) struct ast_channel *c; int i; enum ast_test_result_state res = AST_TEST_PASS; + struct ast_vector_string *funcs; switch (cmd) { case TEST_INIT: @@ -302,11 +304,12 @@ AST_TEST_DEFINE(test_substitution) #undef TEST /* For testing dialplan functions */ - for (i = 0; ; i++) { - char *cmd = ast_cli_generator("core show function", "", i); - if (cmd == NULL) { - break; - } + funcs = ast_cli_completion_vector("core show function", ""); + + /* Skip "best match" element 0 */ + for (i = 1; funcs && i < AST_VECTOR_SIZE(funcs); i++) { + char *cmd = AST_VECTOR_GET(funcs, i); + if (strcmp(cmd, "CHANNEL") && strcmp(cmd, "CALLERID") && strncmp(cmd, "CURL", 4) && strncmp(cmd, "AES", 3) && strncmp(cmd, "BASE64", 6) && strcmp(cmd, "CDR") && strcmp(cmd, "ENV") && strcmp(cmd, "GLOBAL") && @@ -321,10 +324,14 @@ AST_TEST_DEFINE(test_substitution) } } } - ast_free(cmd); } + if (funcs) { + AST_VECTOR_CALLBACK_VOID(funcs, ast_free); + AST_VECTOR_PTR_FREE(funcs); + } ast_hangup(c); + return res; } diff --git a/third-party/pjproject/patches/0040-183_without_to_tag.patch b/third-party/pjproject/patches/0040-183_without_to_tag.patch new file mode 100644 index 000000000..e8692fe1b --- /dev/null +++ b/third-party/pjproject/patches/0040-183_without_to_tag.patch @@ -0,0 +1,17 @@ +diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c +index c9686a0..fc52a63 100644 +--- a/pjsip/src/pjsip-ua/sip_inv.c ++++ b/pjsip/src/pjsip-ua/sip_inv.c +@@ -4156,9 +4156,10 @@ static void inv_on_state_calling( pjsip_inv_session *inv, pjsip_event *e) + status = pjsip_inv_send_msg(inv, cancel); + } + +- if (dlg->remote.info->tag.slen) { ++ if (tsx->status_code != 100) { + +- inv_set_state(inv, PJSIP_INV_STATE_EARLY, e); ++ if (dlg->remote.info->tag.slen) ++ inv_set_state(inv, PJSIP_INV_STATE_EARLY, e); + + inv_check_sdp_in_incoming_msg(inv, tsx, + e->body.tsx_state.src.rdata); |