diff --git a/configure b/configure index 6ac918262d..e23f1528a1 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for asterisk 18. +# Generated by GNU Autoconf 2.72 for asterisk 18. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -19,7 +19,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -28,12 +27,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -105,7 +105,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -135,15 +135,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -151,12 +150,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -174,8 +174,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -189,14 +190,15 @@ test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -229,12 +231,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -256,7 +259,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -276,7 +279,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -315,14 +319,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -391,11 +387,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -409,21 +406,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -497,6 +487,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -545,7 +537,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -557,9 +548,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -584,10 +575,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1703,7 +1700,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1916,7 +1913,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1932,7 +1929,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1962,8 +1959,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1971,7 +1968,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -2021,7 +2018,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -2089,7 +2086,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -2117,7 +2114,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures asterisk 18 to adapt to many kinds of systems. +'configure' configures asterisk 18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2131,11 +2128,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -2143,10 +2140,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -2203,6 +2200,7 @@ Optional Features: --enable-internal-poll Use Asterisk's poll implementation --disable-asteriskssl Disable Asterisk's SSL wrapper library --disable-rpath Disables rpath linker option checking + --enable-year2038 support timestamps after 2038 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2373,7 +2371,7 @@ Some influential environment variables: SYSTEMD_LIBS linker flags for SYSTEMD, overriding pkg-config -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . @@ -2441,9 +2439,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF asterisk configure 18 -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -2484,11 +2482,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -2507,8 +2506,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -2516,10 +2515,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2556,11 +2557,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -2594,11 +2596,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -2632,11 +2635,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -2674,11 +2678,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -2701,15 +2706,15 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. For example, HP-UX 11i declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include #undef $2 @@ -2720,7 +2725,7 @@ else $as_nop #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -2739,11 +2744,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2764,8 +2771,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 @@ -2795,12 +2802,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - eval "$3=yes" +else case e in #( + e) eval "$3=yes" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2839,12 +2848,13 @@ printf "%s\n" "$ac_try_echo"; } >&5 test $ac_status = 0; }; } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status + ac_retval=$ac_status ;; +esac fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -2864,8 +2874,8 @@ printf %s "checking for $2.$3... " >&6; } if eval test \${$4+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2881,8 +2891,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int @@ -2898,12 +2908,15 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$4=yes" -else $as_nop - eval "$4=no" +else case e in #( + e) eval "$4=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$4 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2925,8 +2938,8 @@ printf %s "checking whether $as_decl_name is declared... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +else case e in #( + e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` eval ac_save_FLAGS=\$$6 as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2950,12 +2963,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval $6=\$ac_save_FLAGS - + ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -3009,18 +3024,19 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid; break -else $as_nop - as_fn_arith $ac_mid + 1 && ac_lo=$as_val +else case e in #( + e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int @@ -3055,20 +3071,23 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_lo=$ac_mid; break -else $as_nop - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val +else case e in #( + e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= break fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else $as_nop - ac_lo= ac_hi= +else case e in #( + e) ac_lo= ac_hi= ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. @@ -3091,8 +3110,9 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_hi=$ac_mid -else $as_nop - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +else case e in #( + e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done @@ -3140,8 +3160,9 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : echo >>conftest.val; read $3 &5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -3224,7 +3246,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by asterisk $as_me 18, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -3470,10 +3492,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -3509,9 +3531,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -3525,6 +3545,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -3552,16 +3587,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -3611,7 +3649,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -3677,6 +3714,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -3698,7 +3737,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -4114,8 +4153,9 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac fi @@ -4143,12 +4183,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -4157,18 +4197,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -4184,11 +4224,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -4216,15 +4256,16 @@ printf %s "checking build system type... " >&6; } if test ${ac_cv_build+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_build_alias=$build_alias +else case e in #( + e) ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 printf "%s\n" "$ac_cv_build" >&6; } @@ -4251,14 +4292,15 @@ printf %s "checking host system type... " >&6; } if test ${ac_cv_host+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "x$host_alias" = x; then +else case e in #( + e) if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 printf "%s\n" "$ac_cv_host" >&6; } @@ -4328,8 +4370,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4351,7 +4393,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -4377,8 +4420,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4400,7 +4443,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -4429,10 +4473,10 @@ esac fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4504,8 +4548,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -4525,7 +4569,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -4536,8 +4580,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -4546,13 +4591,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -4576,10 +4622,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -4589,11 +4635,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -4609,6 +4656,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -4648,26 +4697,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4699,16 +4749,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -4719,8 +4771,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4737,12 +4789,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -4760,8 +4814,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -4779,8 +4833,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4795,8 +4849,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4813,12 +4867,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -4845,8 +4902,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4863,25 +4920,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -4891,8 +4951,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4909,25 +4969,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -4937,8 +5000,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4955,25 +5018,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -5025,8 +5091,8 @@ printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } if test ${ac_cv_safe_to_define___extensions__+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -5042,10 +5108,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_safe_to_define___extensions__=yes -else $as_nop - ac_cv_safe_to_define___extensions__=no +else case e in #( + e) ac_cv_safe_to_define___extensions__=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } @@ -5055,8 +5123,8 @@ printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } if test ${ac_cv_should_define__xopen_source+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_should_define__xopen_source=no +else case e in #( + e) ac_cv_should_define__xopen_source=no if test $ac_cv_header_wchar_h = yes then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5075,8 +5143,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _XOPEN_SOURCE 500 @@ -5094,10 +5162,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_should_define__xopen_source=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } @@ -5122,6 +5192,8 @@ printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h @@ -5141,8 +5213,9 @@ then : printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h -else $as_nop - MINIX= +else case e in #( + e) MINIX= ;; +esac fi if test $ac_cv_safe_to_define___extensions__ = yes then : @@ -5337,13 +5410,14 @@ then : printf "%s\n" "no" >&6; } CONFIG_SIGNED_CHAR="" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } CONFIG_SIGNED_CHAR="-fsigned-char" - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -5357,8 +5431,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_UNAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $UNAME in +else case e in #( + e) case $UNAME in [\\/]* | ?:[\\/]*) ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path. ;; @@ -5383,6 +5457,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi UNAME=$ac_cv_path_UNAME @@ -5405,8 +5480,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_UNAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_UNAME in +else case e in #( + e) case $ac_pt_UNAME in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_UNAME="$ac_pt_UNAME" # Let the user override the test with a path. ;; @@ -5431,6 +5506,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_UNAME=$ac_cv_path_ac_pt_UNAME @@ -5477,8 +5553,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5500,7 +5576,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5522,8 +5599,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5545,7 +5622,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5579,8 +5657,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CXX"; then +else case e in #( + e) if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5602,7 +5680,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -5624,8 +5703,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CXX"; then +else case e in #( + e) if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5647,7 +5726,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -5681,8 +5761,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_LD+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$LD"; then +else case e in #( + e) if test -n "$LD"; then ac_cv_prog_LD="$LD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5704,7 +5784,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi LD=$ac_cv_prog_LD if test -n "$LD"; then @@ -5726,8 +5807,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_LD+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_LD"; then +else case e in #( + e) if test -n "$ac_ct_LD"; then ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5749,7 +5830,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then @@ -5783,8 +5865,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$RANLIB"; then +else case e in #( + e) if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5806,7 +5888,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -5828,8 +5911,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_RANLIB"; then +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5851,7 +5934,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -5907,8 +5991,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CXX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CXX"; then +else case e in #( + e) if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5930,7 +6014,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -5956,8 +6041,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CXX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CXX"; then +else case e in #( + e) if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5979,7 +6064,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -6039,8 +6125,8 @@ printf %s "checking whether the compiler supports GNU C++... " >&6; } if test ${ac_cv_cxx_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6057,12 +6143,14 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } @@ -6080,8 +6168,8 @@ printf %s "checking whether $CXX accepts -g... " >&6; } if test ${ac_cv_prog_cxx_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_cxx_werror_flag=$ac_cxx_werror_flag +else case e in #( + e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" @@ -6099,8 +6187,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes -else $as_nop - CXXFLAGS="" +else case e in #( + e) CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6115,8 +6203,8 @@ _ACEOF if ac_fn_cxx_try_compile "$LINENO" then : -else $as_nop - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else case e in #( + e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6133,12 +6221,15 @@ if ac_fn_cxx_try_compile "$LINENO" then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag + ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } @@ -6165,8 +6256,8 @@ printf %s "checking for $CXX option to enable C++11 features... " >&6; } if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx11=no +else case e in #( + e) ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6183,25 +6274,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cxx_cxx11" != "xno" && break done rm -f conftest.$ac_ext -CXX=$ac_save_CXX +CXX=$ac_save_CXX ;; +esac fi if test "x$ac_cv_prog_cxx_cxx11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" + CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; +esac fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 + ac_prog_cxx_stdcxx=cxx11 ;; +esac fi fi if test x$ac_prog_cxx_stdcxx = xno @@ -6211,8 +6305,8 @@ printf %s "checking for $CXX option to enable C++98 features... " >&6; } if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx98=no +else case e in #( + e) ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6229,25 +6323,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cxx_cxx98" != "xno" && break done rm -f conftest.$ac_ext -CXX=$ac_save_CXX +CXX=$ac_save_CXX ;; +esac fi if test "x$ac_cv_prog_cxx_cxx98" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x +else case e in #( + e) if test "x$ac_cv_prog_cxx_cxx98" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" + CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; +esac fi ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 + ac_prog_cxx_stdcxx=cxx98 ;; +esac fi fi @@ -6272,8 +6369,8 @@ if test -z "$CPP"; then if test ${ac_cv_prog_CPP+y} then : printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CC needs to be expanded +else case e in #( + e) # Double quotes because $CC needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false @@ -6291,9 +6388,10 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -6307,15 +6405,16 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : @@ -6324,7 +6423,8 @@ fi done ac_cv_prog_CPP=$CPP - + ;; +esac fi CPP=$ac_cv_prog_CPP else @@ -6347,9 +6447,10 @@ _ACEOF if ac_fn_c_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -6363,24 +6464,26 @@ if ac_fn_c_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi ac_ext=c @@ -6400,8 +6503,8 @@ if test -z "$CXXCPP"; then if test ${ac_cv_prog_CXXCPP+y} then : printf %s "(cached) " >&6 -else $as_nop - # Double quotes because $CXX needs to be expanded +else case e in #( + e) # Double quotes because $CXX needs to be expanded for CXXCPP in "$CXX -E" cpp /lib/cpp do ac_preproc_ok=false @@ -6419,9 +6522,10 @@ _ACEOF if ac_fn_cxx_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -6435,15 +6539,16 @@ if ac_fn_cxx_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : @@ -6452,7 +6557,8 @@ fi done ac_cv_prog_CXXCPP=$CXXCPP - + ;; +esac fi CXXCPP=$ac_cv_prog_CXXCPP else @@ -6475,9 +6581,10 @@ _ACEOF if ac_fn_cxx_try_cpp "$LINENO" then : -else $as_nop - # Broken: fails on valid input. -continue +else case e in #( + e) # Broken: fails on valid input. +continue ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext @@ -6491,24 +6598,26 @@ if ac_fn_cxx_try_cpp "$LINENO" then : # Broken: success on invalid input. continue -else $as_nop - # Passes both tests. +else case e in #( + e) # Passes both tests. ac_preproc_ok=: -break +break ;; +esac fi rm -f conftest.err conftest.i conftest.$ac_ext done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok then : -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi ac_ext=c @@ -6524,8 +6633,8 @@ printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done @@ -6550,9 +6659,10 @@ do as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in +case `"$ac_path_SED" --version 2>&1` in #( *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -6587,7 +6697,8 @@ IFS=$as_save_IFS else ac_cv_path_SED=$SED fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 printf "%s\n" "$ac_cv_path_SED" >&6; } @@ -6599,11 +6710,12 @@ printf %s "checking for egrep... " >&6; } if test ${ac_cv_prog_egrep+y} then : printf %s "(cached) " >&6 -else $as_nop - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +else case e in #( + e) if echo a | (grep -E '(a|b)') >/dev/null 2>&1 then ac_cv_prog_egrep='grep -E' else ac_cv_prog_egrep='egrep' - fi + fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_egrep" >&5 printf "%s\n" "$ac_cv_prog_egrep" >&6; } @@ -6615,8 +6727,9 @@ printf "%s\n" "$ac_cv_prog_egrep" >&6; } if test ${with_gnu_ld+y} then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop - with_gnu_ld=no +else case e in #( + e) with_gnu_ld=no ;; +esac fi ac_prog=ld @@ -6661,8 +6774,8 @@ fi if test ${lt_cv_path_LD+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -z "$LD"; then +else case e in #( + e) if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do IFS="$lt_save_ifs" @@ -6685,7 +6798,8 @@ else $as_nop IFS="$lt_save_ifs" else lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi +fi ;; +esac fi LD="$lt_cv_path_LD" @@ -6702,8 +6816,8 @@ printf %s "checking if the linker ($LD) is GNU ld... " >&6; } if test ${lt_cv_prog_gnu_ld+y} then : printf %s "(cached) " >&6 -else $as_nop - # I'd rather use --version here, but apparently some GNU lds only accept -v. +else case e in #( + e) # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 @@ -6727,8 +6842,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AWK"; then +else case e in #( + e) if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6750,7 +6865,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -6786,8 +6902,8 @@ if test -z "$INSTALL"; then if test ${ac_cv_path_install+y} then : printf %s "(cached) " >&6 -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS @@ -6841,7 +6957,8 @@ esac IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir - + ;; +esac fi if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install @@ -6883,8 +7000,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$RANLIB"; then +else case e in #( + e) if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6906,7 +7023,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -6928,8 +7046,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_RANLIB+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_RANLIB"; then +else case e in #( + e) if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6951,7 +7069,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -6982,8 +7101,8 @@ printf %s "checking for GNU make... " >&6; } if test ${ac_cv_GNU_MAKE+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_GNU_MAKE='Not Found' ; +else case e in #( + e) ac_cv_GNU_MAKE='Not Found' ; ac_cv_GNU_MAKE_VERSION_MAJOR=0 ; ac_cv_GNU_MAKE_VERSION_MINOR=0 ; for a in make gmake gnumake ; do @@ -6995,7 +7114,8 @@ else $as_nop break; fi done ; - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5 printf "%s\n" "$ac_cv_GNU_MAKE" >&6; } ; @@ -7011,8 +7131,8 @@ printf %s "checking for grep that handles long lines and -e... " >&6; } if test ${ac_cv_path_GREP+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -z "$GREP"; then +else case e in #( + e) if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7031,9 +7151,10 @@ do as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in +case `"$ac_path_GREP" --version 2>&1` in #( *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -7068,7 +7189,8 @@ IFS=$as_save_IFS else ac_cv_path_GREP=$GREP fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 printf "%s\n" "$ac_cv_path_GREP" >&6; } @@ -7080,8 +7202,8 @@ printf %s "checking for egrep... " >&6; } if test ${ac_cv_path_EGREP+y} then : printf %s "(cached) " >&6 -else $as_nop - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +else case e in #( + e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else if test -z "$EGREP"; then @@ -7103,9 +7225,10 @@ do as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in +case `"$ac_path_EGREP" --version 2>&1` in #( *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -7141,12 +7264,15 @@ else ac_cv_path_EGREP=$EGREP fi - fi + fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" + EGREP_TRADITIONAL=$EGREP + ac_cv_path_EGREP_TRADITIONAL=$EGREP if test -n "$ac_tool_prefix"; then @@ -7159,8 +7285,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_STRIP+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$STRIP"; then +else case e in #( + e) if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7182,7 +7308,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -7208,8 +7335,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_STRIP+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_STRIP"; then +else case e in #( + e) if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7231,7 +7358,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -7269,8 +7397,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AR+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AR"; then +else case e in #( + e) if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7292,7 +7420,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -7318,8 +7447,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_AR+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_AR"; then +else case e in #( + e) if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7341,7 +7470,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -7383,8 +7513,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BISON+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BISON in +else case e in #( + e) case $BISON in [\\/]* | ?:[\\/]*) ac_cv_path_BISON="$BISON" # Let the user override the test with a path. ;; @@ -7410,6 +7540,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_BISON" && ac_cv_path_BISON=":" ;; +esac ;; esac fi BISON=$ac_cv_path_BISON @@ -7429,8 +7560,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CMP+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CMP in +else case e in #( + e) case $CMP in [\\/]* | ?:[\\/]*) ac_cv_path_CMP="$CMP" # Let the user override the test with a path. ;; @@ -7456,6 +7587,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_CMP" && ac_cv_path_CMP=":" ;; +esac ;; esac fi CMP=$ac_cv_path_CMP @@ -7475,8 +7607,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CAT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CAT in +else case e in #( + e) case $CAT in [\\/]* | ?:[\\/]*) ac_cv_path_CAT="$CAT" # Let the user override the test with a path. ;; @@ -7502,6 +7634,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_CAT" && ac_cv_path_CAT=":" ;; +esac ;; esac fi CAT=$ac_cv_path_CAT @@ -7521,8 +7654,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CUT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CUT in +else case e in #( + e) case $CUT in [\\/]* | ?:[\\/]*) ac_cv_path_CUT="$CUT" # Let the user override the test with a path. ;; @@ -7548,6 +7681,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_CUT" && ac_cv_path_CUT=":" ;; +esac ;; esac fi CUT=$ac_cv_path_CUT @@ -7567,8 +7701,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FLEX+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FLEX in +else case e in #( + e) case $FLEX in [\\/]* | ?:[\\/]*) ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path. ;; @@ -7594,6 +7728,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_FLEX" && ac_cv_path_FLEX=":" ;; +esac ;; esac fi FLEX=$ac_cv_path_FLEX @@ -7613,8 +7748,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GREP+y} then : printf %s "(cached) " >&6 -else $as_nop - case $GREP in +else case e in #( + e) case $GREP in [\\/]* | ?:[\\/]*) ac_cv_path_GREP="$GREP" # Let the user override the test with a path. ;; @@ -7640,6 +7775,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GREP" && ac_cv_path_GREP=":" ;; +esac ;; esac fi GREP=$ac_cv_path_GREP @@ -7661,8 +7797,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PYTHON+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PYTHON in +else case e in #( + e) case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. ;; @@ -7687,6 +7823,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PYTHON=$ac_cv_path_PYTHON @@ -7710,8 +7847,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND in +else case e in #( + e) case $FIND in [\\/]* | ?:[\\/]*) ac_cv_path_FIND="$FIND" # Let the user override the test with a path. ;; @@ -7737,6 +7874,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_FIND" && ac_cv_path_FIND=":" ;; +esac ;; esac fi FIND=$ac_cv_path_FIND @@ -7756,8 +7894,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASENAME in +else case e in #( + e) case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -7783,6 +7921,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_BASENAME" && ac_cv_path_BASENAME=":" ;; +esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -7802,8 +7941,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_DIRNAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $DIRNAME in +else case e in #( + e) case $DIRNAME in [\\/]* | ?:[\\/]*) ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path. ;; @@ -7829,6 +7968,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_DIRNAME" && ac_cv_path_DIRNAME=":" ;; +esac ;; esac fi DIRNAME=$ac_cv_path_DIRNAME @@ -7848,8 +7988,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_SHELL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $SHELL in +else case e in #( + e) case $SHELL in [\\/]* | ?:[\\/]*) ac_cv_path_SHELL="$SHELL" # Let the user override the test with a path. ;; @@ -7875,6 +8015,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_SHELL" && ac_cv_path_SHELL=":" ;; +esac ;; esac fi SHELL=$ac_cv_path_SHELL @@ -7894,8 +8035,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $LN in +else case e in #( + e) case $LN in [\\/]* | ?:[\\/]*) ac_cv_path_LN="$LN" # Let the user override the test with a path. ;; @@ -7921,6 +8062,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_LN" && ac_cv_path_LN=":" ;; +esac ;; esac fi LN=$ac_cv_path_LN @@ -7940,8 +8082,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_DOXYGEN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $DOXYGEN in +else case e in #( + e) case $DOXYGEN in [\\/]* | ?:[\\/]*) ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. ;; @@ -7967,6 +8109,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN=":" ;; +esac ;; esac fi DOXYGEN=$ac_cv_path_DOXYGEN @@ -7986,8 +8129,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_DOT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $DOT in +else case e in #( + e) case $DOT in [\\/]* | ?:[\\/]*) ac_cv_path_DOT="$DOT" # Let the user override the test with a path. ;; @@ -8013,6 +8156,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_DOT" && ac_cv_path_DOT=":" ;; +esac ;; esac fi DOT=$ac_cv_path_DOT @@ -8032,8 +8176,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_WGET+y} then : printf %s "(cached) " >&6 -else $as_nop - case $WGET in +else case e in #( + e) case $WGET in [\\/]* | ?:[\\/]*) ac_cv_path_WGET="$WGET" # Let the user override the test with a path. ;; @@ -8059,6 +8203,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_WGET" && ac_cv_path_WGET=":" ;; +esac ;; esac fi WGET=$ac_cv_path_WGET @@ -8078,8 +8223,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CURL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CURL in +else case e in #( + e) case $CURL in [\\/]* | ?:[\\/]*) ac_cv_path_CURL="$CURL" # Let the user override the test with a path. ;; @@ -8105,6 +8250,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_CURL" && ac_cv_path_CURL=":" ;; +esac ;; esac fi CURL=$ac_cv_path_CURL @@ -8124,8 +8270,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_XMLLINT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $XMLLINT in +else case e in #( + e) case $XMLLINT in [\\/]* | ?:[\\/]*) ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path. ;; @@ -8151,6 +8297,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT=":" ;; +esac ;; esac fi XMLLINT=$ac_cv_path_XMLLINT @@ -8172,8 +8319,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_XMLSTARLET+y} then : printf %s "(cached) " >&6 -else $as_nop - case $XMLSTARLET in +else case e in #( + e) case $XMLSTARLET in [\\/]* | ?:[\\/]*) ac_cv_path_XMLSTARLET="$XMLSTARLET" # Let the user override the test with a path. ;; @@ -8198,6 +8345,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi XMLSTARLET=$ac_cv_path_XMLSTARLET @@ -8221,8 +8369,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASH in +else case e in #( + e) case $BASH in [\\/]* | ?:[\\/]*) ac_cv_path_BASH="$BASH" # Let the user override the test with a path. ;; @@ -8248,6 +8396,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_BASH" && ac_cv_path_BASH=":" ;; +esac ;; esac fi BASH=$ac_cv_path_BASH @@ -8267,8 +8416,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_GIT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $GIT in +else case e in #( + e) case $GIT in [\\/]* | ?:[\\/]*) ac_cv_path_GIT="$GIT" # Let the user override the test with a path. ;; @@ -8294,6 +8443,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_GIT" && ac_cv_path_GIT=":" ;; +esac ;; esac fi GIT=$ac_cv_path_GIT @@ -8313,8 +8463,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ALEMBIC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ALEMBIC in +else case e in #( + e) case $ALEMBIC in [\\/]* | ?:[\\/]*) ac_cv_path_ALEMBIC="$ALEMBIC" # Let the user override the test with a path. ;; @@ -8340,6 +8490,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_ALEMBIC" && ac_cv_path_ALEMBIC=":" ;; +esac ;; esac fi ALEMBIC=$ac_cv_path_ALEMBIC @@ -8359,8 +8510,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BZIP2+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BZIP2 in +else case e in #( + e) case $BZIP2 in [\\/]* | ?:[\\/]*) ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path. ;; @@ -8386,6 +8537,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_BZIP2" && ac_cv_path_BZIP2=":" ;; +esac ;; esac fi BZIP2=$ac_cv_path_BZIP2 @@ -8405,8 +8557,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_TAR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $TAR in +else case e in #( + e) case $TAR in [\\/]* | ?:[\\/]*) ac_cv_path_TAR="$TAR" # Let the user override the test with a path. ;; @@ -8432,6 +8584,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_TAR" && ac_cv_path_TAR=":" ;; +esac ;; esac fi TAR=$ac_cv_path_TAR @@ -8451,8 +8604,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATCH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATCH in +else case e in #( + e) case $PATCH in [\\/]* | ?:[\\/]*) ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path. ;; @@ -8478,6 +8631,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATCH" && ac_cv_path_PATCH=":" ;; +esac ;; esac fi PATCH=$ac_cv_path_PATCH @@ -8497,8 +8651,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else $as_nop - case $SED in +else case e in #( + e) case $SED in [\\/]* | ?:[\\/]*) ac_cv_path_SED="$SED" # Let the user override the test with a path. ;; @@ -8524,6 +8678,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_SED" && ac_cv_path_SED=":" ;; +esac ;; esac fi SED=$ac_cv_path_SED @@ -8543,8 +8698,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_NM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $NM in +else case e in #( + e) case $NM in [\\/]* | ?:[\\/]*) ac_cv_path_NM="$NM" # Let the user override the test with a path. ;; @@ -8570,6 +8725,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_NM" && ac_cv_path_NM=":" ;; +esac ;; esac fi NM=$ac_cv_path_NM @@ -8589,8 +8745,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_REALPATH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $REALPATH in +else case e in #( + e) case $REALPATH in [\\/]* | ?:[\\/]*) ac_cv_path_REALPATH="$REALPATH" # Let the user override the test with a path. ;; @@ -8616,6 +8772,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_REALPATH" && ac_cv_path_REALPATH=":" ;; +esac ;; esac fi REALPATH=$ac_cv_path_REALPATH @@ -8649,8 +8806,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FETCH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FETCH in +else case e in #( + e) case $FETCH in [\\/]* | ?:[\\/]*) ac_cv_path_FETCH="$FETCH" # Let the user override the test with a path. ;; @@ -8676,6 +8833,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_FETCH" && ac_cv_path_FETCH=":" ;; +esac ;; esac fi FETCH=$ac_cv_path_FETCH @@ -8705,8 +8863,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_LDCONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $LDCONFIG in +else case e in #( + e) case $LDCONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path. ;; @@ -8732,6 +8890,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG=":" ;; +esac ;; esac fi LDCONFIG=$ac_cv_path_LDCONFIG @@ -8751,8 +8910,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_SHA1SUM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $SHA1SUM in +else case e in #( + e) case $SHA1SUM in [\\/]* | ?:[\\/]*) ac_cv_path_SHA1SUM="$SHA1SUM" # Let the user override the test with a path. ;; @@ -8778,6 +8937,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_SHA1SUM" && ac_cv_path_SHA1SUM="$ac_aux_dir/build_tools/sha1sum-sh" ;; +esac ;; esac fi SHA1SUM=$ac_cv_path_SHA1SUM @@ -8797,8 +8957,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_OPENSSL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $OPENSSL in +else case e in #( + e) case $OPENSSL in [\\/]* | ?:[\\/]*) ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path. ;; @@ -8824,6 +8984,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_OPENSSL" && ac_cv_path_OPENSSL=":" ;; +esac ;; esac fi OPENSSL=$ac_cv_path_OPENSSL @@ -8853,8 +9014,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PKG_CONFIG in +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -8879,6 +9040,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG @@ -8901,8 +9063,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PKG_CONFIG in +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -8927,6 +9089,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG @@ -8967,14 +9130,17 @@ printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi +if test -z "$PKG_CONFIG"; then + as_fn_error $? "pkg-config not found" "$LINENO" 5 +fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison that supports parse-param" >&5 printf %s "checking for bison that supports parse-param... " >&6; } if test ${ac_cv_path_BISON2+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test "x$BISON" != "x:" ; then # Create a temporary directory $tmp in $TMPDIR (default /tmp). # Use mktemp if possible; otherwise fall back on mkdir, @@ -9002,7 +9168,8 @@ __EOL__ fi rm -rf ${tmp} fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_BISON2" >&5 printf "%s\n" "$ac_cv_path_BISON2" >&6; } @@ -9043,8 +9210,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_SOXMIX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$SOXMIX"; then +else case e in #( + e) if test -n "$SOXMIX"; then ac_cv_prog_SOXMIX="$SOXMIX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9066,7 +9233,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi SOXMIX=$ac_cv_prog_SOXMIX if test -n "$SOXMIX"; then @@ -9088,8 +9256,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_SOXMIX+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_SOXMIX"; then +else case e in #( + e) if test -n "$ac_ct_SOXMIX"; then ac_cv_prog_ac_ct_SOXMIX="$ac_ct_SOXMIX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9111,7 +9279,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_SOXMIX=$ac_cv_prog_ac_ct_SOXMIX if test -n "$ac_ct_SOXMIX"; then @@ -9152,8 +9321,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_MD5+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$MD5"; then +else case e in #( + e) if test -n "$MD5"; then ac_cv_prog_MD5="$MD5" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9175,7 +9344,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi MD5=$ac_cv_prog_MD5 if test -n "$MD5"; then @@ -9200,8 +9370,8 @@ printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done @@ -9226,9 +9396,10 @@ do as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in +case `"$ac_path_SED" --version 2>&1` in #( *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( *) ac_count=0 printf %s 0123456789 >"conftest.in" @@ -9263,7 +9434,8 @@ IFS=$as_save_IFS else ac_cv_path_SED=$SED fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 printf "%s\n" "$ac_cv_path_SED" >&6; } @@ -9271,6 +9443,140 @@ printf "%s\n" "$ac_cv_path_SED" >&6; } rm -f conftest.sed +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 +printf %s "checking for egrep -e... " >&6; } +if test ${ac_cv_path_EGREP_TRADITIONAL+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + : + fi +else + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL +fi + + if test "$ac_cv_path_EGREP_TRADITIONAL" +then : + ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E" +else case e in #( + e) if test -z "$EGREP_TRADITIONAL"; then + ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. + # Check for GNU $ac_path_EGREP_TRADITIONAL +case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( +*GNU*) + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" + "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" + ac_path_EGREP_TRADITIONAL_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL +fi + ;; +esac +fi ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 +printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } + EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL + @@ -9297,10 +9603,6 @@ if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then if test "x$PTHREAD_CC" != "x" then : CC="$PTHREAD_CC" -fi - if test "x$PTHREAD_CXX" != "x" -then : - CXX="$PTHREAD_CXX" fi CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$PTHREAD_LIBS $LIBS" @@ -9311,8 +9613,14 @@ printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... /* 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. */ -char pthread_join (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_join (void); int main (void) { @@ -9343,12 +9651,10 @@ fi # (e.g. DEC) have both -lpthread and -lpthreads, where one of the # libraries is broken (non-POSIX). -# Create a list of thread flags to try. Items with a "," contain both -# C compiler flags (before ",") and linker flags (after ","). Other items -# starting with a "-" are C compiler flags, and remaining items are -# library names, except for "none" which indicates that we try without -# any flags at all, and "pthread-config" which is a program returning -# the flags for the Pth emulation library. +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" @@ -9406,7 +9712,7 @@ case $host_os in _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 + $EGREP_TRADITIONAL "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} @@ -9425,67 +9731,17 @@ rm -rf conftest* # that too in a future libc.) So we'll check first for the # standard Solaris way of linking pthreads (-mt -lpthread). - ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags" + ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" ;; esac -# Are we compiling with Clang? - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 -printf %s "checking whether $CC is Clang... " >&6; } -if test ${ax_cv_PTHREAD_CLANG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ax_cv_PTHREAD_CLANG=no - # Note that Autoconf sets GCC=yes for Clang as well as GCC - if test "x$GCC" = "xyes"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ -# if defined(__clang__) && defined(__llvm__) - AX_PTHREAD_CC_IS_CLANG -# endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 -then : - ax_cv_PTHREAD_CLANG=yes -fi -rm -rf conftest* - - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 -printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; } -ax_pthread_clang="$ax_cv_PTHREAD_CLANG" - - # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) -# Note that for GCC and Clang -pthread generally implies -lpthread, -# except when -nostdlib is passed. -# This is problematic using libtool to build C++ shared libraries with pthread: -# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 -# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333 -# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 -# To solve this, first try -pthread together with -lpthread for GCC - if test "x$GCC" = "xyes" then : - ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags" + ax_pthread_flags="-pthread -pthreads $ax_pthread_flags" fi -# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first - -if test "x$ax_pthread_clang" = "xyes" -then : - ax_pthread_flags="-pthread,-lpthread -pthread" -fi - - # The presence of a feature test macro requesting re-entrant function # definitions is, on some systems, a strong hint that pthreads support is # correctly enabled @@ -9506,10 +9762,152 @@ esac if test "x$ax_pthread_check_macro" = "x--" then : ax_pthread_check_cond=0 -else $as_nop - ax_pthread_check_cond="!defined($ax_pthread_check_macro)" +else case e in #( + e) ax_pthread_check_cond="!defined($ax_pthread_check_macro)" ;; +esac fi +# Are we compiling with Clang? + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 +printf %s "checking whether $CC is Clang... " >&6; } +if test ${ax_cv_PTHREAD_CLANG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_CLANG=no + # Note that Autoconf sets GCC=yes for Clang as well as GCC + if test "x$GCC" = "xyes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +# if defined(__clang__) && defined(__llvm__) + AX_PTHREAD_CC_IS_CLANG +# endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP_TRADITIONAL "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 +then : + ax_cv_PTHREAD_CLANG=yes +fi +rm -rf conftest* + + fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; } +ax_pthread_clang="$ax_cv_PTHREAD_CLANG" + +ax_pthread_clang_warning=no + +# Clang needs special handling, because older versions handle the -pthread +# option in a rather... idiosyncratic way + +if test "x$ax_pthread_clang" = "xyes"; then + + # Clang takes -pthread; it has never supported any other flag + + # (Note 1: This will need to be revisited if a system that Clang + # supports has POSIX threads in a separate library. This tends not + # to be the way of modern systems, but it's conceivable.) + + # (Note 2: On some systems, notably Darwin, -pthread is not needed + # to get POSIX threads support; the API is always present and + # active. We could reasonably leave PTHREAD_CFLAGS empty. But + # -pthread does define _REENTRANT, and while the Darwin headers + # ignore this macro, third-party headers might not.) + + PTHREAD_CFLAGS="-pthread" + PTHREAD_LIBS= + + ax_pthread_ok=yes + + # However, older versions of Clang make a point of warning the user + # that, in an invocation where only linking and no compilation is + # taking place, the -pthread option has no effect ("argument unused + # during compilation"). They expect -pthread to be passed in only + # when source code is being compiled. + # + # Problem is, this is at odds with the way Automake and most other + # C build frameworks function, which is that the same flags used in + # compilation (CFLAGS) are also used in linking. Many systems + # supported by AX_PTHREAD require exactly this for POSIX threads + # support, and in fact it is often not straightforward to specify a + # flag that is used only in the compilation phase and not in + # linking. Such a scenario is extremely rare in practice. + # + # Even though use of the -pthread flag in linking would only print + # a warning, this can be a nuisance for well-run software projects + # that build with -Werror. So if the active version of Clang has + # this misfeature, we search for an option to squash it. + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 +printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } +if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown + # Create an alternate version of $ac_link that compiles and + # links in two steps (.c -> .o, .o -> exe) instead of one + # (.c -> exe), because the warning occurs only in the second + # step + ax_pthread_save_ac_link="$ac_link" + ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' + ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" + ax_pthread_save_CFLAGS="$CFLAGS" + for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do + if test "x$ax_pthread_try" = "xunknown" +then : + break +fi + CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" + ac_link="$ax_pthread_save_ac_link" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void){return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_link="$ax_pthread_2step_ac_link" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void){return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + done + ac_link="$ax_pthread_save_ac_link" + CFLAGS="$ax_pthread_save_CFLAGS" + if test "x$ax_pthread_try" = "x" +then : + ax_pthread_try=no +fi + ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } + + case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in + no | unknown) ;; + *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; + esac + +fi # $ax_pthread_clang = yes if test "x$ax_pthread_ok" = "xno"; then for ax_pthread_try_flag in $ax_pthread_flags; do @@ -9520,11 +9918,11 @@ for ax_pthread_try_flag in $ax_pthread_flags; do printf %s "checking whether pthreads work without any flags... " >&6; } ;; - *,*) - PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` - PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5 -printf %s "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; } + -mt,pthread) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5 +printf %s "checking whether pthreads work with -mt -lpthread... " >&6; } + PTHREAD_CFLAGS="-mt" + PTHREAD_LIBS="-lpthread" ;; -*) @@ -9541,8 +9939,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ax_pthread_config+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ax_pthread_config"; then +else case e in #( + e) if test -n "$ax_pthread_config"; then ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9565,7 +9963,8 @@ done IFS=$as_save_IFS test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" -fi +fi ;; +esac fi ax_pthread_config=$ac_cv_prog_ax_pthread_config if test -n "$ax_pthread_config"; then @@ -9613,13 +10012,7 @@ printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } # if $ax_pthread_check_cond # error "$ax_pthread_check_macro must be defined" # endif - static void *some_global = NULL; - static void routine(void *a) - { - /* To avoid any unused-parameter or - unused-but-set-parameter warning. */ - some_global = a; - } + static void routine(void *a) { a = 0; } static void *start_routine(void *a) { return a; } int main (void) @@ -9656,109 +10049,6 @@ fi done fi - -# Clang needs special handling, because older versions handle the -pthread -# option in a rather... idiosyncratic way - -if test "x$ax_pthread_clang" = "xyes"; then - - # Clang takes -pthread; it has never supported any other flag - - # (Note 1: This will need to be revisited if a system that Clang - # supports has POSIX threads in a separate library. This tends not - # to be the way of modern systems, but it's conceivable.) - - # (Note 2: On some systems, notably Darwin, -pthread is not needed - # to get POSIX threads support; the API is always present and - # active. We could reasonably leave PTHREAD_CFLAGS empty. But - # -pthread does define _REENTRANT, and while the Darwin headers - # ignore this macro, third-party headers might not.) - - # However, older versions of Clang make a point of warning the user - # that, in an invocation where only linking and no compilation is - # taking place, the -pthread option has no effect ("argument unused - # during compilation"). They expect -pthread to be passed in only - # when source code is being compiled. - # - # Problem is, this is at odds with the way Automake and most other - # C build frameworks function, which is that the same flags used in - # compilation (CFLAGS) are also used in linking. Many systems - # supported by AX_PTHREAD require exactly this for POSIX threads - # support, and in fact it is often not straightforward to specify a - # flag that is used only in the compilation phase and not in - # linking. Such a scenario is extremely rare in practice. - # - # Even though use of the -pthread flag in linking would only print - # a warning, this can be a nuisance for well-run software projects - # that build with -Werror. So if the active version of Clang has - # this misfeature, we search for an option to squash it. - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 -printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } -if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown - # Create an alternate version of $ac_link that compiles and - # links in two steps (.c -> .o, .o -> exe) instead of one - # (.c -> exe), because the warning occurs only in the second - # step - ax_pthread_save_ac_link="$ac_link" - ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' - ax_pthread_link_step=`printf "%s\n" "$ac_link" | sed "$ax_pthread_sed"` - ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" - ax_pthread_save_CFLAGS="$CFLAGS" - for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - if test "x$ax_pthread_try" = "xunknown" -then : - break -fi - CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" - ac_link="$ax_pthread_save_ac_link" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(void){return 0;} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_link="$ax_pthread_2step_ac_link" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(void){return 0;} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - done - ac_link="$ax_pthread_save_ac_link" - CFLAGS="$ax_pthread_save_CFLAGS" - if test "x$ax_pthread_try" = "x" -then : - ax_pthread_try=no -fi - ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 -printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } - - case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in - no | unknown) ;; - *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; - esac - -fi # $ax_pthread_clang = yes - - - # Various other checks: if test "x$ax_pthread_ok" = "xyes"; then ax_pthread_save_CFLAGS="$CFLAGS" @@ -9772,8 +10062,8 @@ printf %s "checking for joinable pthread attribute... " >&6; } if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y} then : printf %s "(cached) " >&6 -else $as_nop - ax_cv_PTHREAD_JOINABLE_ATTR=unknown +else case e in #( + e) ax_cv_PTHREAD_JOINABLE_ATTR=unknown for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9793,7 +10083,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } @@ -9813,14 +10104,15 @@ printf %s "checking whether more special flags are required for pthreads... " >& if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y} then : printf %s "(cached) " >&6 -else $as_nop - ax_cv_PTHREAD_SPECIAL_FLAGS=no +else case e in #( + e) ax_cv_PTHREAD_SPECIAL_FLAGS=no case $host_os in solaris*) ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" ;; esac - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } @@ -9836,15 +10128,14 @@ printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; } if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main (void) { int i = PTHREAD_PRIO_INHERIT; - return i; ; return 0; } @@ -9852,12 +10143,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ax_cv_PTHREAD_PRIO_INHERIT=yes -else $as_nop - ax_cv_PTHREAD_PRIO_INHERIT=no +else case e in #( + e) ax_cv_PTHREAD_PRIO_INHERIT=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } @@ -9883,22 +10176,12 @@ fi #handle absolute path differently from PATH based program lookup case "x$CC" in #( x/*) : - - if as_fn_executable_p ${CC}_r + if as_fn_executable_p ${CC}_r then : PTHREAD_CC="${CC}_r" -fi - if test "x${CXX}" != "x" -then : - if as_fn_executable_p ${CXX}_r -then : - PTHREAD_CXX="${CXX}_r" -fi -fi - ;; #( +fi ;; #( *) : - - for ac_prog in ${CC}_r + for ac_prog in ${CC}_r do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9907,8 +10190,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_PTHREAD_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$PTHREAD_CC"; then +else case e in #( + e) if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9930,7 +10213,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then @@ -9945,62 +10229,8 @@ fi test -n "$PTHREAD_CC" && break done test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - - if test "x${CXX}" != "x" -then : - for ac_prog in ${CXX}_r -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_PTHREAD_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$PTHREAD_CXX"; then - ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_PTHREAD_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX -if test -n "$PTHREAD_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5 -printf "%s\n" "$PTHREAD_CXX" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$PTHREAD_CXX" && break -done -test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" - -fi - - ;; -esac - ;; #( + ;; +esac ;; #( *) : ;; esac @@ -10010,8 +10240,6 @@ esac fi test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" -test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" - @@ -10096,8 +10324,9 @@ then : ;; esac -else $as_nop - : +else case e in #( + e) : ;; +esac fi @@ -10121,8 +10350,9 @@ then : ;; esac -else $as_nop - : +else case e in #( + e) : ;; +esac fi @@ -10146,8 +10376,9 @@ then : ;; esac -else $as_nop - : +else case e in #( + e) : ;; +esac fi @@ -10214,20 +10445,21 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } -else $as_nop - +else case e in #( + e) AST_NESTED_FUNCTIONS="-fnested-functions" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext AST_C_COMPILER_FAMILY="gcc" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5 printf %s "checking for clang -fblocks... " >&6; } if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then @@ -10247,7 +10479,8 @@ printf "%s\n" "yes" >&6; } AST_C_COMPILER_FAMILY="clang" - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -10292,8 +10525,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } -else $as_nop - +else case e in #( + e) printf "%s\n" "#define _HAVE_STRING_ARCH_strcmp 1" >>confdefs.h @@ -10303,7 +10536,8 @@ printf "%s\n" "#define _HAVE_STRING_ARCH_strsep 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&5 printf "%s\n" "prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$save_CFLAGS" @@ -10444,7 +10678,7 @@ printf "%s\n" "$as_me: checking OPENSSL with pkg-config" >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system openssl > 1.1.0" >&5 printf "%s\n" "$as_me: checking whether system openssl > 1.1.0" >&6;} - if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then + if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.0" >&5 @@ -10535,7 +10769,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether alternate openssl11 is installed" >&5 printf "%s\n" "$as_me: checking whether alternate openssl11 is installed" >&6;} - if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then + if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl11" >&5 @@ -10631,7 +10865,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking fallback system openssl" >&5 printf "%s\n" "$as_me: checking fallback system openssl" >&6;} - if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then + if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 @@ -10747,16 +10981,22 @@ printf %s "checking for AES_encrypt in -lcrypto... " >&6; } if test ${ac_cv_lib_crypto_AES_encrypt+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto ${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. */ -char AES_encrypt (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char AES_encrypt (void); int main (void) { @@ -10768,20 +11008,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypto_AES_encrypt=yes -else $as_nop - ac_cv_lib_crypto_AES_encrypt=no +else case e in #( + e) ac_cv_lib_crypto_AES_encrypt=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5 printf "%s\n" "$ac_cv_lib_crypto_AES_encrypt" >&6; } if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes then : AST_CRYPTO_FOUND=yes -else $as_nop - AST_CRYPTO_FOUND=no +else case e in #( + e) AST_CRYPTO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -10803,8 +11046,9 @@ fi if test "x$ac_cv_header_openssl_aes_h" = xyes then : CRYPTO_HEADER_FOUND=1 -else $as_nop - CRYPTO_HEADER_FOUND=0 +else case e in #( + e) CRYPTO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -10845,16 +11089,22 @@ printf %s "checking for SSL_connect in -lssl... " >&6; } if test ${ac_cv_lib_ssl_SSL_connect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lssl ${pbxlibdir} -lcrypto $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. */ -char SSL_connect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_connect (void); int main (void) { @@ -10866,20 +11116,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ssl_SSL_connect=yes -else $as_nop - ac_cv_lib_ssl_SSL_connect=no +else case e in #( + e) ac_cv_lib_ssl_SSL_connect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5 printf "%s\n" "$ac_cv_lib_ssl_SSL_connect" >&6; } if test "x$ac_cv_lib_ssl_SSL_connect" = xyes then : AST_OPENSSL_FOUND=yes -else $as_nop - AST_OPENSSL_FOUND=no +else case e in #( + e) AST_OPENSSL_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -10901,8 +11154,9 @@ fi if test "x$ac_cv_header_openssl_ssl_h" = xyes then : OPENSSL_HEADER_FOUND=1 -else $as_nop - OPENSSL_HEADER_FOUND=0 +else case e in #( + e) OPENSSL_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -10941,16 +11195,22 @@ printf %s "checking for BIO_meth_new in -lssl... " >&6; } if test ${ac_cv_lib_ssl_BIO_meth_new+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lssl ${pbxlibdir} -lcrypto $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. */ -char BIO_meth_new (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char BIO_meth_new (void); int main (void) { @@ -10962,20 +11222,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ssl_BIO_meth_new=yes -else $as_nop - ac_cv_lib_ssl_BIO_meth_new=no +else case e in #( + e) ac_cv_lib_ssl_BIO_meth_new=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_BIO_meth_new" >&5 printf "%s\n" "$ac_cv_lib_ssl_BIO_meth_new" >&6; } if test "x$ac_cv_lib_ssl_BIO_meth_new" = xyes then : AST_OPENSSL_BIO_METHOD_FOUND=yes -else $as_nop - AST_OPENSSL_BIO_METHOD_FOUND=no +else case e in #( + e) AST_OPENSSL_BIO_METHOD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -10997,8 +11260,9 @@ fi if test "x$ac_cv_header_openssl_ssl_h" = xyes then : OPENSSL_BIO_METHOD_HEADER_FOUND=1 -else $as_nop - OPENSSL_BIO_METHOD_HEADER_FOUND=0 +else case e in #( + e) OPENSSL_BIO_METHOD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -11128,10 +11392,11 @@ then : printf "%s\n" "#define AST_JSON_INT_T long long" >>confdefs.h -else $as_nop - +else case e in #( + e) printf "%s\n" "#define AST_JSON_INT_T long" >>confdefs.h - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -11196,14 +11461,6 @@ printf "%s\n" "configuring" >&6; } if test "${GREP}" = ":" ; then as_fn_error $? "grep is required to build bundled pjproject" "$LINENO" 5 fi - if test "${FIND}" = ":" ; then - as_fn_error $? "find is required to build bundled pjproject" "$LINENO" 5 - fi - if test "x${AST_DEVMODE}" != "x" ; then - if test "${REALPATH}" = ":" ; then - as_fn_error $? "realpath is required to build bundled pjproject in dev mode" "$LINENO" 5 - fi - fi this_host=$(./config.sub $(./config.guess)) @@ -11223,32 +11480,19 @@ printf "%s\n" "configuring" >&6; } y|ye|yes) # Not to mention SSL is the default in PJProject and means "autodetect". # In Asterisk, "./configure --with-ssl" means "must be present". - PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl" + PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}" ;; *) PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}" ;; esac - else - if test $PBX_OPENSSL -eq 1 ; then - PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl" - fi fi - # Determine if we're doing an out-of-tree build... - - if test -L ${PJPROJECT_DIR}/source -o -d ${PJPROJECT_DIR}/source/.git ; then - printf "%s\n" "#define HAVE_PJPROJECT_BUNDLED_OOT 1" >>confdefs.h - - PJPROJECT_BUNDLED_OOT=yes - fi - - export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP FIND REALPATH + export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP export NOISY_BUILD AST_DEVMODE ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \ PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \ EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \ - PJPROJECT_BUNDLED_OOT="${PJPROJECT_BUNDLED_OOT}" \ configure if test $? -ne 0 ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 @@ -11261,11 +11505,7 @@ printf "%s\n" "$as_me: Unable to configure ${PJPROJECT_DIR}" >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bundled pjproject" >&5 printf %s "checking for bundled pjproject... " >&6; } - PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \ - PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \ - EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \ - PJPROJECT_BUNDLED_OOT="${PJPROJECT_BUNDLED_OOT}" \ - echo_cflags) + PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" echo_cflags) PJPROJECT_CFLAGS="$PJPROJECT_INCLUDE" PBX_PJPROJECT=1 @@ -11298,15 +11538,6 @@ printf "%s\n" "#define HAVE_PJSIP_EXTERNAL_RESOLVER 1" >>confdefs.h printf "%s\n" "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h -printf "%s\n" "#define HAVE_PJSIP_TLS_1_1 1" >>confdefs.h - - -printf "%s\n" "#define HAVE_PJSIP_TLS_1_2 1" >>confdefs.h - - -printf "%s\n" "#define HAVE_PJSIP_TLS_1_3 1" >>confdefs.h - - printf "%s\n" "#define HAVE_PJSIP_EVSUB_GRP_LOCK 1" >>confdefs.h @@ -11337,6 +11568,8 @@ printf "%s\n" "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h printf "%s\n" "#define HAVE_PJSIP_TLS_TRANSPORT_RESTART 1" >>confdefs.h +printf "%s\n" "#define HAVE_PJSIP_EVSUB_PENDING_NOTIFY 1" >>confdefs.h + @@ -12393,8 +12626,9 @@ fi if test ${with_libcurl+y} then : withval=$with_libcurl; _libcurl_with=$withval -else $as_nop - _libcurl_with=yes +else case e in #( + e) _libcurl_with=yes ;; +esac fi @@ -12409,8 +12643,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_AWK+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$AWK"; then +else case e in #( + e) if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12432,7 +12666,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -12462,8 +12697,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path__libcurl_config+y} then : printf %s "(cached) " >&6 -else $as_nop - case $_libcurl_config in +else case e in #( + e) case $_libcurl_config in [\\/]* | ?:[\\/]*) ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path. ;; @@ -12488,6 +12723,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi _libcurl_config=$ac_cv_path__libcurl_config @@ -12508,8 +12744,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path__libcurl_config+y} then : printf %s "(cached) " >&6 -else $as_nop - case $_libcurl_config in +else case e in #( + e) case $_libcurl_config in [\\/]* | ?:[\\/]*) ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path. ;; @@ -12534,6 +12770,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi _libcurl_config=$ac_cv_path__libcurl_config @@ -12554,8 +12791,9 @@ printf %s "checking for the version of libcurl... " >&6; } if test ${libcurl_cv_lib_curl_version+y} then : printf %s "(cached) " >&6 -else $as_nop - libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` +else case e in #( + e) libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'` ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5 printf "%s\n" "$libcurl_cv_lib_curl_version" >&6; } @@ -12569,14 +12807,15 @@ printf %s "checking for libcurl >= version 7.10.1... " >&6; } if test ${libcurl_cv_lib_version_ok+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) if test $_libcurl_version -ge $_libcurl_wanted ; then libcurl_cv_lib_version_ok=yes else libcurl_cv_lib_version_ok=no fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5 printf "%s\n" "$libcurl_cv_lib_version_ok" >&6; } @@ -12624,8 +12863,8 @@ printf %s "checking whether libcurl is usable... " >&6; } if test ${libcurl_cv_lib_curl_usable+y} then : printf %s "(cached) " >&6 -else $as_nop - +else case e in #( + e) _libcurl_save_cppflags=$CPPFLAGS CPPFLAGS="$CURL_INCLUDE $CPPFLAGS" _libcurl_save_libs=$LIBS @@ -12657,8 +12896,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : libcurl_cv_lib_curl_usable=yes -else $as_nop - libcurl_cv_lib_curl_usable=no +else case e in #( + e) libcurl_cv_lib_curl_usable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -12667,7 +12907,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$_libcurl_save_libs unset _libcurl_save_cppflags unset _libcurl_save_libs - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5 printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; } @@ -12686,10 +12927,11 @@ printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; } if test "x$ac_cv_func_curl_free" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define curl_free free" >>confdefs.h - + ;; +esac fi @@ -12707,10 +12949,10 @@ printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h for _libcurl_feature in $_libcurl_features ; do cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1 +#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | sed "$as_sed_cpp"` 1 _ACEOF - eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes + eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | sed "$as_sed_sh"`=yes done if test "x$_libcurl_protocols" = "x" ; then @@ -12738,10 +12980,10 @@ _ACEOF for _libcurl_protocol in $_libcurl_protocols ; do cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1 +#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | sed "$as_sed_cpp"` 1 _ACEOF - eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes + eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | sed "$as_sed_sh"`=yes done else unset CURL_LIB @@ -13718,6 +13960,18 @@ PBX_PJSIP_TLS_TRANSPORT_RESTART=0 + +PJSIP_EVSUB_PENDING_NOTIFY_DESCRIP="PJSIP NOTIFY Required on SUBSCRIBE" +PJSIP_EVSUB_PENDING_NOTIFY_OPTION=pjsip +PJSIP_EVSUB_PENDING_NOTIFY_DIR=${PJPROJECT_DIR} + +PBX_PJSIP_EVSUB_PENDING_NOTIFY=0 + + + + + + fi @@ -14946,10 +15200,11 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define size_t unsigned int" >>confdefs.h - + ;; +esac fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works @@ -14959,8 +15214,8 @@ printf %s "checking for working alloca.h... " >&6; } if test ${ac_cv_working_alloca_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -14975,11 +15230,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_working_alloca_h=yes -else $as_nop - ac_cv_working_alloca_h=no +else case e in #( + e) ac_cv_working_alloca_h=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 printf "%s\n" "$ac_cv_working_alloca_h" >&6; } @@ -14994,10 +15251,10 @@ printf %s "checking for alloca... " >&6; } if test ${ac_cv_func_alloca_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_working_alloca_h = yes; then - ac_cv_func_alloca_works=yes -else +else case e in #( + e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h +if test "$ac_cv_func_alloca_works" != yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -15028,15 +15285,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_func_alloca_works=yes -else $as_nop - ac_cv_func_alloca_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 printf "%s\n" "$ac_cv_func_alloca_works" >&6; } -fi if test $ac_cv_func_alloca_works = yes; then @@ -15058,12 +15314,12 @@ printf %s "checking stack direction for C alloca... " >&6; } if test ${ac_cv_c_stack_direction+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_c_stack_direction=0 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -15086,13 +15342,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_c_stack_direction=1 -else $as_nop - ac_cv_c_stack_direction=-1 +else case e in #( + e) ac_cv_c_stack_direction=-1 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 printf "%s\n" "$ac_cv_c_stack_direction" >&6; } @@ -15103,14 +15362,14 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | sed "$as_sed_sh"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 printf %s "checking for $ac_hdr that defines DIR... " >&6; } if eval test \${$as_ac_Header+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include <$ac_hdr> @@ -15127,10 +15386,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$as_ac_Header=yes" -else $as_nop - eval "$as_ac_Header=no" +else case e in #( + e) eval "$as_ac_Header=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$as_ac_Header { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -15138,7 +15399,7 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Header"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | sed "$as_sed_cpp"` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -15152,15 +15413,21 @@ printf %s "checking for library containing opendir... " >&6; } if test ${ac_cv_search_opendir+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char opendir (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (void); int main (void) { @@ -15191,11 +15458,13 @@ done if test ${ac_cv_search_opendir+y} then : -else $as_nop - ac_cv_search_opendir=no +else case e in #( + e) ac_cv_search_opendir=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 printf "%s\n" "$ac_cv_search_opendir" >&6; } @@ -15212,15 +15481,21 @@ printf %s "checking for library containing opendir... " >&6; } if test ${ac_cv_search_opendir+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char opendir (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (void); int main (void) { @@ -15251,11 +15526,13 @@ done if test ${ac_cv_search_opendir+y} then : -else $as_nop - ac_cv_search_opendir=no +else case e in #( + e) ac_cv_search_opendir=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 printf "%s\n" "$ac_cv_search_opendir" >&6; } @@ -15277,8 +15554,8 @@ printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } if test ${ac_cv_header_sys_wait_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -15302,10 +15579,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_header_sys_wait_h=yes -else $as_nop - ac_cv_header_sys_wait_h=no +else case e in #( + e) ac_cv_header_sys_wait_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } @@ -15419,18 +15698,19 @@ fi # this to check for headers that are only needed by modules. for ac_header in arpa/nameser.h assert.h ctype.h dlfcn.h errno.h fcntl.h float.h grp.h inttypes.h limits.h locale.h math.h pwd.h netinet/in.h regex.h sched.h stdarg.h stdint.h stdio.h stdlib.h string.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h termios.h time.h unistd.h do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 _ACEOF -else $as_nop - +else case e in #( + e) as_fn_error $? "*** A required header was not found." "$LINENO" 5 - + ;; +esac fi done @@ -15487,7 +15767,7 @@ fi # Find required NetBSD Editline library (libedit). - if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then + if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5 @@ -15594,16 +15874,22 @@ printf %s "checking for history_init in -ledit... " >&6; } if test ${ac_cv_lib_edit_history_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ledit ${pbxlibdir} -ltermcap $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. */ -char history_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char history_init (void); int main (void) { @@ -15615,20 +15901,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_edit_history_init=yes -else $as_nop - ac_cv_lib_edit_history_init=no +else case e in #( + e) ac_cv_lib_edit_history_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_init" >&5 printf "%s\n" "$ac_cv_lib_edit_history_init" >&6; } if test "x$ac_cv_lib_edit_history_init" = xyes then : AST_LIBEDIT_FOUND=yes -else $as_nop - AST_LIBEDIT_FOUND=no +else case e in #( + e) AST_LIBEDIT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -15650,8 +15939,9 @@ fi if test "x$ac_cv_header_histedit_h" = xyes then : LIBEDIT_HEADER_FOUND=1 -else $as_nop - LIBEDIT_HEADER_FOUND=0 +else case e in #( + e) LIBEDIT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -15707,10 +15997,11 @@ printf "%s\n" "#define HAVE_LIBEDIT_IS_UNICODE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -15740,16 +16031,22 @@ printf %s "checking for uuid_generate_random in -luuid... " >&6; } if test ${ac_cv_lib_uuid_uuid_generate_random+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-luuid ${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. */ -char uuid_generate_random (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate_random (void); int main (void) { @@ -15761,20 +16058,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_uuid_uuid_generate_random=yes -else $as_nop - ac_cv_lib_uuid_uuid_generate_random=no +else case e in #( + e) ac_cv_lib_uuid_uuid_generate_random=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_random" >&5 printf "%s\n" "$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 $as_nop - AST_LIBUUID_FOUND=no +else case e in #( + e) AST_LIBUUID_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -15796,8 +16096,9 @@ fi if test "x$ac_cv_header_uuid_uuid_h" = xyes then : LIBUUID_HEADER_FOUND=1 -else $as_nop - LIBUUID_HEADER_FOUND=0 +else case e in #( + e) LIBUUID_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -15840,16 +16141,22 @@ printf %s "checking for uuid_generate_random in -le2fs-uuid... " >&6; } if test ${ac_cv_lib_e2fs_uuid_uuid_generate_random+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-le2fs-uuid ${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. */ -char uuid_generate_random (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uuid_generate_random (void); int main (void) { @@ -15861,20 +16168,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_e2fs_uuid_uuid_generate_random=yes -else $as_nop - ac_cv_lib_e2fs_uuid_uuid_generate_random=no +else case e in #( + e) ac_cv_lib_e2fs_uuid_uuid_generate_random=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_e2fs_uuid_uuid_generate_random" >&5 printf "%s\n" "$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 $as_nop - AST_E2FSUUID_FOUND=no +else case e in #( + e) AST_E2FSUUID_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -15896,8 +16206,9 @@ fi if test "x$ac_cv_header_uuid_uuid_h" = xyes then : E2FSUUID_HEADER_FOUND=1 -else $as_nop - E2FSUUID_HEADER_FOUND=0 +else case e in #( + e) E2FSUUID_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -15929,8 +16240,9 @@ if test "x$ac_cv_func_uuid_generate_random" = xyes then : printf "%s\n" "#define HAVE_UUID_GENERATE_RANDOM 1" >>confdefs.h SYSUUID=true -else $as_nop - SYSUUID="" +else case e in #( + e) SYSUUID="" ;; +esac fi done @@ -15948,7 +16260,7 @@ fi # Find required JSON support if bundled is not enabled. if test "$JANSSON_BUNDLED" = "no" ; then - if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then + if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5 @@ -16055,16 +16367,22 @@ printf %s "checking for json_sprintf in -ljansson... " >&6; } if test ${ac_cv_lib_jansson_json_sprintf+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ljansson ${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. */ -char json_sprintf (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char json_sprintf (void); int main (void) { @@ -16076,20 +16394,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_jansson_json_sprintf=yes -else $as_nop - ac_cv_lib_jansson_json_sprintf=no +else case e in #( + e) ac_cv_lib_jansson_json_sprintf=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jansson_json_sprintf" >&5 printf "%s\n" "$ac_cv_lib_jansson_json_sprintf" >&6; } if test "x$ac_cv_lib_jansson_json_sprintf" = xyes then : AST_JANSSON_FOUND=yes -else $as_nop - AST_JANSSON_FOUND=no +else case e in #( + e) AST_JANSSON_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -16111,8 +16432,9 @@ fi if test "x$ac_cv_header_jansson_h" = xyes then : JANSSON_HEADER_FOUND=1 -else $as_nop - JANSSON_HEADER_FOUND=0 +else case e in #( + e) JANSSON_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -16165,10 +16487,11 @@ then : printf "%s\n" "#define AST_JSON_INT_T long long" >>confdefs.h -else $as_nop - +else case e in #( + e) printf "%s\n" "#define AST_JSON_INT_T long" >>confdefs.h - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -16181,7 +16504,7 @@ fi # Find required JWT support if bundled is not enabled. if test "$LIBJWT_BUNDLED" = "no" ; then - if test "x${PBX_LIBJWT}" != "x1" -a "${USE_LIBJWT}" != "no"; then + if test "x${PBX_LIBJWT}" != "x1" -a "${USE_LIBJWT}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjwt >= $LIBJWT_VERSION" >&5 @@ -16292,16 +16615,22 @@ printf %s "checking for clock_gettime in -lrt... " >&6; } if test ${ac_cv_lib_rt_clock_gettime+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lrt ${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. */ -char clock_gettime (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (void); int main (void) { @@ -16313,20 +16642,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_rt_clock_gettime=yes -else $as_nop - ac_cv_lib_rt_clock_gettime=no +else case e in #( + e) ac_cv_lib_rt_clock_gettime=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; } if test "x$ac_cv_lib_rt_clock_gettime" = xyes then : AST_RT_FOUND=yes -else $as_nop - AST_RT_FOUND=no +else case e in #( + e) AST_RT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -16361,7 +16693,7 @@ fi - if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then + if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5 @@ -16459,8 +16791,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_LIBXML2+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_LIBXML2 in +else case e in #( + e) case $CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test with a path. ;; @@ -16486,6 +16818,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2 @@ -16508,8 +16841,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_LIBXML2+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_LIBXML2 in +else case e in #( + e) case $ac_pt_CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_LIBXML2="$ac_pt_CONFIG_LIBXML2" # Let the user override the test with a path. ;; @@ -16535,6 +16868,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2 @@ -16629,16 +16963,22 @@ printf %s "checking for uriParseUriA in -luriparser... " >&6; } if test ${ac_cv_lib_uriparser_uriParseUriA+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-luriparser ${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. */ -char uriParseUriA (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char uriParseUriA (void); int main (void) { @@ -16650,20 +16990,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_uriparser_uriParseUriA=yes -else $as_nop - ac_cv_lib_uriparser_uriParseUriA=no +else case e in #( + e) ac_cv_lib_uriparser_uriParseUriA=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uriparser_uriParseUriA" >&5 printf "%s\n" "$ac_cv_lib_uriparser_uriParseUriA" >&6; } if test "x$ac_cv_lib_uriparser_uriParseUriA" = xyes then : AST_URIPARSER_FOUND=yes -else $as_nop - AST_URIPARSER_FOUND=no +else case e in #( + e) AST_URIPARSER_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -16685,8 +17028,9 @@ fi if test "x$ac_cv_header_uriparser_Uri_h" = xyes then : URIPARSER_HEADER_FOUND=1 -else $as_nop - URIPARSER_HEADER_FOUND=0 +else case e in #( + e) URIPARSER_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -16716,8 +17060,9 @@ then : n|no) DISABLE_XMLDOC=yes ;; *) as_fn_error $? "bad value ${enableval} for --disable-xmldoc" "$LINENO" 5 ;; esac -else $as_nop - DISABLE_XMLDOC=no +else case e in #( + e) DISABLE_XMLDOC=no ;; +esac fi @@ -16747,16 +17092,22 @@ printf %s "checking for xsltLoadStylesheetPI in -lxslt... " >&6; } if test ${ac_cv_lib_xslt_xsltLoadStylesheetPI+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lxslt ${pbxlibdir} ${LIBXML2_LIB} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char xsltLoadStylesheetPI (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char xsltLoadStylesheetPI (void); int main (void) { @@ -16768,20 +17119,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_xslt_xsltLoadStylesheetPI=yes -else $as_nop - ac_cv_lib_xslt_xsltLoadStylesheetPI=no +else case e in #( + e) ac_cv_lib_xslt_xsltLoadStylesheetPI=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltLoadStylesheetPI" >&5 printf "%s\n" "$ac_cv_lib_xslt_xsltLoadStylesheetPI" >&6; } if test "x$ac_cv_lib_xslt_xsltLoadStylesheetPI" = xyes then : AST_LIBXSLT_FOUND=yes -else $as_nop - AST_LIBXSLT_FOUND=no +else case e in #( + e) AST_LIBXSLT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -16803,8 +17157,9 @@ fi if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes then : LIBXSLT_HEADER_FOUND=1 -else $as_nop - LIBXSLT_HEADER_FOUND=0 +else case e in #( + e) LIBXSLT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -16843,16 +17198,22 @@ printf %s "checking for xsltCleanupGlobals in -lxslt... " >&6; } if test ${ac_cv_lib_xslt_xsltCleanupGlobals+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lxslt ${pbxlibdir} ${LIBXML2_LIB} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char xsltCleanupGlobals (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char xsltCleanupGlobals (void); int main (void) { @@ -16864,20 +17225,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_xslt_xsltCleanupGlobals=yes -else $as_nop - ac_cv_lib_xslt_xsltCleanupGlobals=no +else case e in #( + e) ac_cv_lib_xslt_xsltCleanupGlobals=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5 printf "%s\n" "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; } if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes then : AST_LIBXSLT_CLEANUP_FOUND=yes -else $as_nop - AST_LIBXSLT_CLEANUP_FOUND=no +else case e in #( + e) AST_LIBXSLT_CLEANUP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -16899,8 +17263,9 @@ fi if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes then : LIBXSLT_CLEANUP_HEADER_FOUND=1 -else $as_nop - LIBXSLT_CLEANUP_HEADER_FOUND=0 +else case e in #( + e) LIBXSLT_CLEANUP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -16929,8 +17294,9 @@ then : n|no) PERMANENT_DLOPEN=no ;; *) as_fn_error $? "bad value ${enableval} for --enable-permanent-dlopen" "$LINENO" 5 ;; esac -else $as_nop - PERMANENT_DLOPEN=no +else case e in #( + e) PERMANENT_DLOPEN=no ;; +esac fi @@ -16968,10 +17334,11 @@ ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ if test "x$ac_cv_header_sys_poll_h" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define AST_POLL_COMPAT 1" >>confdefs.h - + ;; +esac fi @@ -16980,31 +17347,34 @@ if test ${enable_largefile+y} then : enableval=$enable_largefile; fi - -if test "$enable_largefile" != no; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -printf %s "checking for special C compiler options needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_CC+y} +if test "$enable_largefile,$enable_year2038" != no,no +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 +printf %s "checking for $CC option to enable large file support... " >&6; } +if test ${ac_cv_sys_largefile_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) ac_save_CC="$CC" + ac_opt_found=no + for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do + if test x"$ac_opt" != x"none needed" +then : + CC="$ac_save_CC $ac_opt" +fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, +#ifndef FTYPE +# define FTYPE off_t +#endif + /* Check that FTYPE can represent 2**63 - 1 correctly. + We can't simply define LARGE_FTYPE to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) +#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31)) + int FTYPE_is_large[(LARGE_FTYPE % 2147483629 == 721 + && LARGE_FTYPE % 2147483647 == 1) ? 1 : -1]; int main (void) @@ -17014,47 +17384,88 @@ main (void) return 0; } _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_opt" = x"none needed" +then : + # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t. + CC="$CC -DFTYPE=ino_t" if ac_fn_c_try_compile "$LINENO" then : - break + +else case e in #( + e) CC="$CC -D_FILE_OFFSET_BITS=64" + if ac_fn_c_try_compile "$LINENO" +then : + ac_opt='-D_FILE_OFFSET_BITS=64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi + ac_cv_sys_largefile_opts=$ac_opt + ac_opt_found=yes fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test $ac_opt_found = no || break + done + CC="$ac_save_CC" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test ${ac_cv_sys_file_offset_bits+y} + test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 +printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } + +ac_have_largefile=yes +case $ac_cv_sys_largefile_opts in #( + "none needed") : + ;; #( + "supported through gnulib") : + ;; #( + "support not detected") : + ac_have_largefile=no ;; #( + "-D_FILE_OFFSET_BITS=64") : + +printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h + ;; #( + "-D_LARGE_FILES=1") : + +printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h + ;; #( + "-n32") : + CC="$CC -n32" ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +esac + +if test "$enable_year2038" != no +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5 +printf %s "checking for $CC option for timestamps after 2038... " >&6; } +if test ${ac_cv_sys_year2038_opts+y} then : printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" + ac_opt_found=no + for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do + if test x"$ac_opt" != x"none needed" +then : + CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" +fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + + #include + /* Check that time_t can represent 2**32 - 1 correctly. */ + #define LARGE_TIME_T \\ + ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) + int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 + && LARGE_TIME_T % 65537 == 0) + ? 1 : -1]; + int main (void) { @@ -17065,120 +17476,47 @@ main (void) _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_file_offset_bits=no; break + ac_cv_sys_year2038_opts="$ac_opt" + ac_opt_found=yes fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h -;; + test $ac_opt_found = no || break + done + CPPFLAGS="$ac_save_CPPFLAGS" + test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;; esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -if test ${ac_cv_sys_large_files+y} -then : - printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 +printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ +ac_have_year2038=yes +case $ac_cv_sys_year2038_opts in #( + "none needed") : + ;; #( + "support not detected") : + ac_have_year2038=no ;; #( + "-D_TIME_BITS=64") : - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h -;; +printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h + ;; #( + "-D__MINGW_USE_VC2005_COMPAT") : + +printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h + ;; #( + "-U_USE_32_BIT_TIME_T"*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It +will stop working after mid-January 2038. Remove +_USE_32BIT_TIME_T from the compiler flags. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; esac -rm -rf conftest* - fi + fi +fi # Checks for typedefs, structures, and compiler characteristics. ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" @@ -17190,25 +17528,25 @@ printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -printf %s "checking for stdbool.h that conforms to C99... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99 or later" >&5 +printf %s "checking for stdbool.h that conforms to C99 or later... " >&6; } if test ${ac_cv_header_stdbool_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef __bool_true_false_are_defined - #error "__bool_true_false_are_defined is not defined" - #endif - char a[__bool_true_false_are_defined == 1 ? 1 : -1]; + /* "true" and "false" should be usable in #if expressions and + integer constant expressions, and "bool" should be a valid + type name. - /* Regardless of whether this is C++ or "_Bool" is a - valid type name, "true" and "false" should be usable - in #if expressions and integer constant expressions, - and "bool" should be a valid type name. */ + Although C99 requires bool, true, and false to be macros, + C23 and C++11 overrule that, so do not test for that. + Although C99 requires __bool_true_false_are_defined and + _Bool, C23 says they are obsolescent, so do not require + them. */ #if !true #error "'true' is not true" @@ -17242,43 +17580,12 @@ else $as_nop char n[sizeof m == h * sizeof m[0] ? 1 : -1]; char o[-1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html */ bool p = true; bool *pp = &p; - /* C 1999 specifies that bool, true, and false are to be - macros, but C++ 2011 and later overrule this. */ - #if __cplusplus < 201103 - #ifndef bool - #error "bool is not defined" - #endif - #ifndef false - #error "false is not defined" - #endif - #ifndef true - #error "true is not defined" - #endif - #endif - - /* If _Bool is available, repeat with it all the tests - above that used bool. */ - #ifdef HAVE__BOOL - struct sB { _Bool s: 1; _Bool t; } t; - - char q[(_Bool) 0.5 == true ? 1 : -1]; - char r[(_Bool) 0.0 == false ? 1 : -1]; - char u[sizeof (_Bool) > 0 ? 1 : -1]; - char v[sizeof t.t > 0 ? 1 : -1]; - - _Bool w[h]; - char x[sizeof m == h * sizeof m[0] ? 1 : -1]; - char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; - _Bool z = true; - _Bool *pz = &p; - #endif - int main (void) { @@ -17287,20 +17594,10 @@ main (void) *pp |= p; *pp |= ! p; - #ifdef HAVE__BOOL - _Bool pt = &t; - *pz |= z; - *pz |= ! z; - #endif - /* Refer to every declared value, so they cannot be discarded as unused. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k - + !l + !m + !n + !o + !p + !pp + !ps - #ifdef HAVE__BOOL - + !q + !r + !u + !v + !w + !x + !y + !z + !pt - #endif - ); + return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k + + !l + !m + !n + !o + !p + !pp + !ps); ; return 0; @@ -17309,10 +17606,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_header_stdbool_h=yes -else $as_nop - ac_cv_header_stdbool_h=no +else case e in #( + e) ac_cv_header_stdbool_h=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } @@ -17328,8 +17627,8 @@ printf %s "checking for an ANSI C-conforming const... " >&6; } if test ${ac_cv_c_const+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17393,10 +17692,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_const=yes -else $as_nop - ac_cv_c_const=no +else case e in #( + e) ac_cv_c_const=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 printf "%s\n" "$ac_cv_c_const" >&6; } @@ -17406,36 +17707,26 @@ printf "%s\n" "#define const /**/" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -printf %s "checking for uid_t in sys/types.h... " >&6; } -if test ${ac_cv_type_uid_t+y} +ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" +if test "x$ac_cv_type_uid_t" = xyes then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1 -then : - ac_cv_type_uid_t=yes -else $as_nop - ac_cv_type_uid_t=no -fi -rm -rf conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -printf "%s\n" "$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then +else case e in #( + e) printf "%s\n" "#define uid_t int" >>confdefs.h + ;; +esac +fi +ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default" +if test "x$ac_cv_type_gid_t" = xyes +then : +else case e in #( + e) printf "%s\n" "#define gid_t int" >>confdefs.h - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 @@ -17443,8 +17734,8 @@ printf %s "checking for inline... " >&6; } if test ${ac_cv_c_inline+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_c_inline=no +else case e in #( + e) ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17462,7 +17753,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 printf "%s\n" "$ac_cv_c_inline" >&6; } @@ -17488,8 +17780,8 @@ printf %s "checking for long double with more range or precision than double... if test ${ac_cv_type_long_double_wider+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include long double const a[] = @@ -17523,10 +17815,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_type_long_double_wider=yes -else $as_nop - ac_cv_type_long_double_wider=no +else case e in #( + e) ac_cv_type_long_double_wider=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5 printf "%s\n" "$ac_cv_type_long_double_wider" >&6; } @@ -17540,20 +17834,22 @@ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" if test "x$ac_cv_type_mode_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define mode_t int" >>confdefs.h - + ;; +esac fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" if test "x$ac_cv_type_off_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define off_t long int" >>confdefs.h - + ;; +esac fi @@ -17562,8 +17858,8 @@ fi if test "x$ac_cv_type_pid_t" = xyes then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined _WIN64 && !defined __CYGWIN__ @@ -17582,14 +17878,16 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_pid_type='int' -else $as_nop - ac_pid_type='__int64' +else case e in #( + e) ac_pid_type='__int64' ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h - + ;; +esac fi @@ -17597,10 +17895,11 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define size_t unsigned int" >>confdefs.h - + ;; +esac fi ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" @@ -17658,8 +17957,8 @@ printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; } if test ${ac_cv_struct_tm+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -17677,10 +17976,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_struct_tm=time.h -else $as_nop - ac_cv_struct_tm=sys/time.h +else case e in #( + e) ac_cv_struct_tm=sys/time.h ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 printf "%s\n" "$ac_cv_struct_tm" >&6; } @@ -17695,8 +17996,8 @@ printf %s "checking for working volatile... " >&6; } if test ${ac_cv_c_volatile+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17713,10 +18014,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_c_volatile=yes -else $as_nop - ac_cv_c_volatile=no +else case e in #( + e) ac_cv_c_volatile=no ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 printf "%s\n" "$ac_cv_c_volatile" >&6; } @@ -17776,8 +18079,8 @@ printf %s "checking for working chown... " >&6; } if test ${ac_cv_func_chown_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # (( # Guess yes on glibc systems. @@ -17785,8 +18088,8 @@ then : # If we don't know, assume the worst. *) ac_cv_func_chown_works=no ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #include @@ -17814,15 +18117,18 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_chown_works=yes -else $as_nop - ac_cv_func_chown_works=no +else case e in #( + e) ac_cv_func_chown_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f conftest.chown - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5 printf "%s\n" "$ac_cv_func_chown_works" >&6; } @@ -17837,8 +18143,8 @@ printf %s "checking whether closedir returns void... " >&6; } if test ${ac_cv_func_closedir_void+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <$ac_header_dirent> @@ -17856,10 +18162,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_func_closedir_void=no -else $as_nop - ac_cv_func_closedir_void=yes +else case e in #( + e) ac_cv_func_closedir_void=yes ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5 printf "%s\n" "$ac_cv_func_closedir_void" >&6; } @@ -17874,8 +18182,8 @@ printf %s "checking for error_at_line... " >&6; } if test ${ac_cv_lib_error_at_line+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -17889,11 +18197,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_error_at_line=yes -else $as_nop - ac_cv_lib_error_at_line=no +else case e in #( + e) ac_cv_lib_error_at_line=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } @@ -17932,12 +18242,12 @@ printf %s "checking for working fork... " >&6; } if test ${ac_cv_func_fork_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_func_fork_works=cross -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -17954,13 +18264,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_fork_works=yes -else $as_nop - ac_cv_func_fork_works=no +else case e in #( + e) ac_cv_func_fork_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 printf "%s\n" "$ac_cv_func_fork_works" >&6; } @@ -17988,12 +18301,12 @@ printf %s "checking for working vfork... " >&6; } if test ${ac_cv_func_vfork_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_func_vfork_works=cross -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ $ac_includes_default @@ -18104,13 +18417,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_vfork_works=yes -else $as_nop - ac_cv_func_vfork_works=no +else case e in #( + e) ac_cv_func_vfork_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 printf "%s\n" "$ac_cv_func_vfork_works" >&6; } @@ -18139,119 +18455,100 @@ printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_source+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for declarations of fseeko and ftello" >&5 +printf %s "checking for declarations of fseeko and ftello... " >&6; } +if test ${ac_cv_func_fseeko_ftello+y} then : printf %s "(cached) " >&6 -else $as_nop - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include /* for off_t */ - #include -int -main (void) -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_sys_largefile_source=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include -int -main (void) -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_sys_largefile_source=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ac_cv_sys_largefile_source=unknown - break -done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } -case $ac_cv_sys_largefile_source in #( - no | unknown) ;; - *) -printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h -;; -esac -rm -rf conftest* -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -if test $ac_cv_sys_largefile_source != unknown; then +#if defined __hpux && !defined _LARGEFILE_SOURCE +# include +# if LONG_MAX >> 31 == 0 +# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" +# endif +#endif +#include /* for off_t */ +#include + +int +main (void) +{ + + int (*fp1) (FILE *, off_t, int) = fseeko; + off_t (*fp2) (FILE *) = ftello; + return fseeko (stdin, 0, 0) + && fp1 (stdin, 0, 0) + && ftello (stdin) >= 0 + && fp2 (stdin) >= 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_func_fseeko_ftello=yes +else case e in #( + e) ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE=1" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __hpux && !defined _LARGEFILE_SOURCE +# include +# if LONG_MAX >> 31 == 0 +# error "32-bit HP-UX 11/ia64 needs _LARGEFILE_SOURCE for fseeko in C++" +# endif +#endif +#include /* for off_t */ +#include + +int +main (void) +{ + + int (*fp1) (FILE *, off_t, int) = fseeko; + off_t (*fp2) (FILE *) = ftello; + return fseeko (stdin, 0, 0) + && fp1 (stdin, 0, 0) + && ftello (stdin) >= 0 + && fp2 (stdin) >= 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_func_fseeko_ftello="need _LARGEFILE_SOURCE" +else case e in #( + e) ac_cv_func_fseeko_ftello=no ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fseeko_ftello" >&5 +printf "%s\n" "$ac_cv_func_fseeko_ftello" >&6; } +if test "$ac_cv_func_fseeko_ftello" != no +then : printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h fi - -if test $ac_cv_c_compiler_gnu = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -printf %s "checking whether $CC needs -traditional... " >&6; } -if test ${ac_cv_prog_gcc_traditional+y} +if test "$ac_cv_func_fseeko_ftello" = "need _LARGEFILE_SOURCE" then : - printf %s "(cached) " >&6 -else $as_nop - ac_pattern="Autoconf.*'x'" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1 -then : - ac_cv_prog_gcc_traditional=yes -else $as_nop - ac_cv_prog_gcc_traditional=no -fi -rm -rf conftest* +printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h - if test $ac_cv_prog_gcc_traditional = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1 -then : - ac_cv_prog_gcc_traditional=yes fi -rm -rf conftest* - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi # XXX: these are commented out until we determine whether it matters if our malloc() # acts exactly like glibc's or not @@ -18262,12 +18559,12 @@ printf %s "checking for working memcmp... " >&6; } if test ${ac_cv_func_memcmp_working+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_func_memcmp_working=no -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18305,13 +18602,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_memcmp_working=yes -else $as_nop - ac_cv_func_memcmp_working=no +else case e in #( + e) ac_cv_func_memcmp_working=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 printf "%s\n" "$ac_cv_func_memcmp_working" >&6; } @@ -18343,8 +18643,8 @@ printf %s "checking for working mmap... " >&6; } if test ${ac_cv_func_mmap_fixed_mapped+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # (( # Guess yes on platforms where we know the result. @@ -18352,8 +18652,8 @@ then : # If we don't know, assume the worst. *) ac_cv_func_mmap_fixed_mapped=no ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default /* malloc might have been renamed as rpl_malloc. */ @@ -18374,21 +18674,21 @@ $ac_includes_default VM page cache was not coherent with the file system buffer cache like early versions of FreeBSD and possibly contemporary NetBSD.) For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ + propagated back to all the places they're supposed to be. */ #include #include -/* This mess was copied from the GNU getpagesize.h. */ -#ifndef HAVE_GETPAGESIZE +#ifndef getpagesize +/* Prefer sysconf to the legacy getpagesize function, as getpagesize has + been removed from POSIX and is limited to page sizes that fit in 'int'. */ # ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ +# define getpagesize() sysconf (_SC_PAGESIZE) +# elif defined _SC_PAGE_SIZE +# define getpagesize() sysconf (_SC_PAGE_SIZE) +# elif HAVE_GETPAGESIZE +int getpagesize (); +# else # ifdef HAVE_SYS_PARAM_H # include # ifdef EXEC_PAGESIZE @@ -18412,16 +18712,15 @@ $ac_includes_default # else /* no HAVE_SYS_PARAM_H */ # define getpagesize() 8192 /* punt totally */ # endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ +# endif +#endif int main (void) { char *data, *data2, *data3; const char *cdata2; - int i, pagesize; + long i, pagesize; int fd, fd2; pagesize = getpagesize (); @@ -18455,8 +18754,7 @@ main (void) if (*(data2 + i)) return 7; close (fd2); - if (munmap (data2, pagesize)) - return 8; + /* 'return 8;' not currently used. */ /* Next, try to mmap the file at a fixed address which already has something else allocated at it. If we can, also make sure that @@ -18493,13 +18791,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_mmap_fixed_mapped=yes -else $as_nop - ac_cv_func_mmap_fixed_mapped=no +else case e in #( + e) ac_cv_func_mmap_fixed_mapped=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; } @@ -18518,8 +18819,8 @@ printf %s "checking types of arguments for select... " >&6; } if test ${ac_cv_func_select_args+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_func_select_args='int,int *,struct timeval *' +else case e in #( + e) ac_cv_func_select_args='int,int *,struct timeval *' for ac_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do @@ -18551,7 +18852,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done done done - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 printf "%s\n" "$ac_cv_func_select_args" >&6; } @@ -18575,8 +18877,8 @@ printf %s "checking whether lstat correctly handles trailing slash... " >&6; } if test ${ac_cv_func_lstat_dereferences_slashed_symlink+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -f conftest.sym conftest.file +else case e in #( + e) rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then if test "$cross_compiling" = yes @@ -18587,8 +18889,8 @@ then : # If we don't know, assume the worst. *) ac_cv_func_lstat_dereferences_slashed_symlink=no ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18606,20 +18908,23 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_lstat_dereferences_slashed_symlink=yes -else $as_nop - ac_cv_func_lstat_dereferences_slashed_symlink=no +else case e in #( + e) ac_cv_func_lstat_dereferences_slashed_symlink=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi else - # If the `ln -s' command failed, then we probably don't even + # If the 'ln -s' command failed, then we probably don't even # have an lstat function. ac_cv_func_lstat_dereferences_slashed_symlink=no fi rm -f conftest.sym conftest.file - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 printf "%s\n" "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } @@ -18643,12 +18948,12 @@ printf %s "checking whether stat accepts an empty string... " >&6; } if test ${ac_cv_func_stat_empty_string_bug+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_func_stat_empty_string_bug=yes -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18663,13 +18968,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_stat_empty_string_bug=no -else $as_nop - ac_cv_func_stat_empty_string_bug=yes +else case e in #( + e) ac_cv_func_stat_empty_string_bug=yes ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 printf "%s\n" "$ac_cv_func_stat_empty_string_bug" >&6; } @@ -18690,8 +18998,8 @@ printf %s "checking for working strcoll... " >&6; } if test ${ac_cv_func_strcoll_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : case "$host_os" in # (( # Guess yes on glibc systems. @@ -18699,8 +19007,8 @@ then : # If we don't know, assume the worst. *) ac_cv_func_strcoll_works=no ;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18716,13 +19024,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_strcoll_works=yes -else $as_nop - ac_cv_func_strcoll_works=no +else case e in #( + e) ac_cv_func_strcoll_works=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5 printf "%s\n" "$ac_cv_func_strcoll_works" >&6; } @@ -18740,23 +19051,29 @@ if test "x$ac_cv_func_strftime" = xyes then : printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h -else $as_nop - # strftime is in -lintl on SCO UNIX. +else case e in #( + e) # strftime is in -lintl on SCO UNIX. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5 printf %s "checking for strftime in -lintl... " >&6; } if test ${ac_cv_lib_intl_strftime+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $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. */ -char strftime (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char strftime (void); int main (void) { @@ -18768,12 +19085,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_intl_strftime=yes -else $as_nop - ac_cv_lib_intl_strftime=no +else case e in #( + e) ac_cv_lib_intl_strftime=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5 printf "%s\n" "$ac_cv_lib_intl_strftime" >&6; } @@ -18783,7 +19102,8 @@ then : LIBS="-lintl $LIBS" fi - + ;; +esac fi done @@ -18792,16 +19112,16 @@ printf %s "checking for working strnlen... " >&6; } if test ${ac_cv_func_strnlen_working+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : # Guess no on AIX systems, yes otherwise. case "$host_os" in aix*) ac_cv_func_strnlen_working=no;; *) ac_cv_func_strnlen_working=yes;; esac -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -18830,13 +19150,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_strnlen_working=yes -else $as_nop - ac_cv_func_strnlen_working=no +else case e in #( + e) ac_cv_func_strnlen_working=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5 printf "%s\n" "$ac_cv_func_strnlen_working" >&6; } @@ -18852,18 +19175,15 @@ printf %s "checking for working strtod... " >&6; } if test ${ac_cv_func_strtod+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_func_strtod=no -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default -#ifndef strtod -double strtod (); -#endif int main (void) { @@ -18893,13 +19213,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_strtod=yes -else $as_nop - ac_cv_func_strtod=no +else case e in #( + e) ac_cv_func_strtod=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 printf "%s\n" "$ac_cv_func_strtod" >&6; } @@ -18922,16 +19245,22 @@ printf %s "checking for pow in -lm... " >&6; } if test ${ac_cv_lib_m_pow+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lm $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. */ -char pow (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pow (void); int main (void) { @@ -18943,21 +19272,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_m_pow=yes -else $as_nop - ac_cv_lib_m_pow=no +else case e in #( + e) ac_cv_lib_m_pow=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 printf "%s\n" "$ac_cv_lib_m_pow" >&6; } if test "x$ac_cv_lib_m_pow" = xyes then : POW_LIB=-lm -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -printf "%s\n" "$as_me: WARNING: cannot find library containing definition of pow" >&2;} +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +printf "%s\n" "$as_me: WARNING: cannot find library containing definition of pow" >&2;} ;; +esac fi fi @@ -18971,14 +19303,14 @@ printf %s "checking whether utime accepts a null argument... " >&6; } if test ${ac_cv_func_utime_null+y} then : printf %s "(cached) " >&6 -else $as_nop - rm -f conftest.data; >conftest.data +else case e in #( + e) rm -f conftest.data; >conftest.data # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. if test "$cross_compiling" = yes then : ac_cv_func_utime_null='guessing yes' -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default #ifdef HAVE_UTIME_H @@ -19000,13 +19332,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_func_utime_null=yes -else $as_nop - ac_cv_func_utime_null=no +else case e in #( + e) ac_cv_func_utime_null=no ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5 printf "%s\n" "$ac_cv_func_utime_null" >&6; } @@ -19413,10 +19748,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_HTONLL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19441,10 +19777,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_NTOHLL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19456,16 +19793,22 @@ printf %s "checking for sqrt in -lm... " >&6; } if test ${ac_cv_lib_m_sqrt+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lm $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. */ -char sqrt (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqrt (void); int main (void) { @@ -19477,12 +19820,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_m_sqrt=yes -else $as_nop - ac_cv_lib_m_sqrt=no +else case e in #( + e) ac_cv_lib_m_sqrt=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 printf "%s\n" "$ac_cv_lib_m_sqrt" >&6; } @@ -19787,10 +20132,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_LLONG_MAX 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19815,10 +20161,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_TIMERSUB 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19849,10 +20196,11 @@ then : PBX_DYNAMIC_LIST=1 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19890,8 +20238,9 @@ then : n|no) AST_ASTERISKSSL=no ;; *) as_fn_error $? "bad value ${enableval} for --disable-asteriskssl" "$LINENO" 5 ;; esac -else $as_nop - AST_ASTERISKSSL=yes +else case e in #( + e) AST_ASTERISKSSL=yes ;; +esac fi @@ -19925,10 +20274,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PKTINFO 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -19939,8 +20289,8 @@ printf %s "checking for $CC options needed to detect all undeclared functions... if test ${ac_cv_c_undeclared_builtin_options+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_CFLAGS=$CFLAGS +else case e in #( + e) ac_save_CFLAGS=$CFLAGS ac_cv_c_undeclared_builtin_options='cannot detect' for ac_arg in '' -fno-builtin; do CFLAGS="$ac_save_CFLAGS $ac_arg" @@ -19959,8 +20309,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - # This test program should compile successfully. +else case e in #( + e) # This test program should compile successfully. # No library function is consistently available on # freestanding implementations, so test against a dummy # declaration. Include always-available headers on the @@ -19988,26 +20338,29 @@ then : if test x"$ac_arg" = x then : ac_cv_c_undeclared_builtin_options='none needed' -else $as_nop - ac_cv_c_undeclared_builtin_options=$ac_arg +else case e in #( + e) ac_cv_c_undeclared_builtin_options=$ac_arg ;; +esac fi break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done CFLAGS=$ac_save_CFLAGS - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } case $ac_cv_c_undeclared_builtin_options in #( 'cannot detect') : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot make $CC report undeclared builtins -See \`config.log' for more details" "$LINENO" 5; } ;; #( +See 'config.log' for more details" "$LINENO" 5; } ;; #( 'none needed') : ac_c_undeclared_builtin_options='' ;; #( *) : @@ -20021,15 +20374,17 @@ ac_fn_check_decl "$LINENO" "gethostbyname_r" "ac_cv_have_decl_gethostbyname_r" " if test "x$ac_cv_have_decl_gethostbyname_r" = xyes then : ac_have_decl=1 -else $as_nop - ac_have_decl=0 +else case e in #( + e) ac_have_decl=0 ;; +esac fi printf "%s\n" "#define HAVE_DECL_GETHOSTBYNAME_R $ac_have_decl" >>confdefs.h if test $ac_have_decl = 1 then : have_gethostbyname_r_public_declaration=yes -else $as_nop - have_gethostbyname_r_public_declaration=no +else case e in #( + e) have_gethostbyname_r_public_declaration=no ;; +esac fi @@ -20040,15 +20395,21 @@ printf %s "checking for library containing gethostbyname_r... " >&6; } if test ${ac_cv_search_gethostbyname_r+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char gethostbyname_r (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname_r (void); int main (void) { @@ -20079,11 +20440,13 @@ done if test ${ac_cv_search_gethostbyname_r+y} then : -else $as_nop - ac_cv_search_gethostbyname_r=no +else case e in #( + e) ac_cv_search_gethostbyname_r=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname_r" >&5 printf "%s\n" "$ac_cv_search_gethostbyname_r" >&6; } @@ -20116,10 +20479,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_6 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20145,10 +20509,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_5 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20183,10 +20548,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_SYS_ENDIAN_SWAP16 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20211,10 +20577,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_SYS_ENDIAN_BSWAP16 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20239,8 +20606,8 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_LOCALE_T_IN_LOCALE_H 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale_t in xlocale.h" >&5 printf %s "checking for locale_t in xlocale.h... " >&6; } @@ -20262,14 +20629,16 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_LOCALE_T_IN_XLOCALE_H 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20294,10 +20663,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_O_EVTONLY 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20322,10 +20692,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_O_SYMLINK 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20367,10 +20738,11 @@ printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_INITIALIZER 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -20398,10 +20770,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20426,10 +20799,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PTHREAD_MUTEX_RECURSIVE_NP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20454,10 +20828,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20482,10 +20857,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PTHREAD_SPINLOCK 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20517,13 +20893,14 @@ then : printf "%s\n" "yes" >&6; } ac_cv_pthread_rwlock_timedwrlock="yes" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_cv_pthread_rwlock_timedwrlock="no" - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20541,8 +20918,8 @@ printf "%s\n" "$as_me: WARNING: result yes guessed because of cross compilation" printf "%s\n" "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -20560,12 +20937,14 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi @@ -20601,13 +20980,14 @@ then : printf "%s\n" "no" >&6; } ac_cv_pthread_once_needsbraces="no" -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } ac_cv_pthread_once_needsbraces="yes" - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_CFLAGS}" @@ -20654,10 +21034,11 @@ printf "%s\n" "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP 1" >>confdefs -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -20691,10 +21072,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define CAN_COMPARE_MUTEX_TO_INIT_VALUE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20735,10 +21117,11 @@ ax_cv_have_gcc_atomics=1 printf "%s\n" "#define HAVE_GCC_ATOMICS 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20764,10 +21147,11 @@ ax_cv_have_c_atomics=1 printf "%s\n" "#define HAVE_C_ATOMICS 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -20785,8 +21169,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 printf "%s\n" "unknown" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -20804,12 +21188,14 @@ printf "%s\n" "#define HAVE_NULLSAFE_PRINTF 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi @@ -20820,8 +21206,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5 printf "%s\n" "cross-compile" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef HAVE_SYS_TYPES_H @@ -20851,12 +21237,14 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_SOCK_NONBLOCK 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi @@ -20867,8 +21255,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5 printf "%s\n" "cross-compile" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -20909,24 +21297,26 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_VARIABLE_FDSET 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi if test "${ac_cv_have_variable_fdset}x" = "0x"; then if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -20948,7 +21338,8 @@ printf "%s\n" "#define CONFIGURE_RAN_AS_ROOT 1" >>confdefs.h fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi fi @@ -20960,8 +21351,8 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5 printf "%s\n" "cross-compile" >&6; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -20979,12 +21370,14 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_EVENTFD 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi @@ -21016,10 +21409,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_pure 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21055,10 +21449,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_malloc 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21094,10 +21489,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_const 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21133,10 +21529,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_unused 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21172,10 +21569,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_always_inline 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21211,10 +21609,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_deprecated 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21250,10 +21649,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_sentinel 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21289,10 +21689,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_warn_unused_result 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21328,10 +21729,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_may_alias 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21367,10 +21769,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_constructor 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21410,10 +21813,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_destructor 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21452,10 +21856,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ATTRIBUTE_noreturn 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -21486,11 +21891,12 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } AST_ADDRESS_SANITIZER=1 -else $as_nop - AST_ADDRESS_SANITIZER=0 +else case e in #( + e) AST_ADDRESS_SANITIZER=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_sanitize_CFLAGS}" @@ -21519,11 +21925,12 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } AST_THREAD_SANITIZER=1 -else $as_nop - AST_THREAD_SANITIZER=0 +else case e in #( + e) AST_THREAD_SANITIZER=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_sanitize_CFLAGS}" @@ -21552,11 +21959,12 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } AST_LEAK_SANITIZER=1 -else $as_nop - AST_LEAK_SANITIZER=0 +else case e in #( + e) AST_LEAK_SANITIZER=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_sanitize_CFLAGS}" @@ -21585,11 +21993,12 @@ then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } AST_UNDEFINED_SANITIZER=1 -else $as_nop - AST_UNDEFINED_SANITIZER=0 +else case e in #( + e) AST_UNDEFINED_SANITIZER=0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_sanitize_CFLAGS}" @@ -21722,8 +22131,9 @@ then : n|no) check_rpath=no ;; *) as_fn_error $? "bad value ${enableval} for --disable-rpath" "$LINENO" 5 ;; esac -else $as_nop - check_rpath=yes +else case e in #( + e) check_rpath=yes ;; +esac fi @@ -21764,10 +22174,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21777,15 +22188,21 @@ printf %s "checking for library containing res_9_ninit... " >&6; } if test ${ac_cv_search_res_9_ninit+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char res_9_ninit (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_ninit (void); int main (void) { @@ -21816,11 +22233,13 @@ done if test ${ac_cv_search_res_9_ninit+y} then : -else $as_nop - ac_cv_search_res_9_ninit=no +else case e in #( + e) ac_cv_search_res_9_ninit=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ninit" >&5 printf "%s\n" "$ac_cv_search_res_9_ninit" >&6; } @@ -21870,15 +22289,21 @@ printf %s "checking for library containing res_9_ndestroy... " >&6; } if test ${ac_cv_search_res_9_ndestroy+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char res_9_ndestroy (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_ndestroy (void); int main (void) { @@ -21909,11 +22334,13 @@ done if test ${ac_cv_search_res_9_ndestroy+y} then : -else $as_nop - ac_cv_search_res_9_ndestroy=no +else case e in #( + e) ac_cv_search_res_9_ndestroy=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ndestroy" >&5 printf "%s\n" "$ac_cv_search_res_9_ndestroy" >&6; } @@ -21954,10 +22381,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -21966,15 +22394,21 @@ printf %s "checking for library containing res_9_close... " >&6; } if test ${ac_cv_search_res_9_close+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$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. */ -char res_9_close (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_close (void); int main (void) { @@ -22005,11 +22439,13 @@ done if test ${ac_cv_search_res_9_close+y} then : -else $as_nop - ac_cv_search_res_9_close=no +else case e in #( + e) ac_cv_search_res_9_close=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_close" >&5 printf "%s\n" "$ac_cv_search_res_9_close" >&6; } @@ -22050,10 +22486,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_RES_CLOSE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -22067,10 +22504,11 @@ printf "%s\n" "#define HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS 1" >>confdefs.h fi -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -22095,10 +22533,11 @@ if ac_fn_c_try_compile "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -BIND8_CFLAGS=-DBIND_8_COMPAT +BIND8_CFLAGS=-DBIND_8_COMPAT ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -22140,10 +22579,11 @@ printf "%s\n" "#define HAVE_GLOB_NOMAGIC 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -22188,10 +22628,11 @@ printf "%s\n" "#define HAVE_GLOB_BRACE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -22236,10 +22677,11 @@ printf "%s\n" "#define HAVE_RTLD_NOLOAD 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -22284,10 +22726,11 @@ printf "%s\n" "#define HAVE_IP_MTU_DISCOVER 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -22297,28 +22740,30 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 printf %s "checking size of int... " >&6; } if test ${ac_cv_sizeof_int+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_int" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_int" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 printf "%s\n" "$ac_cv_sizeof_int" >&6; } @@ -22330,28 +22775,30 @@ printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 printf "%s\n" "$ac_cv_sizeof_long" >&6; } @@ -22363,28 +22810,30 @@ printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 printf %s "checking size of long long... " >&6; } if test ${ac_cv_sizeof_long_long+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_long_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_long_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } @@ -22396,28 +22845,30 @@ printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5 printf %s "checking size of char *... " >&6; } if test ${ac_cv_sizeof_char_p+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_char_p" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_char_p" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (char *) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_char_p=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5 printf "%s\n" "$ac_cv_sizeof_char_p" >&6; } @@ -22429,28 +22880,30 @@ printf "%s\n" "#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 printf %s "checking size of long... " >&6; } if test ${ac_cv_sizeof_long+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 printf "%s\n" "$ac_cv_sizeof_long" >&6; } @@ -22462,28 +22915,30 @@ printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 printf %s "checking size of long long... " >&6; } if test ${ac_cv_sizeof_long_long+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_long_long" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_long_long" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } @@ -22503,28 +22958,30 @@ fi # previous test as a cached value to set the right output variables. # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of fd_set.fds_bits" >&5 printf %s "checking size of fd_set.fds_bits... " >&6; } if test ${ac_cv_sizeof_fd_set_fds_bits+y} then : printf %s "(cached) " >&6 -else $as_nop - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fd_set.fds_bits))" "ac_cv_sizeof_fd_set_fds_bits" "$ac_includes_default" +else case e in #( + e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fd_set.fds_bits))" "ac_cv_sizeof_fd_set_fds_bits" "$ac_includes_default" then : -else $as_nop - if test "$ac_cv_type_fd_set_fds_bits" = yes; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) if test "$ac_cv_type_fd_set_fds_bits" = yes; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (fd_set.fds_bits) -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_fd_set_fds_bits=0 - fi + fi ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fd_set_fds_bits" >&5 printf "%s\n" "$ac_cv_sizeof_fd_set_fds_bits" >&6; } @@ -22579,10 +23036,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -22615,10 +23073,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -22646,16 +23105,22 @@ printf %s "checking for snd_pcm_open in -lasound... " >&6; } if test ${ac_cv_lib_asound_snd_pcm_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lasound ${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. */ -char snd_pcm_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char snd_pcm_open (void); int main (void) { @@ -22667,20 +23132,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_asound_snd_pcm_open=yes -else $as_nop - ac_cv_lib_asound_snd_pcm_open=no +else case e in #( + e) ac_cv_lib_asound_snd_pcm_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5 printf "%s\n" "$ac_cv_lib_asound_snd_pcm_open" >&6; } if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes then : AST_ALSA_FOUND=yes -else $as_nop - AST_ALSA_FOUND=no +else case e in #( + e) AST_ALSA_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -22702,8 +23170,9 @@ fi if test "x$ac_cv_header_alsa_asoundlib_h" = xyes then : ALSA_HEADER_FOUND=1 -else $as_nop - ALSA_HEADER_FOUND=0 +else case e in #( + e) ALSA_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -22743,16 +23212,22 @@ printf %s "checking for bfd_openr in -lbfd... " >&6; } if test ${ac_cv_lib_bfd_bfd_openr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbfd ${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. */ -char bfd_openr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bfd_openr (void); int main (void) { @@ -22764,20 +23239,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bfd_bfd_openr=yes -else $as_nop - ac_cv_lib_bfd_bfd_openr=no +else case e in #( + e) ac_cv_lib_bfd_bfd_openr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; } if test "x$ac_cv_lib_bfd_bfd_openr" = xyes then : AST_BFD_FOUND=yes -else $as_nop - AST_BFD_FOUND=no +else case e in #( + e) AST_BFD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -22799,8 +23277,9 @@ fi if test "x$ac_cv_header_bfd_h" = xyes then : BFD_HEADER_FOUND=1 -else $as_nop - BFD_HEADER_FOUND=0 +else case e in #( + e) BFD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -22840,16 +23319,22 @@ printf %s "checking for bfd_openr in -lbfd... " >&6; } if test ${ac_cv_lib_bfd_bfd_openr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbfd ${pbxlibdir} -ldl -liberty $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. */ -char bfd_openr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bfd_openr (void); int main (void) { @@ -22861,20 +23346,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bfd_bfd_openr=yes -else $as_nop - ac_cv_lib_bfd_bfd_openr=no +else case e in #( + e) ac_cv_lib_bfd_bfd_openr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; } if test "x$ac_cv_lib_bfd_bfd_openr" = xyes then : AST_BFD_FOUND=yes -else $as_nop - AST_BFD_FOUND=no +else case e in #( + e) AST_BFD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -22896,8 +23384,9 @@ fi if test "x$ac_cv_header_bfd_h" = xyes then : BFD_HEADER_FOUND=1 -else $as_nop - BFD_HEADER_FOUND=0 +else case e in #( + e) BFD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -22937,16 +23426,22 @@ printf %s "checking for bfd_openr in -lbfd... " >&6; } if test ${ac_cv_lib_bfd_bfd_openr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbfd ${pbxlibdir} -ldl -liberty -lz $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. */ -char bfd_openr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bfd_openr (void); int main (void) { @@ -22958,20 +23453,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bfd_bfd_openr=yes -else $as_nop - ac_cv_lib_bfd_bfd_openr=no +else case e in #( + e) ac_cv_lib_bfd_bfd_openr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5 printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; } if test "x$ac_cv_lib_bfd_bfd_openr" = xyes then : AST_BFD_FOUND=yes -else $as_nop - AST_BFD_FOUND=no +else case e in #( + e) AST_BFD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -22993,8 +23491,9 @@ fi if test "x$ac_cv_header_bfd_h" = xyes then : BFD_HEADER_FOUND=1 -else $as_nop - BFD_HEADER_FOUND=0 +else case e in #( + e) BFD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -23036,16 +23535,22 @@ printf %s "checking for cap_from_text in -lcap... " >&6; } if test ${ac_cv_lib_cap_cap_from_text+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcap ${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. */ -char cap_from_text (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char cap_from_text (void); int main (void) { @@ -23057,20 +23562,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_cap_cap_from_text=yes -else $as_nop - ac_cv_lib_cap_cap_from_text=no +else case e in #( + e) ac_cv_lib_cap_cap_from_text=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_from_text" >&5 printf "%s\n" "$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 $as_nop - AST_CAP_FOUND=no +else case e in #( + e) AST_CAP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -23092,8 +23600,9 @@ fi if test "x$ac_cv_header_sys_capability_h" = xyes then : CAP_HEADER_FOUND=1 -else $as_nop - CAP_HEADER_FOUND=0 +else case e in #( + e) CAP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -23155,10 +23664,11 @@ printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h printf "%s\n" "#define HAVE_DAHDI_VERSION 230" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23204,10 +23714,11 @@ printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h printf "%s\n" "#define HAVE_DAHDI_VERSION 220" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23253,10 +23764,11 @@ printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h printf "%s\n" "#define HAVE_DAHDI_VERSION 200" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23301,10 +23813,11 @@ printf "%s\n" "#define HAVE_DAHDI_HALF_FULL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23344,10 +23857,11 @@ printf "%s\n" "#define HAVE_DAHDI_LINEREVERSE_VMWI 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23386,10 +23900,11 @@ printf "%s\n" "#define HAVE_DAHDI_ECHOCANCEL_FAX_MODE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23428,10 +23943,11 @@ printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23469,10 +23985,11 @@ printf "%s\n" "#define HAVE_TIMERFD 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -23502,16 +24019,22 @@ printf %s "checking for gsm_create in -lgsm... " >&6; } if test ${ac_cv_lib_gsm_gsm_create+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lgsm ${gsmlibdir} $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. */ -char gsm_create (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char gsm_create (void); int main (void) { @@ -23523,12 +24046,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_gsm_gsm_create=yes -else $as_nop - ac_cv_lib_gsm_gsm_create=no +else case e in #( + e) ac_cv_lib_gsm_gsm_create=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsm_gsm_create" >&5 printf "%s\n" "$ac_cv_lib_gsm_gsm_create" >&6; } @@ -23541,22 +24066,24 @@ fi if test "${ac_cv_lib_gsm_gsm_create}" = "yes"; then if test "x${GSM_DIR}" != "x" ; then - as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm.h" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm.h" | sed "$as_sed_sh"` ac_fn_c_check_header_compile "$LINENO" "${GSM_DIR}/include/gsm.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : GSM_HEADER_FOUND=1 -else $as_nop - GSM_HEADER_FOUND=0 +else case e in #( + e) GSM_HEADER_FOUND=0 ;; +esac fi - as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | sed "$as_sed_sh"` ac_fn_c_check_header_compile "$LINENO" "${GSM_DIR}/include/gsm/gsm.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : GSM_GSM_HEADER_FOUND=1 -else $as_nop - GSM_GSM_HEADER_FOUND=0 +else case e in #( + e) GSM_GSM_HEADER_FOUND=0 ;; +esac fi else @@ -23564,16 +24091,18 @@ fi if test "x$ac_cv_header_gsm_h" = xyes then : GSM_HEADER_FOUND=1 -else $as_nop - GSM_HEADER_FOUND=0 +else case e in #( + e) GSM_HEADER_FOUND=0 ;; +esac fi ac_fn_c_check_header_compile "$LINENO" "gsm/gsm.h" "ac_cv_header_gsm_gsm_h" "$ac_includes_default" if test "x$ac_cv_header_gsm_gsm_h" = xyes then : GSM_GSM_HEADER_FOUND=1 -else $as_nop - GSM_GSM_HEADER_FOUND=0 +else case e in #( + e) GSM_GSM_HEADER_FOUND=0 ;; +esac fi fi @@ -23634,7 +24163,7 @@ if test "${USE_ILBC}" != "no"; then fi if test "${ILBC_SYSTEM}" = "yes"; then - if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then + if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libilbc < 3" >&5 @@ -23749,16 +24278,22 @@ printf %s "checking for iconv_open in -liconv... " >&6; } if test ${ac_cv_lib_iconv_iconv_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-liconv ${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. */ -char iconv_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char iconv_open (void); int main (void) { @@ -23770,20 +24305,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_iconv_open=yes -else $as_nop - ac_cv_lib_iconv_iconv_open=no +else case e in #( + e) ac_cv_lib_iconv_iconv_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5 printf "%s\n" "$ac_cv_lib_iconv_iconv_open" >&6; } if test "x$ac_cv_lib_iconv_iconv_open" = xyes then : AST_ICONV_FOUND=yes -else $as_nop - AST_ICONV_FOUND=no +else case e in #( + e) AST_ICONV_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -23805,8 +24343,9 @@ fi if test "x$ac_cv_header_iconv_h" = xyes then : ICONV_HEADER_FOUND=1 -else $as_nop - ICONV_HEADER_FOUND=0 +else case e in #( + e) ICONV_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -23846,16 +24385,22 @@ printf %s "checking for libiconv_open in -liconv... " >&6; } if test ${ac_cv_lib_iconv_libiconv_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-liconv ${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. */ -char libiconv_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char libiconv_open (void); int main (void) { @@ -23867,20 +24412,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iconv_libiconv_open=yes -else $as_nop - ac_cv_lib_iconv_libiconv_open=no +else case e in #( + e) ac_cv_lib_iconv_libiconv_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5 printf "%s\n" "$ac_cv_lib_iconv_libiconv_open" >&6; } if test "x$ac_cv_lib_iconv_libiconv_open" = xyes then : AST_ICONV_FOUND=yes -else $as_nop - AST_ICONV_FOUND=no +else case e in #( + e) AST_ICONV_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -23902,8 +24450,9 @@ fi if test "x$ac_cv_header_iconv_h" = xyes then : ICONV_HEADER_FOUND=1 -else $as_nop - ICONV_HEADER_FOUND=0 +else case e in #( + e) ICONV_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -23943,16 +24492,22 @@ printf %s "checking for iconv_close in -lc... " >&6; } if test ${ac_cv_lib_c_iconv_close+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${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. */ -char iconv_close (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char iconv_close (void); int main (void) { @@ -23964,20 +24519,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_iconv_close=yes -else $as_nop - ac_cv_lib_c_iconv_close=no +else case e in #( + e) ac_cv_lib_c_iconv_close=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_close" >&5 printf "%s\n" "$ac_cv_lib_c_iconv_close" >&6; } if test "x$ac_cv_lib_c_iconv_close" = xyes then : AST_ICONV_FOUND=yes -else $as_nop - AST_ICONV_FOUND=no +else case e in #( + e) AST_ICONV_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -23999,8 +24557,9 @@ fi if test "x$ac_cv_header_iconv_h" = xyes then : ICONV_HEADER_FOUND=1 -else $as_nop - ICONV_HEADER_FOUND=0 +else case e in #( + e) ICONV_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -24041,16 +24600,22 @@ printf %s "checking for icaltimezone_get_utc_timezone in -lical... " >&6; } if test ${ac_cv_lib_ical_icaltimezone_get_utc_timezone+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lical ${pbxlibdir} ${PTHREAD_LIBS} $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. */ -char icaltimezone_get_utc_timezone (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char icaltimezone_get_utc_timezone (void); int main (void) { @@ -24062,20 +24627,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ical_icaltimezone_get_utc_timezone=yes -else $as_nop - ac_cv_lib_ical_icaltimezone_get_utc_timezone=no +else case e in #( + e) ac_cv_lib_ical_icaltimezone_get_utc_timezone=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&5 printf "%s\n" "$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 $as_nop - AST_ICAL_FOUND=no +else case e in #( + e) AST_ICAL_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -24097,8 +24665,9 @@ fi if test "x$ac_cv_header_libical_ical_h" = xyes then : ICAL_HEADER_FOUND=1 -else $as_nop - ICAL_HEADER_FOUND=0 +else case e in #( + e) ICAL_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -24138,16 +24707,22 @@ printf %s "checking for iks_start_sasl in -liksemel... " >&6; } if test ${ac_cv_lib_iksemel_iks_start_sasl+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-liksemel ${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. */ -char iks_start_sasl (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char iks_start_sasl (void); int main (void) { @@ -24159,20 +24734,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iksemel_iks_start_sasl=yes -else $as_nop - ac_cv_lib_iksemel_iks_start_sasl=no +else case e in #( + e) ac_cv_lib_iksemel_iks_start_sasl=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5 printf "%s\n" "$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 $as_nop - AST_IKSEMEL_FOUND=no +else case e in #( + e) AST_IKSEMEL_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -24194,8 +24772,9 @@ fi if test "x$ac_cv_header_iksemel_h" = xyes then : IKSEMEL_HEADER_FOUND=1 -else $as_nop - IKSEMEL_HEADER_FOUND=0 +else case e in #( + e) IKSEMEL_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -24296,9 +24875,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk="yes" -else $as_nop - ac_cv_imap_tk="no" - +else case e in #( + e) ac_cv_imap_tk="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24365,9 +24945,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk2006="yes" -else $as_nop - ac_cv_imap_tk2006="no" - +else case e in #( + e) ac_cv_imap_tk2006="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24451,9 +25032,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk="yes" -else $as_nop - ac_cv_imap_tk="no" - +else case e in #( + e) ac_cv_imap_tk="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24520,9 +25102,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk2006="yes" -else $as_nop - ac_cv_imap_tk2006="no" - +else case e in #( + e) ac_cv_imap_tk2006="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24604,9 +25187,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk="yes" -else $as_nop - ac_cv_imap_tk="no" - +else case e in #( + e) ac_cv_imap_tk="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24674,9 +25258,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk2006="yes" -else $as_nop - ac_cv_imap_tk2006="no" - +else case e in #( + e) ac_cv_imap_tk2006="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24751,9 +25336,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk="yes" -else $as_nop - ac_cv_imap_tk="no" - +else case e in #( + e) ac_cv_imap_tk="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24823,9 +25409,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk="yes" -else $as_nop - ac_cv_imap_tk="no" - +else case e in #( + e) ac_cv_imap_tk="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24894,9 +25481,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_imap_tk2006="yes" -else $as_nop - ac_cv_imap_tk2006="no" - +else case e in #( + e) ac_cv_imap_tk2006="no" + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -24944,16 +25532,22 @@ printf %s "checking for SQLConnect in -liodbc... " >&6; } if test ${ac_cv_lib_iodbc_SQLConnect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-liodbc ${pbxlibdir} ${PTHREAD_LIBS} $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. */ -char SQLConnect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SQLConnect (void); int main (void) { @@ -24965,20 +25559,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_iodbc_SQLConnect=yes -else $as_nop - ac_cv_lib_iodbc_SQLConnect=no +else case e in #( + e) ac_cv_lib_iodbc_SQLConnect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLConnect" >&5 printf "%s\n" "$ac_cv_lib_iodbc_SQLConnect" >&6; } if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes then : AST_IODBC_FOUND=yes -else $as_nop - AST_IODBC_FOUND=no +else case e in #( + e) AST_IODBC_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25000,8 +25597,9 @@ fi if test "x$ac_cv_header_sql_h" = xyes then : IODBC_HEADER_FOUND=1 -else $as_nop - IODBC_HEADER_FOUND=0 +else case e in #( + e) IODBC_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25041,16 +25639,22 @@ printf %s "checking for inotify_init in -lc... " >&6; } if test ${ac_cv_lib_c_inotify_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${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. */ -char inotify_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char inotify_init (void); int main (void) { @@ -25062,20 +25666,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_inotify_init=yes -else $as_nop - ac_cv_lib_c_inotify_init=no +else case e in #( + e) ac_cv_lib_c_inotify_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5 printf "%s\n" "$ac_cv_lib_c_inotify_init" >&6; } if test "x$ac_cv_lib_c_inotify_init" = xyes then : AST_INOTIFY_FOUND=yes -else $as_nop - AST_INOTIFY_FOUND=no +else case e in #( + e) AST_INOTIFY_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25097,8 +25704,9 @@ fi if test "x$ac_cv_header_sys_inotify_h" = xyes then : INOTIFY_HEADER_FOUND=1 -else $as_nop - INOTIFY_HEADER_FOUND=0 +else case e in #( + e) INOTIFY_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25138,16 +25746,22 @@ printf %s "checking for jack_activate in -ljack... " >&6; } if test ${ac_cv_lib_jack_jack_activate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ljack ${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. */ -char jack_activate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char jack_activate (void); int main (void) { @@ -25159,20 +25773,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_jack_jack_activate=yes -else $as_nop - ac_cv_lib_jack_jack_activate=no +else case e in #( + e) ac_cv_lib_jack_jack_activate=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_activate" >&5 printf "%s\n" "$ac_cv_lib_jack_jack_activate" >&6; } if test "x$ac_cv_lib_jack_jack_activate" = xyes then : AST_JACK_FOUND=yes -else $as_nop - AST_JACK_FOUND=no +else case e in #( + e) AST_JACK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25194,8 +25811,9 @@ fi if test "x$ac_cv_header_jack_jack_h" = xyes then : JACK_HEADER_FOUND=1 -else $as_nop - JACK_HEADER_FOUND=0 +else case e in #( + e) JACK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25236,16 +25854,22 @@ printf %s "checking for kqueue in -lc... " >&6; } if test ${ac_cv_lib_c_kqueue+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${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. */ -char kqueue (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char kqueue (void); int main (void) { @@ -25257,20 +25881,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_kqueue=yes -else $as_nop - ac_cv_lib_c_kqueue=no +else case e in #( + e) ac_cv_lib_c_kqueue=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_kqueue" >&5 printf "%s\n" "$ac_cv_lib_c_kqueue" >&6; } if test "x$ac_cv_lib_c_kqueue" = xyes then : AST_KQUEUE_FOUND=yes -else $as_nop - AST_KQUEUE_FOUND=no +else case e in #( + e) AST_KQUEUE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25292,8 +25919,9 @@ fi if test "x$ac_cv_header_sys_event_h" = xyes then : KQUEUE_HEADER_FOUND=1 -else $as_nop - KQUEUE_HEADER_FOUND=0 +else case e in #( + e) KQUEUE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25342,16 +25970,22 @@ printf %s "checking for ldap_initialize in -lldap... " >&6; } if test ${ac_cv_lib_ldap_ldap_initialize+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lldap ${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. */ -char ldap_initialize (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ldap_initialize (void); int main (void) { @@ -25363,20 +25997,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ldap_ldap_initialize=yes -else $as_nop - ac_cv_lib_ldap_ldap_initialize=no +else case e in #( + e) ac_cv_lib_ldap_ldap_initialize=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5 printf "%s\n" "$ac_cv_lib_ldap_ldap_initialize" >&6; } if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes then : AST_LDAP_FOUND=yes -else $as_nop - AST_LDAP_FOUND=no +else case e in #( + e) AST_LDAP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25398,8 +26035,9 @@ fi if test "x$ac_cv_header_ldap_h" = xyes then : LDAP_HEADER_FOUND=1 -else $as_nop - LDAP_HEADER_FOUND=0 +else case e in #( + e) LDAP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25439,16 +26077,22 @@ printf %s "checking for mISDN_open in -lmISDN... " >&6; } if test ${ac_cv_lib_mISDN_mISDN_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lmISDN ${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. */ -char mISDN_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char mISDN_open (void); int main (void) { @@ -25460,20 +26104,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_mISDN_mISDN_open=yes -else $as_nop - ac_cv_lib_mISDN_mISDN_open=no +else case e in #( + e) ac_cv_lib_mISDN_mISDN_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mISDN_mISDN_open" >&5 printf "%s\n" "$ac_cv_lib_mISDN_mISDN_open" >&6; } if test "x$ac_cv_lib_mISDN_mISDN_open" = xyes then : AST_MISDN_FOUND=yes -else $as_nop - AST_MISDN_FOUND=no +else case e in #( + e) AST_MISDN_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25495,8 +26142,9 @@ fi if test "x$ac_cv_header_mISDNuser_mISDNlib_h" = xyes then : MISDN_HEADER_FOUND=1 -else $as_nop - MISDN_HEADER_FOUND=0 +else case e in #( + e) MISDN_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25537,16 +26185,22 @@ printf %s "checking for init_manager in -lisdnnet... " >&6; } if test ${ac_cv_lib_isdnnet_init_manager+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lisdnnet ${pbxlibdir} -lmISDN -lpthread $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. */ -char init_manager (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char init_manager (void); int main (void) { @@ -25558,20 +26212,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_isdnnet_init_manager=yes -else $as_nop - ac_cv_lib_isdnnet_init_manager=no +else case e in #( + e) ac_cv_lib_isdnnet_init_manager=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_isdnnet_init_manager" >&5 printf "%s\n" "$ac_cv_lib_isdnnet_init_manager" >&6; } if test "x$ac_cv_lib_isdnnet_init_manager" = xyes then : AST_ISDNNET_FOUND=yes -else $as_nop - AST_ISDNNET_FOUND=no +else case e in #( + e) AST_ISDNNET_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25593,8 +26250,9 @@ fi if test "x$ac_cv_header_mISDNuser_isdn_net_h" = xyes then : ISDNNET_HEADER_FOUND=1 -else $as_nop - ISDNNET_HEADER_FOUND=0 +else case e in #( + e) ISDNNET_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25633,16 +26291,22 @@ printf %s "checking for encodeFac in -lsuppserv... " >&6; } if test ${ac_cv_lib_suppserv_encodeFac+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsuppserv ${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. */ -char encodeFac (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char encodeFac (void); int main (void) { @@ -25654,20 +26318,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_suppserv_encodeFac=yes -else $as_nop - ac_cv_lib_suppserv_encodeFac=no +else case e in #( + e) ac_cv_lib_suppserv_encodeFac=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_suppserv_encodeFac" >&5 printf "%s\n" "$ac_cv_lib_suppserv_encodeFac" >&6; } if test "x$ac_cv_lib_suppserv_encodeFac" = xyes then : AST_SUPPSERV_FOUND=yes -else $as_nop - AST_SUPPSERV_FOUND=no +else case e in #( + e) AST_SUPPSERV_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -25689,8 +26356,9 @@ fi if test "x$ac_cv_header_mISDNuser_suppserv_h" = xyes then : SUPPSERV_HEADER_FOUND=1 -else $as_nop - SUPPSERV_HEADER_FOUND=0 +else case e in #( + e) SUPPSERV_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -25747,10 +26415,11 @@ printf "%s\n" "#define HAVE_MISDN_FAC_RESULT 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -25794,10 +26463,11 @@ printf "%s\n" "#define HAVE_MISDN_FAC_ERROR 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -25817,8 +26487,9 @@ fi if test "x$ac_cv_member_Q931_info_t_redirect_dn" = xyes then : -else $as_nop - PBX_MISDN=0 +else case e in #( + e) PBX_MISDN=0 ;; +esac fi fi @@ -25835,8 +26506,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_MYSQLCLIENT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_MYSQLCLIENT in +else case e in #( + e) case $CONFIG_MYSQLCLIENT in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_MYSQLCLIENT="$CONFIG_MYSQLCLIENT" # Let the user override the test with a path. ;; @@ -25862,6 +26533,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_MYSQLCLIENT=$ac_cv_path_CONFIG_MYSQLCLIENT @@ -25884,8 +26556,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_MYSQLCLIENT in +else case e in #( + e) case $ac_pt_CONFIG_MYSQLCLIENT in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT="$ac_pt_CONFIG_MYSQLCLIENT" # Let the user override the test with a path. ;; @@ -25911,6 +26583,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_MYSQLCLIENT=$ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT @@ -25975,10 +26648,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_MYSQLCLIENT_BOOL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -26002,10 +26676,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_MYSQLCLIENT_MY_BOOL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -26030,16 +26705,22 @@ printf %s "checking for nbs_connect in -lnbs... " >&6; } if test ${ac_cv_lib_nbs_nbs_connect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnbs ${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. */ -char nbs_connect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char nbs_connect (void); int main (void) { @@ -26051,20 +26732,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_nbs_nbs_connect=yes -else $as_nop - ac_cv_lib_nbs_nbs_connect=no +else case e in #( + e) ac_cv_lib_nbs_nbs_connect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nbs_nbs_connect" >&5 printf "%s\n" "$ac_cv_lib_nbs_nbs_connect" >&6; } if test "x$ac_cv_lib_nbs_nbs_connect" = xyes then : AST_NBS_FOUND=yes -else $as_nop - AST_NBS_FOUND=no +else case e in #( + e) AST_NBS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -26086,8 +26770,9 @@ fi if test "x$ac_cv_header_nbs_h" = xyes then : NBS_HEADER_FOUND=1 -else $as_nop - NBS_HEADER_FOUND=0 +else case e in #( + e) NBS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -26119,8 +26804,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_NEON+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_NEON in +else case e in #( + e) case $CONFIG_NEON in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_NEON="$CONFIG_NEON" # Let the user override the test with a path. ;; @@ -26146,6 +26831,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_NEON=$ac_cv_path_CONFIG_NEON @@ -26168,8 +26854,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_NEON+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_NEON in +else case e in #( + e) case $ac_pt_CONFIG_NEON in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_NEON="$ac_pt_CONFIG_NEON" # Let the user override the test with a path. ;; @@ -26195,6 +26881,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_NEON=$ac_cv_path_ac_pt_CONFIG_NEON @@ -26249,8 +26936,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_NEON29+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_NEON29 in +else case e in #( + e) case $CONFIG_NEON29 in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_NEON29="$CONFIG_NEON29" # Let the user override the test with a path. ;; @@ -26276,6 +26963,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_NEON29=$ac_cv_path_CONFIG_NEON29 @@ -26298,8 +26986,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_NEON29+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_NEON29 in +else case e in #( + e) case $ac_pt_CONFIG_NEON29 in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_NEON29="$ac_pt_CONFIG_NEON29" # Let the user override the test with a path. ;; @@ -26325,6 +27013,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_NEON29=$ac_cv_path_ac_pt_CONFIG_NEON29 @@ -26394,7 +27083,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ - if test "x${PBX_NETSNMP}" != "x1" -a "${USE_NETSNMP}" != "no"; then + if test "x${PBX_NETSNMP}" != "x1" -a "${USE_NETSNMP}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for netsnmp-agent" >&5 @@ -26492,8 +27181,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_NETSNMP+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_NETSNMP in +else case e in #( + e) case $CONFIG_NETSNMP in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_NETSNMP="$CONFIG_NETSNMP" # Let the user override the test with a path. ;; @@ -26519,6 +27208,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_NETSNMP=$ac_cv_path_CONFIG_NETSNMP @@ -26541,8 +27231,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_NETSNMP+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_NETSNMP in +else case e in #( + e) case $ac_pt_CONFIG_NETSNMP in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_NETSNMP="$ac_pt_CONFIG_NETSNMP" # Let the user override the test with a path. ;; @@ -26568,6 +27258,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_NETSNMP=$ac_cv_path_ac_pt_CONFIG_NETSNMP @@ -26655,16 +27346,22 @@ printf %s "checking for newtBell in -lnewt... " >&6; } if test ${ac_cv_lib_newt_newtBell+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnewt ${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. */ -char newtBell (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char newtBell (void); int main (void) { @@ -26676,20 +27373,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_newt_newtBell=yes -else $as_nop - ac_cv_lib_newt_newtBell=no +else case e in #( + e) ac_cv_lib_newt_newtBell=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5 printf "%s\n" "$ac_cv_lib_newt_newtBell" >&6; } if test "x$ac_cv_lib_newt_newtBell" = xyes then : AST_NEWT_FOUND=yes -else $as_nop - AST_NEWT_FOUND=no +else case e in #( + e) AST_NEWT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -26711,8 +27411,9 @@ fi if test "x$ac_cv_header_newt_h" = xyes then : NEWT_HEADER_FOUND=1 -else $as_nop - NEWT_HEADER_FOUND=0 +else case e in #( + e) NEWT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -26753,16 +27454,22 @@ printf %s "checking for ub_ctx_delete in -lunbound... " >&6; } if test ${ac_cv_lib_unbound_ub_ctx_delete+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lunbound ${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. */ -char ub_ctx_delete (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ub_ctx_delete (void); int main (void) { @@ -26774,20 +27481,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_unbound_ub_ctx_delete=yes -else $as_nop - ac_cv_lib_unbound_ub_ctx_delete=no +else case e in #( + e) ac_cv_lib_unbound_ub_ctx_delete=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_ub_ctx_delete" >&5 printf "%s\n" "$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 $as_nop - AST_UNBOUND_FOUND=no +else case e in #( + e) AST_UNBOUND_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -26809,8 +27519,9 @@ fi if test "x$ac_cv_header_unbound_h" = xyes then : UNBOUND_HEADER_FOUND=1 -else $as_nop - UNBOUND_HEADER_FOUND=0 +else case e in #( + e) UNBOUND_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -26861,12 +27572,13 @@ printf "%s\n" "no" >&6; } fi fi -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -26908,16 +27620,22 @@ printf %s "checking for SQLConnect in -lodbc... " >&6; } if test ${ac_cv_lib_odbc_SQLConnect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lodbc ${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. */ -char SQLConnect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char SQLConnect (void); int main (void) { @@ -26929,20 +27647,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_odbc_SQLConnect=yes -else $as_nop - ac_cv_lib_odbc_SQLConnect=no +else case e in #( + e) ac_cv_lib_odbc_SQLConnect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5 printf "%s\n" "$ac_cv_lib_odbc_SQLConnect" >&6; } if test "x$ac_cv_lib_odbc_SQLConnect" = xyes then : AST_UNIXODBC_FOUND=yes -else $as_nop - AST_UNIXODBC_FOUND=no +else case e in #( + e) AST_UNIXODBC_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -26964,8 +27685,9 @@ fi if test "x$ac_cv_header_sql_h" = xyes then : UNIXODBC_HEADER_FOUND=1 -else $as_nop - UNIXODBC_HEADER_FOUND=0 +else case e in #( + e) UNIXODBC_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27005,16 +27727,22 @@ printf %s "checking for ogg_stream_init in -logg... " >&6; } if test ${ac_cv_lib_ogg_ogg_stream_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-logg ${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. */ -char ogg_stream_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ogg_stream_init (void); int main (void) { @@ -27026,20 +27754,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ogg_ogg_stream_init=yes -else $as_nop - ac_cv_lib_ogg_ogg_stream_init=no +else case e in #( + e) ac_cv_lib_ogg_ogg_stream_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5 printf "%s\n" "$ac_cv_lib_ogg_ogg_stream_init" >&6; } if test "x$ac_cv_lib_ogg_ogg_stream_init" = xyes then : AST_OGG_FOUND=yes -else $as_nop - AST_OGG_FOUND=no +else case e in #( + e) AST_OGG_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27061,8 +27792,9 @@ fi if test "x$ac_cv_header_ogg_ogg_h" = xyes then : OGG_HEADER_FOUND=1 -else $as_nop - OGG_HEADER_FOUND=0 +else case e in #( + e) OGG_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27103,16 +27835,22 @@ printf %s "checking for backtrace in -lexecinfo... " >&6; } if test ${ac_cv_lib_execinfo_backtrace+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lexecinfo ${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. */ -char backtrace (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char backtrace (void); int main (void) { @@ -27124,20 +27862,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_execinfo_backtrace=yes -else $as_nop - ac_cv_lib_execinfo_backtrace=no +else case e in #( + e) ac_cv_lib_execinfo_backtrace=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5 printf "%s\n" "$ac_cv_lib_execinfo_backtrace" >&6; } if test "x$ac_cv_lib_execinfo_backtrace" = xyes then : AST_BKTR_FOUND=yes -else $as_nop - AST_BKTR_FOUND=no +else case e in #( + e) AST_BKTR_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27159,8 +27900,9 @@ fi if test "x$ac_cv_header_execinfo_h" = xyes then : BKTR_HEADER_FOUND=1 -else $as_nop - BKTR_HEADER_FOUND=0 +else case e in #( + e) BKTR_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27200,16 +27942,22 @@ printf %s "checking for backtrace in -lc... " >&6; } if test ${ac_cv_lib_c_backtrace+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lc ${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. */ -char backtrace (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char backtrace (void); int main (void) { @@ -27221,20 +27969,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_c_backtrace=yes -else $as_nop - ac_cv_lib_c_backtrace=no +else case e in #( + e) ac_cv_lib_c_backtrace=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 printf "%s\n" "$ac_cv_lib_c_backtrace" >&6; } if test "x$ac_cv_lib_c_backtrace" = xyes then : AST_BKTR_FOUND=yes -else $as_nop - AST_BKTR_FOUND=no +else case e in #( + e) AST_BKTR_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27256,8 +28007,9 @@ fi if test "x$ac_cv_header_execinfo_h" = xyes then : BKTR_HEADER_FOUND=1 -else $as_nop - BKTR_HEADER_FOUND=0 +else case e in #( + e) BKTR_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27297,16 +28049,22 @@ printf %s "checking for ba2str in -lbluetooth... " >&6; } if test ${ac_cv_lib_bluetooth_ba2str+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbluetooth ${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. */ -char ba2str (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ba2str (void); int main (void) { @@ -27318,20 +28076,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_bluetooth_ba2str=yes -else $as_nop - ac_cv_lib_bluetooth_ba2str=no +else case e in #( + e) ac_cv_lib_bluetooth_ba2str=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_ba2str" >&5 printf "%s\n" "$ac_cv_lib_bluetooth_ba2str" >&6; } if test "x$ac_cv_lib_bluetooth_ba2str" = xyes then : AST_BLUETOOTH_FOUND=yes -else $as_nop - AST_BLUETOOTH_FOUND=no +else case e in #( + e) AST_BLUETOOTH_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27353,8 +28114,9 @@ fi if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes then : BLUETOOTH_HEADER_FOUND=1 -else $as_nop - BLUETOOTH_HEADER_FOUND=0 +else case e in #( + e) BLUETOOTH_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27394,16 +28156,22 @@ printf %s "checking for bs_version in -lbeanstalk... " >&6; } if test ${ac_cv_lib_beanstalk_bs_version+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lbeanstalk ${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. */ -char bs_version (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char bs_version (void); int main (void) { @@ -27415,20 +28183,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_beanstalk_bs_version=yes -else $as_nop - ac_cv_lib_beanstalk_bs_version=no +else case e in #( + e) ac_cv_lib_beanstalk_bs_version=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_beanstalk_bs_version" >&5 printf "%s\n" "$ac_cv_lib_beanstalk_bs_version" >&6; } if test "x$ac_cv_lib_beanstalk_bs_version" = xyes then : AST_BEANSTALK_FOUND=yes -else $as_nop - AST_BEANSTALK_FOUND=no +else case e in #( + e) AST_BEANSTALK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27450,8 +28221,9 @@ fi if test "x$ac_cv_header_beanstalk_h" = xyes then : BEANSTALK_HEADER_FOUND=1 -else $as_nop - BEANSTALK_HEADER_FOUND=0 +else case e in #( + e) BEANSTALK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27505,8 +28277,9 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then if test "x$ac_cv_header_linux_soundcard_h" = xyes then : OSS_HEADER_FOUND=1 -else $as_nop - OSS_HEADER_FOUND=0 +else case e in #( + e) OSS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27561,8 +28334,9 @@ if test "x${PBX_OSS}" != "x1" -a "${USE_OSS}" != "no"; then if test "x$ac_cv_header_sys_soundcard_h" = xyes then : OSS_HEADER_FOUND=1 -else $as_nop - OSS_HEADER_FOUND=0 +else case e in #( + e) OSS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27604,16 +28378,22 @@ printf %s "checking for oss_ioctl_mixer in -lossaudio... " >&6; } if test ${ac_cv_lib_ossaudio_oss_ioctl_mixer+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) 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. */ -char oss_ioctl_mixer (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char oss_ioctl_mixer (void); int main (void) { @@ -27625,20 +28405,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ossaudio_oss_ioctl_mixer=yes -else $as_nop - ac_cv_lib_ossaudio_oss_ioctl_mixer=no +else case e in #( + e) ac_cv_lib_ossaudio_oss_ioctl_mixer=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5 printf "%s\n" "$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 $as_nop - AST_OSS_FOUND=no +else case e in #( + e) AST_OSS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -27660,8 +28443,9 @@ fi if test "x$ac_cv_header_soundcard_h" = xyes then : OSS_HEADER_FOUND=1 -else $as_nop - OSS_HEADER_FOUND=0 +else case e in #( + e) OSS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -27693,8 +28477,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PG_CONFIG in +else case e in #( + e) case $PG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. ;; @@ -27719,6 +28503,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PG_CONFIG=$ac_cv_path_PG_CONFIG @@ -27741,8 +28526,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PG_CONFIG in +else case e in #( + e) case $ac_pt_PG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. ;; @@ -27767,6 +28552,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG @@ -27815,8 +28601,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PG_CONFIG in +else case e in #( + e) case $PG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path. ;; @@ -27841,6 +28627,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PG_CONFIG=$ac_cv_path_PG_CONFIG @@ -27863,8 +28650,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PG_CONFIG in +else case e in #( + e) case $ac_pt_PG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path. ;; @@ -27889,6 +28676,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG @@ -27938,16 +28726,22 @@ printf %s "checking for PQescapeStringConn in -lpq... " >&6; } if test ${ac_cv_lib_pq_PQescapeStringConn+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpq -L${PGSQL_libdir} -lz $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. */ -char PQescapeStringConn (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char PQescapeStringConn (void); int main (void) { @@ -27959,12 +28753,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pq_PQescapeStringConn=yes -else $as_nop - ac_cv_lib_pq_PQescapeStringConn=no +else case e in #( + e) ac_cv_lib_pq_PQescapeStringConn=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 printf "%s\n" "$ac_cv_lib_pq_PQescapeStringConn" >&6; } @@ -28000,9 +28796,10 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PGSQL_pg_encoding_to_char 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -28031,7 +28828,7 @@ fi if test "$USE_PJPROJECT" != "no" ; then if test "$PJPROJECT_BUNDLED" = "no" ; then - if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then + if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5 @@ -28138,16 +28935,22 @@ printf %s "checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_dlg_create_uas_and_inc_lock (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_dlg_create_uas_and_inc_lock (void); int main (void) { @@ -28159,20 +28962,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=no +else case e in #( + e) AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -28194,8 +29000,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND=1 -else $as_nop - PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND=0 +else case e in #( + e) PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -28234,16 +29041,22 @@ printf %s "checking for pjsip_tsx_create_uac2 in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_tsx_create_uac2+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_tsx_create_uac2 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_tsx_create_uac2 (void); int main (void) { @@ -28255,20 +29068,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_tsx_create_uac2=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_tsx_create_uac2=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_tsx_create_uac2=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&5 printf "%s\n" "$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 $as_nop - AST_PJ_TRANSACTION_GRP_LOCK_FOUND=no +else case e in #( + e) AST_PJ_TRANSACTION_GRP_LOCK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -28290,8 +29106,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND=1 -else $as_nop - PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND=0 +else case e in #( + e) PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -28348,10 +29165,11 @@ printf "%s\n" "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28379,16 +29197,22 @@ printf %s "checking for pjsip_get_dest_info in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_get_dest_info+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_get_dest_info (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_get_dest_info (void); int main (void) { @@ -28400,20 +29224,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_get_dest_info=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_get_dest_info=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_get_dest_info=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_get_dest_info" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_GET_DEST_INFO_FOUND=no +else case e in #( + e) AST_PJSIP_GET_DEST_INFO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -28435,8 +29262,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_GET_DEST_INFO_HEADER_FOUND=1 -else $as_nop - PJSIP_GET_DEST_INFO_HEADER_FOUND=0 +else case e in #( + e) PJSIP_GET_DEST_INFO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -28475,16 +29303,22 @@ printf %s "checking for pj_ssl_cert_load_from_files2 in -lpj... " >&6; } if test ${ac_cv_lib_pj_pj_ssl_cert_load_from_files2+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpj ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pj_ssl_cert_load_from_files2 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pj_ssl_cert_load_from_files2 (void); int main (void) { @@ -28496,20 +29330,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pj_pj_ssl_cert_load_from_files2=yes -else $as_nop - ac_cv_lib_pj_pj_ssl_cert_load_from_files2=no +else case e in #( + e) ac_cv_lib_pj_pj_ssl_cert_load_from_files2=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&5 printf "%s\n" "$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 $as_nop - AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=no +else case e in #( + e) AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -28531,8 +29368,9 @@ fi if test "x$ac_cv_header_pjlib_h" = xyes then : PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND=1 -else $as_nop - PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND=0 +else case e in #( + e) PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -28571,16 +29409,22 @@ printf %s "checking for pjsip_endpt_set_ext_resolver in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_endpt_set_ext_resolver (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_endpt_set_ext_resolver (void); int main (void) { @@ -28592,20 +29436,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_EXTERNAL_RESOLVER_FOUND=no +else case e in #( + e) AST_PJSIP_EXTERNAL_RESOLVER_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -28627,8 +29474,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND=1 -else $as_nop - PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND=0 +else case e in #( + e) PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -28685,10 +29533,11 @@ printf "%s\n" "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28726,10 +29575,11 @@ printf "%s\n" "#define HAVE_PJSIP_TLS_1_1 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28767,10 +29617,11 @@ printf "%s\n" "#define HAVE_PJSIP_TLS_1_2 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28808,10 +29659,11 @@ printf "%s\n" "#define HAVE_PJSIP_TLS_1_3 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28849,10 +29701,11 @@ printf "%s\n" "#define HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS 1" >>confdefs. -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28890,10 +29743,11 @@ printf "%s\n" "#define HAVE_PJSIP_ENDPOINT_COMPACT_FORM 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28931,10 +29785,11 @@ printf "%s\n" "#define HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE 1" >>confde -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -28972,10 +29827,11 @@ printf "%s\n" "#define HAVE_PJSIP_OAUTH_AUTHENTICATION 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -29012,10 +29868,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -29041,16 +29898,22 @@ printf %s "checking for pjsip_evsub_add_ref in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_evsub_add_ref+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_evsub_add_ref (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_evsub_add_ref (void); int main (void) { @@ -29062,20 +29925,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_evsub_add_ref=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_evsub_add_ref=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_evsub_add_ref=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_EVSUB_GRP_LOCK_FOUND=no +else case e in #( + e) AST_PJSIP_EVSUB_GRP_LOCK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29097,8 +29963,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND=1 -else $as_nop - PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND=0 +else case e in #( + e) PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29137,16 +30004,22 @@ printf %s "checking for pjsip_inv_add_ref in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_inv_add_ref+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_inv_add_ref (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_inv_add_ref (void); int main (void) { @@ -29158,20 +30031,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_inv_add_ref=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_inv_add_ref=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_inv_add_ref=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_inv_add_ref" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_INV_SESSION_REF_FOUND=no +else case e in #( + e) AST_PJSIP_INV_SESSION_REF_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29193,8 +30069,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_INV_SESSION_REF_HEADER_FOUND=1 -else $as_nop - PJSIP_INV_SESSION_REF_HEADER_FOUND=0 +else case e in #( + e) PJSIP_INV_SESSION_REF_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29233,16 +30110,22 @@ printf %s "checking for pjsip_auth_clt_deinit in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_auth_clt_deinit+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_auth_clt_deinit (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_auth_clt_deinit (void); int main (void) { @@ -29254,20 +30137,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_auth_clt_deinit=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_auth_clt_deinit=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_auth_clt_deinit=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_AUTH_CLT_DEINIT_FOUND=no +else case e in #( + e) AST_PJSIP_AUTH_CLT_DEINIT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29289,8 +30175,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND=1 -else $as_nop - PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND=0 +else case e in #( + e) PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29329,16 +30216,22 @@ printf %s "checking for pjsip_tsx_layer_find_tsx2 in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_tsx_layer_find_tsx2 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_tsx_layer_find_tsx2 (void); int main (void) { @@ -29350,20 +30243,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&5 printf "%s\n" "$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 $as_nop - AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no +else case e in #( + e) AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29385,8 +30281,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=1 -else $as_nop - PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=0 +else case e in #( + e) PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29425,16 +30322,22 @@ printf %s "checking for pjsip_tls_transport_restart in -lpjsip... " >&6; } if test ${ac_cv_lib_pjsip_pjsip_tls_transport_restart+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pjsip_tls_transport_restart (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pjsip_tls_transport_restart (void); int main (void) { @@ -29446,20 +30349,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pjsip_pjsip_tls_transport_restart=yes -else $as_nop - ac_cv_lib_pjsip_pjsip_tls_transport_restart=no +else case e in #( + e) ac_cv_lib_pjsip_pjsip_tls_transport_restart=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tls_transport_restart" >&5 printf "%s\n" "$ac_cv_lib_pjsip_pjsip_tls_transport_restart" >&6; } if test "x$ac_cv_lib_pjsip_pjsip_tls_transport_restart" = xyes then : AST_PJSIP_TLS_TRANSPORT_RESTART_FOUND=yes -else $as_nop - AST_PJSIP_TLS_TRANSPORT_RESTART_FOUND=no +else case e in #( + e) AST_PJSIP_TLS_TRANSPORT_RESTART_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29481,8 +30387,9 @@ fi if test "x$ac_cv_header_pjsip_h" = xyes then : PJSIP_TLS_TRANSPORT_RESTART_HEADER_FOUND=1 -else $as_nop - PJSIP_TLS_TRANSPORT_RESTART_HEADER_FOUND=0 +else case e in #( + e) PJSIP_TLS_TRANSPORT_RESTART_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29502,6 +30409,20 @@ _ACEOF fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pending_notify in evsub.c" >&5 + $as_echo_n "checking for pending_notify in evsub... " >&6; } + pending_notify=$(${SED} -n -r -e '/^struct\s+pjsip_evsub/,/^\s+void\s+*mod_data/!d ; /pending_notify/p' $(find $PJSIP_EVSUB_PENDING_NOTIFY_DIR -name evsub.c)) + if test -n "$pending_notify" ; then + +printf "%s\n" "#define HAVE_PJSIP_EVSUB_PENDING_NOTIFY 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi fi fi @@ -29510,7 +30431,7 @@ fi - if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then + if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python-2.7" >&5 @@ -29598,7 +30519,7 @@ fi fi - if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then + if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python2" >&5 @@ -29686,7 +30607,7 @@ fi fi - if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then + if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python" >&5 @@ -29803,16 +30724,22 @@ printf %s "checking for poptStrerror in -lpopt... " >&6; } if test ${ac_cv_lib_popt_poptStrerror+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpopt ${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. */ -char poptStrerror (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char poptStrerror (void); int main (void) { @@ -29824,20 +30751,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_popt_poptStrerror=yes -else $as_nop - ac_cv_lib_popt_poptStrerror=no +else case e in #( + e) ac_cv_lib_popt_poptStrerror=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptStrerror" >&5 printf "%s\n" "$ac_cv_lib_popt_poptStrerror" >&6; } if test "x$ac_cv_lib_popt_poptStrerror" = xyes then : AST_POPT_FOUND=yes -else $as_nop - AST_POPT_FOUND=no +else case e in #( + e) AST_POPT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -29859,8 +30789,9 @@ fi if test "x$ac_cv_header_popt_h" = xyes then : POPT_HEADER_FOUND=1 -else $as_nop - POPT_HEADER_FOUND=0 +else case e in #( + e) POPT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -29882,7 +30813,7 @@ fi - if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then + if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5 @@ -29988,16 +30919,22 @@ printf %s "checking for Pa_GetDeviceCount in -lportaudio... " >&6; } if test ${ac_cv_lib_portaudio_Pa_GetDeviceCount+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lportaudio ${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. */ -char Pa_GetDeviceCount (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char Pa_GetDeviceCount (void); int main (void) { @@ -30009,20 +30946,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_portaudio_Pa_GetDeviceCount=yes -else $as_nop - ac_cv_lib_portaudio_Pa_GetDeviceCount=no +else case e in #( + e) ac_cv_lib_portaudio_Pa_GetDeviceCount=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5 printf "%s\n" "$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6; } if test "x$ac_cv_lib_portaudio_Pa_GetDeviceCount" = xyes then : AST_PORTAUDIO_FOUND=yes -else $as_nop - AST_PORTAUDIO_FOUND=no +else case e in #( + e) AST_PORTAUDIO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30044,8 +30984,9 @@ fi if test "x$ac_cv_header_portaudio_h" = xyes then : PORTAUDIO_HEADER_FOUND=1 -else $as_nop - PORTAUDIO_HEADER_FOUND=0 +else case e in #( + e) PORTAUDIO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30085,16 +31026,22 @@ printf %s "checking for pri_connected_line_update in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_connected_line_update+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_connected_line_update (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_connected_line_update (void); int main (void) { @@ -30106,20 +31053,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_connected_line_update=yes -else $as_nop - ac_cv_lib_pri_pri_connected_line_update=no +else case e in #( + e) ac_cv_lib_pri_pri_connected_line_update=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connected_line_update" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_FOUND=no +else case e in #( + e) AST_PRI_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30141,8 +31091,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_HEADER_FOUND=1 -else $as_nop - PRI_HEADER_FOUND=0 +else case e in #( + e) PRI_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30182,16 +31133,22 @@ printf %s "checking for pri_setup_ack in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_setup_ack+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_setup_ack (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_setup_ack (void); int main (void) { @@ -30203,20 +31160,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_setup_ack=yes -else $as_nop - ac_cv_lib_pri_pri_setup_ack=no +else case e in #( + e) ac_cv_lib_pri_pri_setup_ack=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_setup_ack" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_SETUP_ACK_INBAND_FOUND=no +else case e in #( + e) AST_PRI_SETUP_ACK_INBAND_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30238,8 +31198,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_SETUP_ACK_INBAND_HEADER_FOUND=1 -else $as_nop - PRI_SETUP_ACK_INBAND_HEADER_FOUND=0 +else case e in #( + e) PRI_SETUP_ACK_INBAND_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30278,16 +31239,22 @@ printf %s "checking for pri_persistent_layer2_option in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_persistent_layer2_option+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_persistent_layer2_option (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_persistent_layer2_option (void); int main (void) { @@ -30299,20 +31266,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_persistent_layer2_option=yes -else $as_nop - ac_cv_lib_pri_pri_persistent_layer2_option=no +else case e in #( + e) ac_cv_lib_pri_pri_persistent_layer2_option=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_persistent_layer2_option" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_L2_PERSISTENCE_FOUND=no +else case e in #( + e) AST_PRI_L2_PERSISTENCE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30334,8 +31304,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_L2_PERSISTENCE_HEADER_FOUND=1 -else $as_nop - PRI_L2_PERSISTENCE_HEADER_FOUND=0 +else case e in #( + e) PRI_L2_PERSISTENCE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30374,16 +31345,22 @@ printf %s "checking for pri_date_time_send_option in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_date_time_send_option+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_date_time_send_option (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_date_time_send_option (void); int main (void) { @@ -30395,20 +31372,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_date_time_send_option=yes -else $as_nop - ac_cv_lib_pri_pri_date_time_send_option=no +else case e in #( + e) ac_cv_lib_pri_pri_date_time_send_option=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_date_time_send_option" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_DATETIME_SEND_FOUND=no +else case e in #( + e) AST_PRI_DATETIME_SEND_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30430,8 +31410,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_DATETIME_SEND_HEADER_FOUND=1 -else $as_nop - PRI_DATETIME_SEND_HEADER_FOUND=0 +else case e in #( + e) PRI_DATETIME_SEND_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30470,16 +31451,22 @@ printf %s "checking for pri_mwi_indicate_v2 in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_mwi_indicate_v2+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_mwi_indicate_v2 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_mwi_indicate_v2 (void); int main (void) { @@ -30491,20 +31478,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_mwi_indicate_v2=yes -else $as_nop - ac_cv_lib_pri_pri_mwi_indicate_v2=no +else case e in #( + e) ac_cv_lib_pri_pri_mwi_indicate_v2=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate_v2" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_MWI_V2_FOUND=no +else case e in #( + e) AST_PRI_MWI_V2_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30526,8 +31516,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_MWI_V2_HEADER_FOUND=1 -else $as_nop - PRI_MWI_V2_HEADER_FOUND=0 +else case e in #( + e) PRI_MWI_V2_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30566,16 +31557,22 @@ printf %s "checking for pri_display_text in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_display_text+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_display_text (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_display_text (void); int main (void) { @@ -30587,20 +31584,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_display_text=yes -else $as_nop - ac_cv_lib_pri_pri_display_text=no +else case e in #( + e) ac_cv_lib_pri_pri_display_text=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_display_text" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_DISPLAY_TEXT_FOUND=no +else case e in #( + e) AST_PRI_DISPLAY_TEXT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30622,8 +31622,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_DISPLAY_TEXT_HEADER_FOUND=1 -else $as_nop - PRI_DISPLAY_TEXT_HEADER_FOUND=0 +else case e in #( + e) PRI_DISPLAY_TEXT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30662,16 +31663,22 @@ printf %s "checking for pri_mwi_indicate in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_mwi_indicate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_mwi_indicate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_mwi_indicate (void); int main (void) { @@ -30683,20 +31690,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_mwi_indicate=yes -else $as_nop - ac_cv_lib_pri_pri_mwi_indicate=no +else case e in #( + e) ac_cv_lib_pri_pri_mwi_indicate=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_MWI_FOUND=no +else case e in #( + e) AST_PRI_MWI_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30718,8 +31728,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_MWI_HEADER_FOUND=1 -else $as_nop - PRI_MWI_HEADER_FOUND=0 +else case e in #( + e) PRI_MWI_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30758,16 +31769,22 @@ printf %s "checking for pri_mcid_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_mcid_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_mcid_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_mcid_enable (void); int main (void) { @@ -30779,20 +31796,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_mcid_enable=yes -else $as_nop - ac_cv_lib_pri_pri_mcid_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_mcid_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mcid_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_MCID_FOUND=no +else case e in #( + e) AST_PRI_MCID_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30814,8 +31834,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_MCID_HEADER_FOUND=1 -else $as_nop - PRI_MCID_HEADER_FOUND=0 +else case e in #( + e) PRI_MCID_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30854,16 +31875,22 @@ printf %s "checking for pri_connect_ack_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_connect_ack_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_connect_ack_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_connect_ack_enable (void); int main (void) { @@ -30875,20 +31902,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_connect_ack_enable=yes -else $as_nop - ac_cv_lib_pri_pri_connect_ack_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_connect_ack_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connect_ack_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_CALL_WAITING_FOUND=no +else case e in #( + e) AST_PRI_CALL_WAITING_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -30910,8 +31940,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_CALL_WAITING_HEADER_FOUND=1 -else $as_nop - PRI_CALL_WAITING_HEADER_FOUND=0 +else case e in #( + e) PRI_CALL_WAITING_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -30950,16 +31981,22 @@ printf %s "checking for pri_aoc_events_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_aoc_events_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_aoc_events_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_aoc_events_enable (void); int main (void) { @@ -30971,20 +32008,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_aoc_events_enable=yes -else $as_nop - ac_cv_lib_pri_pri_aoc_events_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_aoc_events_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_aoc_events_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_AOC_EVENTS_FOUND=no +else case e in #( + e) AST_PRI_AOC_EVENTS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31006,8 +32046,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_AOC_EVENTS_HEADER_FOUND=1 -else $as_nop - PRI_AOC_EVENTS_HEADER_FOUND=0 +else case e in #( + e) PRI_AOC_EVENTS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31046,16 +32087,22 @@ printf %s "checking for pri_transfer_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_transfer_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_transfer_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_transfer_enable (void); int main (void) { @@ -31067,20 +32114,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_transfer_enable=yes -else $as_nop - ac_cv_lib_pri_pri_transfer_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_transfer_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_transfer_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_TRANSFER_FOUND=no +else case e in #( + e) AST_PRI_TRANSFER_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31102,8 +32152,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_TRANSFER_HEADER_FOUND=1 -else $as_nop - PRI_TRANSFER_HEADER_FOUND=0 +else case e in #( + e) PRI_TRANSFER_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31142,16 +32193,22 @@ printf %s "checking for pri_cc_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_cc_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_cc_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_cc_enable (void); int main (void) { @@ -31163,20 +32220,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_cc_enable=yes -else $as_nop - ac_cv_lib_pri_pri_cc_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_cc_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_cc_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_CCSS_FOUND=no +else case e in #( + e) AST_PRI_CCSS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31198,8 +32258,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_CCSS_HEADER_FOUND=1 -else $as_nop - PRI_CCSS_HEADER_FOUND=0 +else case e in #( + e) PRI_CCSS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31238,16 +32299,22 @@ printf %s "checking for pri_hangup_fix_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_hangup_fix_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_hangup_fix_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_hangup_fix_enable (void); int main (void) { @@ -31259,20 +32326,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_hangup_fix_enable=yes -else $as_nop - ac_cv_lib_pri_pri_hangup_fix_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_hangup_fix_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hangup_fix_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_HANGUP_FIX_FOUND=no +else case e in #( + e) AST_PRI_HANGUP_FIX_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31294,8 +32364,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_HANGUP_FIX_HEADER_FOUND=1 -else $as_nop - PRI_HANGUP_FIX_HEADER_FOUND=0 +else case e in #( + e) PRI_HANGUP_FIX_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31334,16 +32405,22 @@ printf %s "checking for pri_sr_set_called_subaddress in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_sr_set_called_subaddress+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_sr_set_called_subaddress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_sr_set_called_subaddress (void); int main (void) { @@ -31355,20 +32432,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_sr_set_called_subaddress=yes -else $as_nop - ac_cv_lib_pri_pri_sr_set_called_subaddress=no +else case e in #( + e) ac_cv_lib_pri_pri_sr_set_called_subaddress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_called_subaddress" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_SUBADDR_FOUND=no +else case e in #( + e) AST_PRI_SUBADDR_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31390,8 +32470,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_SUBADDR_HEADER_FOUND=1 -else $as_nop - PRI_SUBADDR_HEADER_FOUND=0 +else case e in #( + e) PRI_SUBADDR_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31430,16 +32511,22 @@ printf %s "checking for pri_hold_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_hold_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_hold_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_hold_enable (void); int main (void) { @@ -31451,20 +32538,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_hold_enable=yes -else $as_nop - ac_cv_lib_pri_pri_hold_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_hold_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hold_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_CALL_HOLD_FOUND=no +else case e in #( + e) AST_PRI_CALL_HOLD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31486,8 +32576,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_CALL_HOLD_HEADER_FOUND=1 -else $as_nop - PRI_CALL_HOLD_HEADER_FOUND=0 +else case e in #( + e) PRI_CALL_HOLD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31526,16 +32617,22 @@ printf %s "checking for pri_reroute_enable in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_reroute_enable+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_reroute_enable (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_reroute_enable (void); int main (void) { @@ -31547,20 +32644,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_reroute_enable=yes -else $as_nop - ac_cv_lib_pri_pri_reroute_enable=no +else case e in #( + e) ac_cv_lib_pri_pri_reroute_enable=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_reroute_enable" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_CALL_REROUTING_FOUND=no +else case e in #( + e) AST_PRI_CALL_REROUTING_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31582,8 +32682,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_CALL_REROUTING_HEADER_FOUND=1 -else $as_nop - PRI_CALL_REROUTING_HEADER_FOUND=0 +else case e in #( + e) PRI_CALL_REROUTING_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31622,16 +32723,22 @@ printf %s "checking for pri_sr_set_keypad_digits in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_sr_set_keypad_digits+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_sr_set_keypad_digits (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_sr_set_keypad_digits (void); int main (void) { @@ -31643,20 +32750,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_sr_set_keypad_digits=yes -else $as_nop - ac_cv_lib_pri_pri_sr_set_keypad_digits=no +else case e in #( + e) ac_cv_lib_pri_pri_sr_set_keypad_digits=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_keypad_digits" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_SETUP_KEYPAD_FOUND=no +else case e in #( + e) AST_PRI_SETUP_KEYPAD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31678,8 +32788,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_SETUP_KEYPAD_HEADER_FOUND=1 -else $as_nop - PRI_SETUP_KEYPAD_HEADER_FOUND=0 +else case e in #( + e) PRI_SETUP_KEYPAD_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31722,16 +32833,22 @@ printf %s "checking for pri_progress_with_cause in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_progress_with_cause+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_progress_with_cause (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_progress_with_cause (void); int main (void) { @@ -31743,20 +32860,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_progress_with_cause=yes -else $as_nop - ac_cv_lib_pri_pri_progress_with_cause=no +else case e in #( + e) ac_cv_lib_pri_pri_progress_with_cause=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_progress_with_cause" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_PROG_W_CAUSE_FOUND=no +else case e in #( + e) AST_PRI_PROG_W_CAUSE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31778,8 +32898,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_PROG_W_CAUSE_HEADER_FOUND=1 -else $as_nop - PRI_PROG_W_CAUSE_HEADER_FOUND=0 +else case e in #( + e) PRI_PROG_W_CAUSE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31818,16 +32939,22 @@ printf %s "checking for pri_set_inbanddisconnect in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_set_inbanddisconnect+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_set_inbanddisconnect (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_set_inbanddisconnect (void); int main (void) { @@ -31839,20 +32966,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_set_inbanddisconnect=yes -else $as_nop - ac_cv_lib_pri_pri_set_inbanddisconnect=no +else case e in #( + e) ac_cv_lib_pri_pri_set_inbanddisconnect=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_INBANDDISCONNECT_FOUND=no +else case e in #( + e) AST_PRI_INBANDDISCONNECT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31874,8 +33004,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_INBANDDISCONNECT_HEADER_FOUND=1 -else $as_nop - PRI_INBANDDISCONNECT_HEADER_FOUND=0 +else case e in #( + e) PRI_INBANDDISCONNECT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -31914,16 +33045,22 @@ printf %s "checking for pri_maintenance_service in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_maintenance_service+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_maintenance_service (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_maintenance_service (void); int main (void) { @@ -31935,20 +33072,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_maintenance_service=yes -else $as_nop - ac_cv_lib_pri_pri_maintenance_service=no +else case e in #( + e) ac_cv_lib_pri_pri_maintenance_service=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_maintenance_service" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_SERVICE_MESSAGES_FOUND=no +else case e in #( + e) AST_PRI_SERVICE_MESSAGES_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -31970,8 +33110,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_SERVICE_MESSAGES_HEADER_FOUND=1 -else $as_nop - PRI_SERVICE_MESSAGES_HEADER_FOUND=0 +else case e in #( + e) PRI_SERVICE_MESSAGES_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32010,16 +33151,22 @@ printf %s "checking for pri_sr_set_reversecharge in -lpri... " >&6; } if test ${ac_cv_lib_pri_pri_sr_set_reversecharge+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lpri ${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. */ -char pri_sr_set_reversecharge (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char pri_sr_set_reversecharge (void); int main (void) { @@ -32031,20 +33178,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_pri_pri_sr_set_reversecharge=yes -else $as_nop - ac_cv_lib_pri_pri_sr_set_reversecharge=no +else case e in #( + e) ac_cv_lib_pri_pri_sr_set_reversecharge=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_reversecharge" >&5 printf "%s\n" "$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 $as_nop - AST_PRI_REVERSE_CHARGE_FOUND=no +else case e in #( + e) AST_PRI_REVERSE_CHARGE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32066,8 +33216,9 @@ fi if test "x$ac_cv_header_libpri_h" = xyes then : PRI_REVERSE_CHARGE_HEADER_FOUND=1 -else $as_nop - PRI_REVERSE_CHARGE_HEADER_FOUND=0 +else case e in #( + e) PRI_REVERSE_CHARGE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32109,16 +33260,22 @@ printf %s "checking for resample_open in -lresample... " >&6; } if test ${ac_cv_lib_resample_resample_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lresample ${pbxlibdir} -lm $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. */ -char resample_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char resample_open (void); int main (void) { @@ -32130,20 +33287,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_resample_resample_open=yes -else $as_nop - ac_cv_lib_resample_resample_open=no +else case e in #( + e) ac_cv_lib_resample_resample_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resample_resample_open" >&5 printf "%s\n" "$ac_cv_lib_resample_resample_open" >&6; } if test "x$ac_cv_lib_resample_resample_open" = xyes then : AST_RESAMPLE_FOUND=yes -else $as_nop - AST_RESAMPLE_FOUND=no +else case e in #( + e) AST_RESAMPLE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32165,8 +33325,9 @@ fi if test "x$ac_cv_header_libresample_h" = xyes then : RESAMPLE_HEADER_FOUND=1 -else $as_nop - RESAMPLE_HEADER_FOUND=0 +else case e in #( + e) RESAMPLE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32205,16 +33366,22 @@ printf %s "checking for fftw_malloc in -lfftw3... " >&6; } if test ${ac_cv_lib_fftw3_fftw_malloc+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lfftw3 ${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. */ -char fftw_malloc (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char fftw_malloc (void); int main (void) { @@ -32226,20 +33393,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_fftw3_fftw_malloc=yes -else $as_nop - ac_cv_lib_fftw3_fftw_malloc=no +else case e in #( + e) ac_cv_lib_fftw3_fftw_malloc=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_malloc" >&5 printf "%s\n" "$ac_cv_lib_fftw3_fftw_malloc" >&6; } if test "x$ac_cv_lib_fftw3_fftw_malloc" = xyes then : AST_FFTW3_FOUND=yes -else $as_nop - AST_FFTW3_FOUND=no +else case e in #( + e) AST_FFTW3_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32261,8 +33431,9 @@ fi if test "x$ac_cv_header_fftw3_h" = xyes then : FFTW3_HEADER_FOUND=1 -else $as_nop - FFTW3_HEADER_FOUND=0 +else case e in #( + e) FFTW3_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32301,16 +33472,22 @@ printf %s "checking for sf_open in -lsndfile... " >&6; } if test ${ac_cv_lib_sndfile_sf_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsndfile ${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. */ -char sf_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sf_open (void); int main (void) { @@ -32322,20 +33499,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sndfile_sf_open=yes -else $as_nop - ac_cv_lib_sndfile_sf_open=no +else case e in #( + e) ac_cv_lib_sndfile_sf_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndfile_sf_open" >&5 printf "%s\n" "$ac_cv_lib_sndfile_sf_open" >&6; } if test "x$ac_cv_lib_sndfile_sf_open" = xyes then : AST_SNDFILE_FOUND=yes -else $as_nop - AST_SNDFILE_FOUND=no +else case e in #( + e) AST_SNDFILE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32357,8 +33537,9 @@ fi if test "x$ac_cv_header_sndfile_h" = xyes then : SNDFILE_HEADER_FOUND=1 -else $as_nop - SNDFILE_HEADER_FOUND=0 +else case e in #( + e) SNDFILE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32415,10 +33596,11 @@ printf "%s\n" "#define HAVE_SPANDSP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -32448,16 +33630,22 @@ printf %s "checking for span_set_message_handler in -lspandsp... " >&6; } if test ${ac_cv_lib_spandsp_span_set_message_handler+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lspandsp ${pbxlibdir} -ltiff $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. */ -char span_set_message_handler (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char span_set_message_handler (void); int main (void) { @@ -32469,20 +33657,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_spandsp_span_set_message_handler=yes -else $as_nop - ac_cv_lib_spandsp_span_set_message_handler=no +else case e in #( + e) ac_cv_lib_spandsp_span_set_message_handler=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_span_set_message_handler" >&5 printf "%s\n" "$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 $as_nop - AST_SPANDSP_FOUND=no +else case e in #( + e) AST_SPANDSP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32504,8 +33695,9 @@ fi if test "x$ac_cv_header_spandsp_h" = xyes then : SPANDSP_HEADER_FOUND=1 -else $as_nop - SPANDSP_HEADER_FOUND=0 +else case e in #( + e) SPANDSP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32549,16 +33741,22 @@ printf %s "checking for t38_terminal_init in -lspandsp... " >&6; } if test ${ac_cv_lib_spandsp_t38_terminal_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lspandsp ${pbxlibdir} -ltiff $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. */ -char t38_terminal_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char t38_terminal_init (void); int main (void) { @@ -32570,20 +33768,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_spandsp_t38_terminal_init=yes -else $as_nop - ac_cv_lib_spandsp_t38_terminal_init=no +else case e in #( + e) ac_cv_lib_spandsp_t38_terminal_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_t38_terminal_init" >&5 printf "%s\n" "$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 $as_nop - AST_SPANDSP_FOUND=no +else case e in #( + e) AST_SPANDSP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32605,8 +33806,9 @@ fi if test "x$ac_cv_header_spandsp_h" = xyes then : SPANDSP_HEADER_FOUND=1 -else $as_nop - SPANDSP_HEADER_FOUND=0 +else case e in #( + e) SPANDSP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32648,16 +33850,22 @@ printf %s "checking for ss7_set_isup_timer in -lss7... " >&6; } if test ${ac_cv_lib_ss7_ss7_set_isup_timer+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lss7 ${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. */ -char ss7_set_isup_timer (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char ss7_set_isup_timer (void); int main (void) { @@ -32669,20 +33877,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ss7_ss7_set_isup_timer=yes -else $as_nop - ac_cv_lib_ss7_ss7_set_isup_timer=no +else case e in #( + e) ac_cv_lib_ss7_ss7_set_isup_timer=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ss7_ss7_set_isup_timer" >&5 printf "%s\n" "$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 $as_nop - AST_SS7_FOUND=no +else case e in #( + e) AST_SS7_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32704,8 +33915,9 @@ fi if test "x$ac_cv_header_libss7_h" = xyes then : SS7_HEADER_FOUND=1 -else $as_nop - SS7_HEADER_FOUND=0 +else case e in #( + e) SS7_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32745,16 +33957,22 @@ printf %s "checking for openr2_chan_new in -lopenr2... " >&6; } if test ${ac_cv_lib_openr2_openr2_chan_new+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lopenr2 ${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. */ -char openr2_chan_new (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char openr2_chan_new (void); int main (void) { @@ -32766,20 +33984,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_openr2_openr2_chan_new=yes -else $as_nop - ac_cv_lib_openr2_openr2_chan_new=no +else case e in #( + e) ac_cv_lib_openr2_openr2_chan_new=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openr2_openr2_chan_new" >&5 printf "%s\n" "$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 $as_nop - AST_OPENR2_FOUND=no +else case e in #( + e) AST_OPENR2_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32801,8 +34022,9 @@ fi if test "x$ac_cv_header_openr2_h" = xyes then : OPENR2_HEADER_FOUND=1 -else $as_nop - OPENR2_HEADER_FOUND=0 +else case e in #( + e) OPENR2_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32842,16 +34064,22 @@ printf %s "checking for opus_encoder_create in -lopus... " >&6; } if test ${ac_cv_lib_opus_opus_encoder_create+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lopus ${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. */ -char opus_encoder_create (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char opus_encoder_create (void); int main (void) { @@ -32863,20 +34091,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_opus_opus_encoder_create=yes -else $as_nop - ac_cv_lib_opus_opus_encoder_create=no +else case e in #( + e) ac_cv_lib_opus_opus_encoder_create=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_encoder_create" >&5 printf "%s\n" "$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 $as_nop - AST_OPUS_FOUND=no +else case e in #( + e) AST_OPUS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -32898,8 +34129,9 @@ fi if test "x$ac_cv_header_opus_opus_h" = xyes then : OPUS_HEADER_FOUND=1 -else $as_nop - OPUS_HEADER_FOUND=0 +else case e in #( + e) OPUS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -32944,16 +34176,22 @@ printf %s "checking for op_open_callbacks in -lopusfile... " >&6; } if test ${ac_cv_lib_opusfile_op_open_callbacks+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lopusfile ${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. */ -char op_open_callbacks (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char op_open_callbacks (void); int main (void) { @@ -32965,20 +34203,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_opusfile_op_open_callbacks=yes -else $as_nop - ac_cv_lib_opusfile_op_open_callbacks=no +else case e in #( + e) ac_cv_lib_opusfile_op_open_callbacks=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5 printf "%s\n" "$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 $as_nop - AST_OPUSFILE_FOUND=no +else case e in #( + e) AST_OPUSFILE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33000,8 +34241,9 @@ fi if test "x$ac_cv_header_opus_opusfile_h" = xyes then : OPUSFILE_HEADER_FOUND=1 -else $as_nop - OPUSFILE_HEADER_FOUND=0 +else case e in #( + e) OPUSFILE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33037,22 +34279,28 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh` + as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | sed "$as_sed_sh"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 printf %s "checking for luaL_newstate in -llua${ver}... " >&6; } if eval test \${$as_ac_Lib+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-llua${ver} ${pbxlibdir} -lm $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. */ -char luaL_newstate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (void); int main (void) { @@ -33064,12 +34312,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$as_ac_Lib=yes" -else $as_nop - eval "$as_ac_Lib=no" +else case e in #( + e) eval "$as_ac_Lib=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi eval ac_res=\$$as_ac_Lib { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -33077,8 +34327,9 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_Lib"\" = x"yes" then : AST_LUA_FOUND=yes -else $as_nop - AST_LUA_FOUND=no +else case e in #( + e) AST_LUA_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33096,13 +34347,14 @@ fi # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" - as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` + as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | sed "$as_sed_sh"` ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" if eval test \"x\$"$as_ac_Header"\" = x"yes" then : LUA_HEADER_FOUND=1 -else $as_nop - LUA_HEADER_FOUND=0 +else case e in #( + e) LUA_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33153,16 +34405,22 @@ printf %s "checking for luaL_newstate in -llua... " >&6; } if test ${ac_cv_lib_lua_luaL_newstate+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-llua ${pbxlibdir} -lm $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. */ -char luaL_newstate (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (void); int main (void) { @@ -33174,20 +34432,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_lua_luaL_newstate=yes -else $as_nop - ac_cv_lib_lua_luaL_newstate=no +else case e in #( + e) ac_cv_lib_lua_luaL_newstate=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 printf "%s\n" "$ac_cv_lib_lua_luaL_newstate" >&6; } if test "x$ac_cv_lib_lua_luaL_newstate" = xyes then : AST_LUA_FOUND=yes -else $as_nop - AST_LUA_FOUND=no +else case e in #( + e) AST_LUA_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33209,8 +34470,9 @@ fi if test "x$ac_cv_header_lua_h" = xyes then : LUA_HEADER_FOUND=1 -else $as_nop - LUA_HEADER_FOUND=0 +else case e in #( + e) LUA_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33253,16 +34515,22 @@ printf %s "checking for rc_read_config in -lfreeradius-client... " >&6; } if test ${ac_cv_lib_freeradius_client_rc_read_config+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lfreeradius-client ${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. */ -char rc_read_config (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char rc_read_config (void); int main (void) { @@ -33274,20 +34542,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_freeradius_client_rc_read_config=yes -else $as_nop - ac_cv_lib_freeradius_client_rc_read_config=no +else case e in #( + e) ac_cv_lib_freeradius_client_rc_read_config=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5 printf "%s\n" "$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 $as_nop - AST_RADIUS_FOUND=no +else case e in #( + e) AST_RADIUS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33309,8 +34580,9 @@ fi if test "x$ac_cv_header_freeradius_client_h" = xyes then : RADIUS_HEADER_FOUND=1 -else $as_nop - RADIUS_HEADER_FOUND=0 +else case e in #( + e) RADIUS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33354,16 +34626,22 @@ printf %s "checking for rc_read_config in -lradiusclient-ng... " >&6; } if test ${ac_cv_lib_radiusclient_ng_rc_read_config+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lradiusclient-ng ${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. */ -char rc_read_config (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char rc_read_config (void); int main (void) { @@ -33375,20 +34653,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_radiusclient_ng_rc_read_config=yes -else $as_nop - ac_cv_lib_radiusclient_ng_rc_read_config=no +else case e in #( + e) ac_cv_lib_radiusclient_ng_rc_read_config=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5 printf "%s\n" "$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 $as_nop - AST_RADIUS_FOUND=no +else case e in #( + e) AST_RADIUS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33410,8 +34691,9 @@ fi if test "x$ac_cv_header_radiusclient_ng_h" = xyes then : RADIUS_HEADER_FOUND=1 -else $as_nop - RADIUS_HEADER_FOUND=0 +else case e in #( + e) RADIUS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33455,16 +34737,22 @@ printf %s "checking for rc_read_config in -lradcli... " >&6; } if test ${ac_cv_lib_radcli_rc_read_config+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lradcli ${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. */ -char rc_read_config (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char rc_read_config (void); int main (void) { @@ -33476,20 +34764,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_radcli_rc_read_config=yes -else $as_nop - ac_cv_lib_radcli_rc_read_config=no +else case e in #( + e) ac_cv_lib_radcli_rc_read_config=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5 printf "%s\n" "$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 $as_nop - AST_RADIUS_FOUND=no +else case e in #( + e) AST_RADIUS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33511,8 +34802,9 @@ fi if test "x$ac_cv_header_radcli_radcli_h" = xyes then : RADIUS_HEADER_FOUND=1 -else $as_nop - RADIUS_HEADER_FOUND=0 +else case e in #( + e) RADIUS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33559,16 +34851,22 @@ printf %s "checking for codec2_create in -lcodec2... " >&6; } if test ${ac_cv_lib_codec2_codec2_create+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcodec2 ${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. */ -char codec2_create (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char codec2_create (void); int main (void) { @@ -33580,20 +34878,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_codec2_codec2_create=yes -else $as_nop - ac_cv_lib_codec2_codec2_create=no +else case e in #( + e) ac_cv_lib_codec2_codec2_create=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_codec2_codec2_create" >&5 printf "%s\n" "$ac_cv_lib_codec2_codec2_create" >&6; } if test "x$ac_cv_lib_codec2_codec2_create" = xyes then : AST_CODEC2_FOUND=yes -else $as_nop - AST_CODEC2_FOUND=no +else case e in #( + e) AST_CODEC2_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33615,8 +34916,9 @@ fi if test "x$ac_cv_header_codec2_codec2_h" = xyes then : CODEC2_HEADER_FOUND=1 -else $as_nop - CODEC2_HEADER_FOUND=0 +else case e in #( + e) CODEC2_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33656,16 +34958,22 @@ printf %s "checking for cpg_join in -lcpg... " >&6; } if test ${ac_cv_lib_cpg_cpg_join+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcpg ${pbxlibdir} -lcpg -lcfg $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. */ -char cpg_join (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char cpg_join (void); int main (void) { @@ -33677,20 +34985,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_cpg_cpg_join=yes -else $as_nop - ac_cv_lib_cpg_cpg_join=no +else case e in #( + e) ac_cv_lib_cpg_cpg_join=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpg_cpg_join" >&5 printf "%s\n" "$ac_cv_lib_cpg_cpg_join" >&6; } if test "x$ac_cv_lib_cpg_cpg_join" = xyes then : AST_COROSYNC_FOUND=yes -else $as_nop - AST_COROSYNC_FOUND=no +else case e in #( + e) AST_COROSYNC_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33712,8 +35023,9 @@ fi if test "x$ac_cv_header_corosync_cpg_h" = xyes then : COROSYNC_HEADER_FOUND=1 -else $as_nop - COROSYNC_HEADER_FOUND=0 +else case e in #( + e) COROSYNC_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33752,16 +35064,22 @@ printf %s "checking for corosync_cfg_state_track in -lcfg... " >&6; } if test ${ac_cv_lib_cfg_corosync_cfg_state_track+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcfg ${pbxlibdir} -lcfg $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. */ -char corosync_cfg_state_track (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char corosync_cfg_state_track (void); int main (void) { @@ -33773,20 +35091,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_cfg_corosync_cfg_state_track=yes -else $as_nop - ac_cv_lib_cfg_corosync_cfg_state_track=no +else case e in #( + e) ac_cv_lib_cfg_corosync_cfg_state_track=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfg_corosync_cfg_state_track" >&5 printf "%s\n" "$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 $as_nop - AST_COROSYNC_CFG_STATE_TRACK_FOUND=no +else case e in #( + e) AST_COROSYNC_CFG_STATE_TRACK_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33808,8 +35129,9 @@ fi if test "x$ac_cv_header_corosync_cfg_h" = xyes then : COROSYNC_CFG_STATE_TRACK_HEADER_FOUND=1 -else $as_nop - COROSYNC_CFG_STATE_TRACK_HEADER_FOUND=0 +else case e in #( + e) COROSYNC_CFG_STATE_TRACK_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33849,16 +35171,22 @@ printf %s "checking for speex_encode in -lspeex... " >&6; } if test ${ac_cv_lib_speex_speex_encode+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lspeex ${pbxlibdir} -lm $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. */ -char speex_encode (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char speex_encode (void); int main (void) { @@ -33870,20 +35198,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_speex_speex_encode=yes -else $as_nop - ac_cv_lib_speex_speex_encode=no +else case e in #( + e) ac_cv_lib_speex_speex_encode=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_encode" >&5 printf "%s\n" "$ac_cv_lib_speex_speex_encode" >&6; } if test "x$ac_cv_lib_speex_speex_encode" = xyes then : AST_SPEEX_FOUND=yes -else $as_nop - AST_SPEEX_FOUND=no +else case e in #( + e) AST_SPEEX_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -33905,8 +35236,9 @@ fi if test "x$ac_cv_header_speex_speex_h" = xyes then : SPEEX_HEADER_FOUND=1 -else $as_nop - SPEEX_HEADER_FOUND=0 +else case e in #( + e) SPEEX_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -33947,16 +35279,22 @@ printf %s "checking for speex_preprocess_ctl in -lspeex... " >&6; } if test ${ac_cv_lib_speex_speex_preprocess_ctl+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lspeex ${pbxlibdir} -lm $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. */ -char speex_preprocess_ctl (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char speex_preprocess_ctl (void); int main (void) { @@ -33968,20 +35306,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_speex_speex_preprocess_ctl=yes -else $as_nop - ac_cv_lib_speex_speex_preprocess_ctl=no +else case e in #( + e) ac_cv_lib_speex_speex_preprocess_ctl=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5 printf "%s\n" "$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 $as_nop - AST_SPEEX_PREPROCESS_FOUND=no +else case e in #( + e) AST_SPEEX_PREPROCESS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34003,8 +35344,9 @@ fi if test "x$ac_cv_header_speex_speex_h" = xyes then : SPEEX_PREPROCESS_HEADER_FOUND=1 -else $as_nop - SPEEX_PREPROCESS_HEADER_FOUND=0 +else case e in #( + e) SPEEX_PREPROCESS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34047,16 +35389,22 @@ printf %s "checking for speex_preprocess_ctl in -lspeexdsp... " >&6; } if test ${ac_cv_lib_speexdsp_speex_preprocess_ctl+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lspeexdsp ${pbxlibdir} -lm $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. */ -char speex_preprocess_ctl (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char speex_preprocess_ctl (void); int main (void) { @@ -34068,20 +35416,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_speexdsp_speex_preprocess_ctl=yes -else $as_nop - ac_cv_lib_speexdsp_speex_preprocess_ctl=no +else case e in #( + e) ac_cv_lib_speexdsp_speex_preprocess_ctl=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5 printf "%s\n" "$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 $as_nop - AST_SPEEXDSP_FOUND=no +else case e in #( + e) AST_SPEEXDSP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34103,8 +35454,9 @@ fi if test "x$ac_cv_header_speex_speex_h" = xyes then : SPEEXDSP_HEADER_FOUND=1 -else $as_nop - SPEEXDSP_HEADER_FOUND=0 +else case e in #( + e) SPEEXDSP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34149,16 +35501,22 @@ printf %s "checking for sqlite_exec in -lsqlite... " >&6; } if test ${ac_cv_lib_sqlite_sqlite_exec+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite ${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. */ -char sqlite_exec (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite_exec (void); int main (void) { @@ -34170,20 +35528,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite_sqlite_exec=yes -else $as_nop - ac_cv_lib_sqlite_sqlite_exec=no +else case e in #( + e) ac_cv_lib_sqlite_sqlite_exec=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_exec" >&5 printf "%s\n" "$ac_cv_lib_sqlite_sqlite_exec" >&6; } if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes then : AST_SQLITE_FOUND=yes -else $as_nop - AST_SQLITE_FOUND=no +else case e in #( + e) AST_SQLITE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34205,8 +35566,9 @@ fi if test "x$ac_cv_header_sqlite_h" = xyes then : SQLITE_HEADER_FOUND=1 -else $as_nop - SQLITE_HEADER_FOUND=0 +else case e in #( + e) SQLITE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34246,16 +35608,22 @@ printf %s "checking for sqlite3_open in -lsqlite3... " >&6; } if test ${ac_cv_lib_sqlite3_sqlite3_open+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsqlite3 ${pbxlibdir} ${PTHREAD_LIBS} $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. */ -char sqlite3_open (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_open (void); int main (void) { @@ -34267,20 +35635,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sqlite3_sqlite3_open=yes -else $as_nop - ac_cv_lib_sqlite3_sqlite3_open=no +else case e in #( + e) ac_cv_lib_sqlite3_sqlite3_open=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5 printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; } if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes then : AST_SQLITE3_FOUND=yes -else $as_nop - AST_SQLITE3_FOUND=no +else case e in #( + e) AST_SQLITE3_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34302,8 +35673,9 @@ fi if test "x$ac_cv_header_sqlite3_h" = xyes then : SQLITE3_HEADER_FOUND=1 -else $as_nop - SQLITE3_HEADER_FOUND=0 +else case e in #( + e) SQLITE3_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34352,16 +35724,22 @@ printf %s "checking for crypt in -lcrypt... " >&6; } if test ${ac_cv_lib_crypt_crypt+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt ${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. */ -char crypt (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char crypt (void); int main (void) { @@ -34373,20 +35751,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypt_crypt=yes -else $as_nop - ac_cv_lib_crypt_crypt=no +else case e in #( + e) ac_cv_lib_crypt_crypt=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; } if test "x$ac_cv_lib_crypt_crypt" = xyes then : AST_LIBCRYPT_FOUND=yes -else $as_nop - AST_LIBCRYPT_FOUND=no +else case e in #( + e) AST_LIBCRYPT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34408,8 +35789,9 @@ fi if test "x$ac_cv_header_crypt_h" = xyes then : LIBCRYPT_HEADER_FOUND=1 -else $as_nop - LIBCRYPT_HEADER_FOUND=0 +else case e in #( + e) LIBCRYPT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34433,8 +35815,9 @@ ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt" if test "x$ac_cv_func_crypt" = xyes then : SYSCRYPT=true -else $as_nop - SYSCRYPT="" +else case e in #( + e) SYSCRYPT="" ;; +esac fi @@ -34461,16 +35844,22 @@ printf %s "checking for crypt_r in -lcrypt... " >&6; } if test ${ac_cv_lib_crypt_crypt_r+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $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. */ -char crypt_r (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char crypt_r (void); int main (void) { @@ -34482,12 +35871,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_crypt_crypt_r=yes -else $as_nop - ac_cv_lib_crypt_crypt_r=no +else case e in #( + e) ac_cv_lib_crypt_crypt_r=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5 printf "%s\n" "$ac_cv_lib_crypt_crypt_r" >&6; } @@ -34520,8 +35911,9 @@ then if test "x$ac_cv_header_osp_osp_h" = xyes then : osptk_header_found=yes -else $as_nop - osptk_header_found=no +else case e in #( + e) osptk_header_found=no ;; +esac fi CPPFLAGS="${osptk_saved_cppflags}" @@ -34535,16 +35927,22 @@ printf %s "checking for OSPPInit in -losptk... " >&6; } if test ${ac_cv_lib_osptk_OSPPInit+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-losptk ${osptk_ldflags} ${osptk_extralibs} $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. */ -char OSPPInit (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char OSPPInit (void); int main (void) { @@ -34556,20 +35954,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_osptk_OSPPInit=yes -else $as_nop - ac_cv_lib_osptk_OSPPInit=no +else case e in #( + e) ac_cv_lib_osptk_OSPPInit=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osptk_OSPPInit" >&5 printf "%s\n" "$ac_cv_lib_osptk_OSPPInit" >&6; } if test "x$ac_cv_lib_osptk_OSPPInit" = xyes then : osptk_library_found=yes -else $as_nop - osptk_library_found=no +else case e in #( + e) osptk_library_found=no ;; +esac fi @@ -34582,12 +35983,12 @@ printf %s "checking if OSP Toolkit version is compatible with app_osplookup... " CPPFLAGS="${CPPFLAGS} ${osptk_cflags}" if test "$cross_compiling" = yes then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -34601,12 +36002,14 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : osptk_compatible=yes -else $as_nop - osptk_compatible=no - +else case e in #( + e) osptk_compatible=no + ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi CPPFLAGS="${osptk_saved_cppflags}" @@ -34649,16 +36052,22 @@ printf %s "checking for srtp_init in -lsrtp2... " >&6; } if test ${ac_cv_lib_srtp2_srtp_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_init (void); int main (void) { @@ -34670,20 +36079,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_init=yes -else $as_nop - ac_cv_lib_srtp2_srtp_init=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_init" >&5 printf "%s\n" "$ac_cv_lib_srtp2_srtp_init" >&6; } if test "x$ac_cv_lib_srtp2_srtp_init" = xyes then : AST_SRTP_FOUND=yes -else $as_nop - AST_SRTP_FOUND=no +else case e in #( + e) AST_SRTP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34705,8 +36117,9 @@ fi if test "x$ac_cv_header_srtp2_srtp_h" = xyes then : SRTP_HEADER_FOUND=1 -else $as_nop - SRTP_HEADER_FOUND=0 +else case e in #( + e) SRTP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -34761,8 +36174,8 @@ then : printf "%s\n" "yes" >&6; } -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -34793,7 +36206,8 @@ printf "%s\n" "$as_me: WARNING: *** with the --without-srtp option." >&2;} exit 1 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -34824,16 +36238,22 @@ printf %s "checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 (void); int main (void) { @@ -34845,20 +36265,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes -else $as_nop - ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_256_FOUND=no +else case e in #( + e) AST_SRTP_256_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34910,16 +36333,22 @@ printf %s "checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 (void); int main (void) { @@ -34931,20 +36360,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes -else $as_nop - ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_192_FOUND=no +else case e in #( + e) AST_SRTP_192_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -34996,16 +36428,22 @@ printf %s "checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2... if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_crypto_policy_set_aes_gcm_128_8_auth (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_crypto_policy_set_aes_gcm_128_8_auth (void); int main (void) { @@ -35017,20 +36455,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes -else $as_nop - ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_GCM_FOUND=no +else case e in #( + e) AST_SRTP_GCM_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35082,16 +36523,22 @@ printf %s "checking for srtp_shutdown in -lsrtp2... " >&6; } if test ${ac_cv_lib_srtp2_srtp_shutdown+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_shutdown (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_shutdown (void); int main (void) { @@ -35103,20 +36550,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_shutdown=yes -else $as_nop - ac_cv_lib_srtp2_srtp_shutdown=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_shutdown=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_shutdown" >&5 printf "%s\n" "$ac_cv_lib_srtp2_srtp_shutdown" >&6; } if test "x$ac_cv_lib_srtp2_srtp_shutdown" = xyes then : AST_SRTP_SHUTDOWN_FOUND=yes -else $as_nop - AST_SRTP_SHUTDOWN_FOUND=no +else case e in #( + e) AST_SRTP_SHUTDOWN_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35138,8 +36588,9 @@ fi if test "x$ac_cv_header_srtp2_srtp_h" = xyes then : SRTP_SHUTDOWN_HEADER_FOUND=1 -else $as_nop - SRTP_SHUTDOWN_HEADER_FOUND=0 +else case e in #( + e) SRTP_SHUTDOWN_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -35178,16 +36629,22 @@ printf %s "checking for srtp_get_version_string in -lsrtp2... " >&6; } if test ${ac_cv_lib_srtp2_srtp_get_version_string+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp2 ${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. */ -char srtp_get_version_string (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_get_version_string (void); int main (void) { @@ -35199,20 +36656,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp2_srtp_get_version_string=yes -else $as_nop - ac_cv_lib_srtp2_srtp_get_version_string=no +else case e in #( + e) ac_cv_lib_srtp2_srtp_get_version_string=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_get_version_string" >&5 printf "%s\n" "$ac_cv_lib_srtp2_srtp_get_version_string" >&6; } if test "x$ac_cv_lib_srtp2_srtp_get_version_string" = xyes then : AST_SRTP_GET_VERSION_FOUND=yes -else $as_nop - AST_SRTP_GET_VERSION_FOUND=no +else case e in #( + e) AST_SRTP_GET_VERSION_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35234,8 +36694,9 @@ fi if test "x$ac_cv_header_srtp2_srtp_h" = xyes then : SRTP_GET_VERSION_HEADER_FOUND=1 -else $as_nop - SRTP_GET_VERSION_HEADER_FOUND=0 +else case e in #( + e) SRTP_GET_VERSION_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -35290,16 +36751,22 @@ printf %s "checking for srtp_init in -lsrtp... " >&6; } if test ${ac_cv_lib_srtp_srtp_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char srtp_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_init (void); int main (void) { @@ -35311,20 +36778,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_srtp_init=yes -else $as_nop - ac_cv_lib_srtp_srtp_init=no +else case e in #( + e) ac_cv_lib_srtp_srtp_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_init" >&5 printf "%s\n" "$ac_cv_lib_srtp_srtp_init" >&6; } if test "x$ac_cv_lib_srtp_srtp_init" = xyes then : AST_SRTP_FOUND=yes -else $as_nop - AST_SRTP_FOUND=no +else case e in #( + e) AST_SRTP_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35346,8 +36816,9 @@ fi if test "x$ac_cv_header_srtp_srtp_h" = xyes then : SRTP_HEADER_FOUND=1 -else $as_nop - SRTP_HEADER_FOUND=0 +else case e in #( + e) SRTP_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -35402,8 +36873,8 @@ then : printf "%s\n" "yes" >&6; } -else $as_nop - +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -35430,7 +36901,8 @@ printf "%s\n" "$as_me: WARNING: *** with the --without-srtp option." >&2;} exit 1 - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -35461,16 +36933,22 @@ printf %s "checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp... " if test ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char crypto_policy_set_aes_cm_256_hmac_sha1_80 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char crypto_policy_set_aes_cm_256_hmac_sha1_80 (void); int main (void) { @@ -35482,20 +36960,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes -else $as_nop - ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no +else case e in #( + e) ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_256_FOUND=no +else case e in #( + e) AST_SRTP_256_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35547,16 +37028,22 @@ printf %s "checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp... " if test ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char crypto_policy_set_aes_cm_192_hmac_sha1_80 (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char crypto_policy_set_aes_cm_192_hmac_sha1_80 (void); int main (void) { @@ -35568,20 +37055,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes -else $as_nop - ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no +else case e in #( + e) ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_192_FOUND=no +else case e in #( + e) AST_SRTP_192_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35633,16 +37123,22 @@ printf %s "checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp... " >&6; if test ${ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char crypto_policy_set_aes_gcm_128_8_auth (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char crypto_policy_set_aes_gcm_128_8_auth (void); int main (void) { @@ -35654,20 +37150,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes -else $as_nop - ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=no +else case e in #( + e) ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5 printf "%s\n" "$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 $as_nop - AST_SRTP_GCM_FOUND=no +else case e in #( + e) AST_SRTP_GCM_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35719,16 +37218,22 @@ printf %s "checking for srtp_shutdown in -lsrtp... " >&6; } if test ${ac_cv_lib_srtp_srtp_shutdown+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char srtp_shutdown (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_shutdown (void); int main (void) { @@ -35740,20 +37245,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_srtp_shutdown=yes -else $as_nop - ac_cv_lib_srtp_srtp_shutdown=no +else case e in #( + e) ac_cv_lib_srtp_srtp_shutdown=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5 printf "%s\n" "$ac_cv_lib_srtp_srtp_shutdown" >&6; } if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes then : AST_SRTP_SHUTDOWN_FOUND=yes -else $as_nop - AST_SRTP_SHUTDOWN_FOUND=no +else case e in #( + e) AST_SRTP_SHUTDOWN_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35775,8 +37283,9 @@ fi if test "x$ac_cv_header_srtp_srtp_h" = xyes then : SRTP_SHUTDOWN_HEADER_FOUND=1 -else $as_nop - SRTP_SHUTDOWN_HEADER_FOUND=0 +else case e in #( + e) SRTP_SHUTDOWN_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -35815,16 +37324,22 @@ printf %s "checking for srtp_get_version_string in -lsrtp... " >&6; } if test ${ac_cv_lib_srtp_srtp_get_version_string+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsrtp ${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. */ -char srtp_get_version_string (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char srtp_get_version_string (void); int main (void) { @@ -35836,20 +37351,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_srtp_srtp_get_version_string=yes -else $as_nop - ac_cv_lib_srtp_srtp_get_version_string=no +else case e in #( + e) ac_cv_lib_srtp_srtp_get_version_string=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_get_version_string" >&5 printf "%s\n" "$ac_cv_lib_srtp_srtp_get_version_string" >&6; } if test "x$ac_cv_lib_srtp_srtp_get_version_string" = xyes then : AST_SRTP_GET_VERSION_FOUND=yes -else $as_nop - AST_SRTP_GET_VERSION_FOUND=no +else case e in #( + e) AST_SRTP_GET_VERSION_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -35871,8 +37389,9 @@ fi if test "x$ac_cv_header_srtp_srtp_h" = xyes then : SRTP_GET_VERSION_HEADER_FOUND=1 -else $as_nop - SRTP_GET_VERSION_HEADER_FOUND=0 +else case e in #( + e) SRTP_GET_VERSION_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -35897,7 +37416,7 @@ fi for ver in 3.0 2.6 2.4 2.2 2.0; do - if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then + if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5 @@ -36008,16 +37527,22 @@ printf %s "checking for malloc in -lhoard... " >&6; } if test ${ac_cv_lib_hoard_malloc+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lhoard ${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. */ -char malloc (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char malloc (void); int main (void) { @@ -36029,20 +37554,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_hoard_malloc=yes -else $as_nop - ac_cv_lib_hoard_malloc=no +else case e in #( + e) ac_cv_lib_hoard_malloc=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5 printf "%s\n" "$ac_cv_lib_hoard_malloc" >&6; } if test "x$ac_cv_lib_hoard_malloc" = xyes then : AST_HOARD_FOUND=yes -else $as_nop - AST_HOARD_FOUND=no +else case e in #( + e) AST_HOARD_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36095,16 +37623,22 @@ printf %s "checking for dbinit in -lsybdb... " >&6; } if test ${ac_cv_lib_sybdb_dbinit+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lsybdb ${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. */ -char dbinit (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char dbinit (void); int main (void) { @@ -36116,20 +37650,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_sybdb_dbinit=yes -else $as_nop - ac_cv_lib_sybdb_dbinit=no +else case e in #( + e) ac_cv_lib_sybdb_dbinit=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbinit" >&5 printf "%s\n" "$ac_cv_lib_sybdb_dbinit" >&6; } if test "x$ac_cv_lib_sybdb_dbinit" = xyes then : AST_FREETDS_FOUND=yes -else $as_nop - AST_FREETDS_FOUND=no +else case e in #( + e) AST_FREETDS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36151,8 +37688,9 @@ fi if test "x$ac_cv_header_sybdb_h" = xyes then : FREETDS_HEADER_FOUND=1 -else $as_nop - FREETDS_HEADER_FOUND=0 +else case e in #( + e) FREETDS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -36178,16 +37716,22 @@ printf %s "checking for tone_zone_find_by_num in -ltonezone... " >&6; } if test ${ac_cv_lib_tonezone_tone_zone_find_by_num+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ltonezone $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. */ -char tone_zone_find_by_num (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char tone_zone_find_by_num (void); int main (void) { @@ -36199,20 +37743,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tonezone_tone_zone_find_by_num=yes -else $as_nop - ac_cv_lib_tonezone_tone_zone_find_by_num=no +else case e in #( + e) ac_cv_lib_tonezone_tone_zone_find_by_num=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5 printf "%s\n" "$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; } if test "x$ac_cv_lib_tonezone_tone_zone_find_by_num" = xyes then : tonezone_does_not_need_lm=yes -else $as_nop - tonezone_does_not_need_lm=no +else case e in #( + e) tonezone_does_not_need_lm=no ;; +esac fi @@ -36239,16 +37786,22 @@ printf %s "checking for tone_zone_find in -ltonezone... " >&6; } if test ${ac_cv_lib_tonezone_tone_zone_find+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} ${DAHDI_INCLUDE} $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. */ -char tone_zone_find (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char tone_zone_find (void); int main (void) { @@ -36260,20 +37813,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tonezone_tone_zone_find=yes -else $as_nop - ac_cv_lib_tonezone_tone_zone_find=no +else case e in #( + e) ac_cv_lib_tonezone_tone_zone_find=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find" >&5 printf "%s\n" "$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 $as_nop - AST_TONEZONE_FOUND=no +else case e in #( + e) AST_TONEZONE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36295,8 +37851,9 @@ fi if test "x$ac_cv_header_dahdi_tonezone_h" = xyes then : TONEZONE_HEADER_FOUND=1 -else $as_nop - TONEZONE_HEADER_FOUND=0 +else case e in #( + e) TONEZONE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -36336,16 +37893,22 @@ printf %s "checking for vorbis_info_init in -lvorbis... " >&6; } if test ${ac_cv_lib_vorbis_vorbis_info_init+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc -lvorbisfile $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. */ -char vorbis_info_init (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char vorbis_info_init (void); int main (void) { @@ -36357,20 +37920,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_vorbis_vorbis_info_init=yes -else $as_nop - ac_cv_lib_vorbis_vorbis_info_init=no +else case e in #( + e) ac_cv_lib_vorbis_vorbis_info_init=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5 printf "%s\n" "$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 $as_nop - AST_VORBIS_FOUND=no +else case e in #( + e) AST_VORBIS_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36392,8 +37958,9 @@ fi if test "x$ac_cv_header_vorbis_codec_h" = xyes then : VORBIS_HEADER_FOUND=1 -else $as_nop - VORBIS_HEADER_FOUND=0 +else case e in #( + e) VORBIS_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -36447,10 +38014,11 @@ printf "%s\n" "#define HAVE_VORBIS_OPEN_CALLBACKS 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -36501,12 +38069,13 @@ then : printf "%s\n" "yes" >&6; } ac_cv_lib_vpb_vpb_open="yes" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } ac_cv_lib_vpb_vpb_open="no" - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -36551,16 +38120,22 @@ printf %s "checking for compress in -lz... " >&6; } if test ${ac_cv_lib_z_compress+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lz ${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. */ -char compress (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char compress (void); int main (void) { @@ -36572,20 +38147,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_z_compress=yes -else $as_nop - ac_cv_lib_z_compress=no +else case e in #( + e) ac_cv_lib_z_compress=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 printf "%s\n" "$ac_cv_lib_z_compress" >&6; } if test "x$ac_cv_lib_z_compress" = xyes then : AST_ZLIB_FOUND=yes -else $as_nop - AST_ZLIB_FOUND=no +else case e in #( + e) AST_ZLIB_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36607,8 +38185,9 @@ fi if test "x$ac_cv_header_zlib_h" = xyes then : ZLIB_HEADER_FOUND=1 -else $as_nop - ZLIB_HEADER_FOUND=0 +else case e in #( + e) ZLIB_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -36652,10 +38231,11 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_ODBC_WCHAR 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -36680,8 +38260,9 @@ ac_fn_c_check_header_compile "$LINENO" "linux/ixjuser.h" "ac_cv_header_linux_ixj if test "x$ac_cv_header_linux_ixjuser_h" = xyes then : PBX_IXJUSER=1 -else $as_nop - PBX_IXJUSER=0 +else case e in #( + e) PBX_IXJUSER=0 ;; +esac fi @@ -36724,10 +38305,11 @@ printf "%s\n" "#define HAVE_MSG_NOSIGNAL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -36771,10 +38353,11 @@ printf "%s\n" "#define HAVE_SO_NOSIGPIPE 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -36793,8 +38376,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_SDL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_SDL in +else case e in #( + e) case $CONFIG_SDL in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_SDL="$CONFIG_SDL" # Let the user override the test with a path. ;; @@ -36820,6 +38403,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_SDL=$ac_cv_path_CONFIG_SDL @@ -36842,8 +38426,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_SDL+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_SDL in +else case e in #( + e) case $ac_pt_CONFIG_SDL in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_SDL="$ac_pt_CONFIG_SDL" # Let the user override the test with a path. ;; @@ -36869,6 +38453,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_SDL=$ac_cv_path_ac_pt_CONFIG_SDL @@ -36930,16 +38515,22 @@ printf %s "checking for IMG_Load in -lSDL_image... " >&6; } if test ${ac_cv_lib_SDL_image_IMG_Load+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lSDL_image ${pbxlibdir} ${SDL_LIB} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char IMG_Load (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char IMG_Load (void); int main (void) { @@ -36951,20 +38542,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_SDL_image_IMG_Load=yes -else $as_nop - ac_cv_lib_SDL_image_IMG_Load=no +else case e in #( + e) ac_cv_lib_SDL_image_IMG_Load=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5 printf "%s\n" "$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 $as_nop - AST_SDL_IMAGE_FOUND=no +else case e in #( + e) AST_SDL_IMAGE_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -36986,8 +38580,9 @@ fi if test "x$ac_cv_header_SDL_image_h" = xyes then : SDL_IMAGE_HEADER_FOUND=1 -else $as_nop - SDL_IMAGE_HEADER_FOUND=0 +else case e in #( + e) SDL_IMAGE_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -37026,16 +38621,22 @@ printf %s "checking for sws_getContext in -lavcodec... " >&6; } if test ${ac_cv_lib_avcodec_sws_getContext+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lavcodec ${pbxlibdir} ${PTHREAD_LIBS} -lz -lm $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. */ -char sws_getContext (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char sws_getContext (void); int main (void) { @@ -37047,20 +38648,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_avcodec_sws_getContext=yes -else $as_nop - ac_cv_lib_avcodec_sws_getContext=no +else case e in #( + e) ac_cv_lib_avcodec_sws_getContext=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5 printf "%s\n" "$ac_cv_lib_avcodec_sws_getContext" >&6; } if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes then : AST_FFMPEG_FOUND=yes -else $as_nop - AST_FFMPEG_FOUND=no +else case e in #( + e) AST_FFMPEG_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -37082,8 +38686,9 @@ fi if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes then : FFMPEG_HEADER_FOUND=1 -else $as_nop - FFMPEG_HEADER_FOUND=0 +else case e in #( + e) FFMPEG_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -37134,16 +38739,22 @@ printf %s "checking for XOpenDisplay in -lX11... " >&6; } if test ${ac_cv_lib_X11_XOpenDisplay+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 ${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. */ -char XOpenDisplay (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XOpenDisplay (void); int main (void) { @@ -37155,20 +38766,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_X11_XOpenDisplay=yes -else $as_nop - ac_cv_lib_X11_XOpenDisplay=no +else case e in #( + e) ac_cv_lib_X11_XOpenDisplay=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 printf "%s\n" "$ac_cv_lib_X11_XOpenDisplay" >&6; } if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes then : AST_X11_FOUND=yes -else $as_nop - AST_X11_FOUND=no +else case e in #( + e) AST_X11_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -37190,8 +38804,9 @@ fi if test "x$ac_cv_header_X11_Xlib_h" = xyes then : X11_HEADER_FOUND=1 -else $as_nop - X11_HEADER_FOUND=0 +else case e in #( + e) X11_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -37234,16 +38849,22 @@ printf %s "checking for XOpenDisplay in -lX11... " >&6; } if test ${ac_cv_lib_X11_XOpenDisplay+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 ${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. */ -char XOpenDisplay (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char XOpenDisplay (void); int main (void) { @@ -37255,20 +38876,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_X11_XOpenDisplay=yes -else $as_nop - ac_cv_lib_X11_XOpenDisplay=no +else case e in #( + e) ac_cv_lib_X11_XOpenDisplay=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 printf "%s\n" "$ac_cv_lib_X11_XOpenDisplay" >&6; } if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes then : AST_X11_FOUND=yes -else $as_nop - AST_X11_FOUND=no +else case e in #( + e) AST_X11_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -37290,8 +38914,9 @@ fi if test "x$ac_cv_header_X11_Xlib_h" = xyes then : X11_HEADER_FOUND=1 -else $as_nop - X11_HEADER_FOUND=0 +else case e in #( + e) X11_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -37324,14 +38949,15 @@ printf %s "checking for /sbin/launchd... " >&6; } if test ${ac_cv_file__sbin_launchd+y} then : printf %s "(cached) " >&6 -else $as_nop - test "$cross_compiling" = yes && +else case e in #( + e) test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/sbin/launchd"; then ac_cv_file__sbin_launchd=yes else ac_cv_file__sbin_launchd=no -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__sbin_launchd" >&5 printf "%s\n" "$ac_cv_file__sbin_launchd" >&6; } @@ -37347,7 +38973,7 @@ fi - if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then + if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5 @@ -37458,7 +39084,7 @@ fi - if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then + if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5 @@ -37587,10 +39213,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_AUTH 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37634,10 +39261,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_AUTHPRIV 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37681,10 +39309,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_CRON 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37728,10 +39357,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_DAEMON 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37775,10 +39405,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_FTP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37822,10 +39453,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_KERN 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37869,10 +39501,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_LPR 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37916,10 +39549,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_MAIL 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -37963,10 +39597,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_NEWS 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -38010,10 +39645,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_SYSLOG 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -38057,10 +39693,11 @@ printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_UUCP 1" >>confdefs.h -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - + ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS="${saved_cppflags}" @@ -38086,14 +39723,15 @@ printf %s "checking for bridges/bridge_softmix/include/hrirs.h... " >&6; } if test ${ac_cv_file_bridges_bridge_softmix_include_hrirs_h+y} then : printf %s "(cached) " >&6 -else $as_nop - test "$cross_compiling" = yes && +else case e in #( + e) test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "bridges/bridge_softmix/include/hrirs.h"; then ac_cv_file_bridges_bridge_softmix_include_hrirs_h=yes else ac_cv_file_bridges_bridge_softmix_include_hrirs_h=no -fi +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&5 printf "%s\n" "$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&6; } @@ -38155,8 +39793,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -38186,14 +39824,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -38254,6 +39892,12 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +# Check whether --enable-year2038 was given. +if test ${enable_year2038+y} +then : + enableval=$enable_year2038; +fi + : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -38283,7 +39927,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -38292,12 +39935,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -38369,7 +40013,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -38398,7 +40042,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -38438,11 +40081,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -38456,11 +40100,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -38543,9 +40188,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -38626,10 +40271,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -38645,7 +40292,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by asterisk $as_me 18, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -38676,7 +40323,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -38709,10 +40356,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ asterisk config.status 18 -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -38773,8 +40420,8 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -38782,8 +40429,8 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -38835,7 +40482,7 @@ do "build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;; "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -38854,7 +40501,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -38878,7 +40525,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -39036,13 +40683,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -39152,7 +40799,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -39174,19 +40821,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -39314,7 +40961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -39344,9 +40991,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index ec6f83e075..cf52d23001 100644 --- a/configure.ac +++ b/configure.ac @@ -607,6 +607,7 @@ AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_ENDPOINT_COMPACT_FORM], [PJSIP Compact Form Su AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE], [PJSIP Transport Connection Reuse Disabling], [PJPROJECT], [pjsip]) AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_OAUTH_AUTHENTICATION], [PJSIP OAuth Authentication Support], [PJPROJECT], [pjsip]) AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_TLS_TRANSPORT_RESTART], [PJSIP TLS Transport Restart Support], [PJPROJECT], [pjsip]) +AST_EXT_LIB_SETUP_OPTIONAL([PJSIP_EVSUB_PENDING_NOTIFY], [PJSIP NOTIFY Required on SUBSCRIBE], [PJPROJECT], [pjsip]) fi AST_EXT_LIB_SETUP([POPT], [popt], [popt]) @@ -2557,6 +2558,18 @@ if test "$USE_PJPROJECT" != "no" ; then AST_EXT_LIB_CHECK([PJSIP_AUTH_CLT_DEINIT], [pjsip], [pjsip_auth_clt_deinit], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJSIP_TSX_LAYER_FIND_TSX2], [pjsip], [pjsip_tsx_layer_find_tsx2], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) AST_EXT_LIB_CHECK([PJSIP_TLS_TRANSPORT_RESTART], [pjsip], [pjsip_tls_transport_restart], [pjsip.h], [$PJPROJECT_LIB], [$PJPROJECT_CFLAGS]) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pending_notify in evsub.c" >&5 + $as_echo_n "checking for pending_notify in evsub... " >&6; } + pending_notify=$(${SED} -n -r -e '/^struct\s+pjsip_evsub/,/^\s+void\s+*mod_data/!d ; /pending_notify/p' $(find $PJSIP_EVSUB_PENDING_NOTIFY_DIR -name evsub.c)) + if test -n "$pending_notify" ; then + AC_DEFINE(HAVE_PJSIP_EVSUB_PENDING_NOTIFY, 1, [Define to 1 if evsub requires a NOTIFY on SUBSCRIBE.]) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi fi fi diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 1ee9d6b610..e6afa52939 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -19,7 +19,7 @@ of a mutex to its initializer. */ #undef CAN_COMPARE_MUTEX_TO_INIT_VALUE -/* Define to 1 if the `closedir' function returns void instead of int. */ +/* Define to 1 if the 'closedir' function returns void instead of int. */ #undef CLOSEDIR_VOID /* Some configure tests will unexpectedly fail if configure is run by a @@ -32,10 +32,10 @@ /* Define to 1 if anonymous semaphores work. */ #undef HAS_WORKING_SEMAPHORE -/* Define to 1 if you have the `acos' function. */ +/* Define to 1 if you have the 'acos' function. */ #undef HAVE_ACOS -/* Define to 1 if you have the `acosl' function. */ +/* Define to 1 if you have the 'acosl' function. */ #undef HAVE_ACOSL /* Define to 1 if you have 'alloca', as a function or macro. */ @@ -53,31 +53,31 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H -/* Define to 1 if you have the `asin' function. */ +/* Define to 1 if you have the 'asin' function. */ #undef HAVE_ASIN -/* Define to 1 if you have the `asinl' function. */ +/* Define to 1 if you have the 'asinl' function. */ #undef HAVE_ASINL -/* Define to 1 if you have the `asprintf' function. */ +/* Define to 1 if you have the 'asprintf' function. */ #undef HAVE_ASPRINTF /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H -/* Define to 1 if you have the `atan' function. */ +/* Define to 1 if you have the 'atan' function. */ #undef HAVE_ATAN -/* Define to 1 if you have the `atan2' function. */ +/* Define to 1 if you have the 'atan2' function. */ #undef HAVE_ATAN2 -/* Define to 1 if you have the `atan2l' function. */ +/* Define to 1 if you have the 'atan2l' function. */ #undef HAVE_ATAN2L -/* Define to 1 if you have the `atanl' function. */ +/* Define to 1 if you have the 'atanl' function. */ #undef HAVE_ATANL -/* Define to 1 if you have the `atexit' function. */ +/* Define to 1 if you have the 'atexit' function. */ #undef HAVE_ATEXIT /* Define to 1 if your GCC C compiler supports the 'always_inline' attribute. @@ -130,7 +130,7 @@ /* Define to 1 if you have the Bluetooth library. */ #undef HAVE_BLUETOOTH -/* Define to 1 if you have the file `bridges/bridge_softmix/include/hrirs.h'. +/* Define to 1 if you have the file 'bridges/bridge_softmix/include/hrirs.h'. */ #undef HAVE_BRIDGES_BRIDGE_SOFTMIX_INCLUDE_HRIRS_H @@ -140,16 +140,16 @@ /* Define to 1 if you have the POSIX 1.e capabilities library. */ #undef HAVE_CAP -/* Define to 1 if you have the `ceil' function. */ +/* Define to 1 if you have the 'ceil' function. */ #undef HAVE_CEIL -/* Define to 1 if you have the `ceill' function. */ +/* Define to 1 if you have the 'ceill' function. */ #undef HAVE_CEILL -/* Define to 1 if your system has a working `chown' function. */ +/* Define to 1 if your system has a working 'chown' function. */ #undef HAVE_CHOWN -/* Define to 1 if you have the `closefrom' function. */ +/* Define to 1 if you have the 'closefrom' function. */ #undef HAVE_CLOSEFROM /* Define to 1 if you have the Codec 2 Audio Decoder/Encoder library. */ @@ -161,10 +161,10 @@ /* Define to 1 if COROSYNC has the A callback only in corosync 1.x feature. */ #undef HAVE_COROSYNC_CFG_STATE_TRACK -/* Define to 1 if you have the `cos' function. */ +/* Define to 1 if you have the 'cos' function. */ #undef HAVE_COS -/* Define to 1 if you have the `cosl' function. */ +/* Define to 1 if you have the 'cosl' function. */ #undef HAVE_COSL /* Define to 1 if you have the 'crypt' function. */ @@ -200,11 +200,11 @@ /* Define DAHDI headers version */ #undef HAVE_DAHDI_VERSION -/* Define to 1 if you have the declaration of `gethostbyname_r', and to 0 if +/* Define to 1 if you have the declaration of 'gethostbyname_r', and to 0 if you don't. */ #undef HAVE_DECL_GETHOSTBYNAME_R -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_DIRENT_H @@ -214,44 +214,44 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */ #undef HAVE_DOPRNT -/* Define to 1 if you have the `dup2' function. */ +/* Define to 1 if you have the 'dup2' function. */ #undef HAVE_DUP2 -/* Define to 1 if you have the `eaccess' function. */ +/* Define to 1 if you have the 'eaccess' function. */ #undef HAVE_EACCESS -/* Define to 1 if you have the `endpwent' function. */ +/* Define to 1 if you have the 'endpwent' function. */ #undef HAVE_ENDPWENT /* Define to 1 if you have the header file. */ #undef HAVE_ERRNO_H -/* Define to 1 if you have the `euidaccess' function. */ +/* Define to 1 if you have the 'euidaccess' function. */ #undef HAVE_EUIDACCESS /* Define to 1 if your system supports eventfd and the EFD_NONBLOCK and EFD_SEMAPHORE flags. */ #undef HAVE_EVENTFD -/* Define to 1 if you have the `exp' function. */ +/* Define to 1 if you have the 'exp' function. */ #undef HAVE_EXP -/* Define to 1 if you have the `exp10' function. */ +/* Define to 1 if you have the 'exp10' function. */ #undef HAVE_EXP10 -/* Define to 1 if you have the `exp10l' function. */ +/* Define to 1 if you have the 'exp10l' function. */ #undef HAVE_EXP10L -/* Define to 1 if you have the `exp2' function. */ +/* Define to 1 if you have the 'exp2' function. */ #undef HAVE_EXP2 -/* Define to 1 if you have the `exp2l' function. */ +/* Define to 1 if you have the 'exp2l' function. */ #undef HAVE_EXP2L -/* Define to 1 if you have the `expl' function. */ +/* Define to 1 if you have the 'expl' function. */ #undef HAVE_EXPL /* Define to 1 if you have the header file. */ @@ -260,7 +260,7 @@ /* Define to 1 if you have the Ffmpeg and avcodec library. */ #undef HAVE_FFMPEG -/* Define to 1 if you have the `ffsll' function. */ +/* Define to 1 if you have the 'ffsll' function. */ #undef HAVE_FFSLL /* Define to 1 if you have the LIBFFTW3 library. */ @@ -269,37 +269,37 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FLOAT_H -/* Define to 1 if you have the `floor' function. */ +/* Define to 1 if you have the 'floor' function. */ #undef HAVE_FLOOR -/* Define to 1 if you have the `floorl' function. */ +/* Define to 1 if you have the 'floorl' function. */ #undef HAVE_FLOORL -/* Define to 1 if you have the `fmod' function. */ +/* Define to 1 if you have the 'fmod' function. */ #undef HAVE_FMOD -/* Define to 1 if you have the `fmodl' function. */ +/* Define to 1 if you have the 'fmodl' function. */ #undef HAVE_FMODL -/* Define to 1 if you have the `fork' function. */ +/* Define to 1 if you have the 'fork' function. */ #undef HAVE_FORK /* Define to 1 if you have the FreeTDS library. */ #undef HAVE_FREETDS -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ #undef HAVE_FSEEKO -/* Define to 1 if you have the `ftruncate' function. */ +/* Define to 1 if you have the 'ftruncate' function. */ #undef HAVE_FTRUNCATE /* Define to 1 if your GCC C compiler provides __sync atomic operations. */ #undef HAVE_GCC_ATOMICS -/* Define to 1 if you have the `getcwd' function. */ +/* Define to 1 if you have the 'getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `gethostbyname' function. */ +/* Define to 1 if you have the 'gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME /* Define to 1 if your system has gethostbyname_r with 5 arguments. */ @@ -308,25 +308,25 @@ /* Define to 1 if your system has gethostbyname_r with 6 arguments. */ #undef HAVE_GETHOSTBYNAME_R_6 -/* Define to 1 if you have the `gethostname' function. */ +/* Define to 1 if you have the 'gethostname' function. */ #undef HAVE_GETHOSTNAME /* Define if your system has the GETIFADDRS headers. */ #undef HAVE_GETIFADDRS -/* Define to 1 if you have the `getloadavg' function. */ +/* Define to 1 if you have the 'getloadavg' function. */ #undef HAVE_GETLOADAVG -/* Define to 1 if you have the `getpagesize' function. */ +/* Define to 1 if you have the 'getpagesize' function. */ #undef HAVE_GETPAGESIZE -/* Define to 1 if you have the `getpeereid' function. */ +/* Define to 1 if you have the 'getpeereid' function. */ #undef HAVE_GETPEEREID -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define to 1 if you have the 'gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `glob' function. */ +/* Define to 1 if you have the 'glob' function. */ #undef HAVE_GLOB /* Define if your system has the GLOB_BRACE headers. */ @@ -378,10 +378,10 @@ or greater. */ #undef HAVE_IMAP_TK2006 -/* Define to 1 if you have the `inet_aton' function. */ +/* Define to 1 if you have the 'inet_aton' function. */ #undef HAVE_INET_ATON -/* Define to 1 if you have the `inet_ntoa' function. */ +/* Define to 1 if you have the 'inet_ntoa' function. */ #undef HAVE_INET_NTOA /* Define to 1 if you have the inotify support library. */ @@ -393,13 +393,13 @@ /* Define to 1 if you have the iODBC library. */ #undef HAVE_IODBC -/* Define to 1 if you have the `ioperm' function. */ +/* Define to 1 if you have the 'ioperm' function. */ #undef HAVE_IOPERM /* Define if your system has the IP_MTU_DISCOVER headers. */ #undef HAVE_IP_MTU_DISCOVER -/* Define to 1 if you have the `isascii' function. */ +/* Define to 1 if you have the 'isascii' function. */ #undef HAVE_ISASCII /* Define to 1 if you have the ISDN4Linux library. */ @@ -414,7 +414,7 @@ /* Define if your system has JANSSON_BUNDLED */ #undef HAVE_JANSSON_BUNDLED -/* Define to 1 if you have the `kevent64' function. */ +/* Define to 1 if you have the 'kevent64' function. */ #undef HAVE_KEVENT64 /* Define to 1 if you have the kqueue support library. */ @@ -438,7 +438,7 @@ /* Define if your system has LIBJWT_BUNDLED */ #undef HAVE_LIBJWT_BUNDLED -/* Define to 1 if you have the `m' library (-lm). */ +/* Define to 1 if you have the 'm' library (-lm). */ #undef HAVE_LIBM /* Define if your system has the LIBXML2 libraries. */ @@ -468,26 +468,26 @@ /* Define to 1 if your system defines the locale_t type in xlocale.h */ #undef HAVE_LOCALE_T_IN_XLOCALE_H -/* Define to 1 if you have the `log' function. */ +/* Define to 1 if you have the 'log' function. */ #undef HAVE_LOG -/* Define to 1 if you have the `log10' function. */ +/* Define to 1 if you have the 'log10' function. */ #undef HAVE_LOG10 -/* Define to 1 if you have the `log10l' function. */ +/* Define to 1 if you have the 'log10l' function. */ #undef HAVE_LOG10L -/* Define to 1 if you have the `log2' function. */ +/* Define to 1 if you have the 'log2' function. */ #undef HAVE_LOG2 -/* Define to 1 if you have the `log2l' function. */ +/* Define to 1 if you have the 'log2l' function. */ #undef HAVE_LOG2L -/* Define to 1 if you have the `logl' function. */ +/* Define to 1 if you have the 'logl' function. */ #undef HAVE_LOGL -/* Define to 1 if the type `long double' works and has more range or precision - than `double'. */ +/* Define to 1 if the type 'long double' works and has more range or precision + than 'double'. */ #undef HAVE_LONG_DOUBLE_WIDER /* Define to 1 if you have the Lua library. */ @@ -496,19 +496,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H -/* Define to 1 if you have the `malloc_trim' function. */ +/* Define to 1 if you have the 'malloc_trim' function. */ #undef HAVE_MALLOC_TRIM /* Define to 1 if you have the header file. */ #undef HAVE_MATH_H -/* Define to 1 if you have the `memchr' function. */ +/* Define to 1 if you have the 'memchr' function. */ #undef HAVE_MEMCHR -/* Define to 1 if you have the `memmove' function. */ +/* Define to 1 if you have the 'memmove' function. */ #undef HAVE_MEMMOVE -/* Define to 1 if you have the `memset' function. */ +/* Define to 1 if you have the 'memset' function. */ #undef HAVE_MEMSET /* Define to 1 if you have the header file. */ @@ -523,19 +523,19 @@ /* Define if your system has the MISDN_FAC_RESULT headers. */ #undef HAVE_MISDN_FAC_RESULT -/* Define to 1 if you have the `mkdir' function. */ +/* Define to 1 if you have the 'mkdir' function. */ #undef HAVE_MKDIR -/* Define to 1 if you have the `mkdtemp' function. */ +/* Define to 1 if you have the 'mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define to 1 if you have a working `mmap' system call. */ +/* Define to 1 if you have a working 'mmap' system call. */ #undef HAVE_MMAP /* Define if your system has the MSG_NOSIGNAL headers. */ #undef HAVE_MSG_NOSIGNAL -/* Define to 1 if you have the `munmap' function. */ +/* Define to 1 if you have the 'munmap' function. */ #undef HAVE_MUNMAP /* Define if your system has the MYSQLCLIENT libraries. */ @@ -550,7 +550,7 @@ /* Define to 1 if you have the Network Broadcast Sound library. */ #undef HAVE_NBS -/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_NDIR_H /* Define if your system has the NEON libraries. */ @@ -568,7 +568,7 @@ /* Define if your system has the NETSNMP libraries. */ #undef HAVE_NETSNMP -/* Define to 1 if you have the `newlocale' function. */ +/* Define to 1 if you have the 'newlocale' function. */ #undef HAVE_NEWLOCALE /* Define to 1 if you have the newt library. */ @@ -622,7 +622,7 @@ /* Define to indicate presence of the pg_encoding_to_char API. */ #undef HAVE_PGSQL_pg_encoding_to_char -/* Define to 1 if you have the `pipe2' function. */ +/* Define to 1 if you have the 'pipe2' function. */ #undef HAVE_PIPE2 /* Define if your system has the PJPROJECT libraries. */ @@ -631,9 +631,6 @@ /* Define if your system has PJPROJECT_BUNDLED */ #undef HAVE_PJPROJECT_BUNDLED -/* Define if doing a bundled pjproject out-of-tree build. */ -#undef HAVE_PJPROJECT_BUNDLED_OOT - /* Define to 1 if on_valid_pair callback is present. */ #undef HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK @@ -650,6 +647,9 @@ /* Define to 1 if PJPROJECT has the PJSIP EVSUB Group Lock support feature. */ #undef HAVE_PJSIP_EVSUB_GRP_LOCK +/* Define to 1 if evsub requires a NOTIFY on SUBSCRIBE. */ +#undef HAVE_PJSIP_EVSUB_PENDING_NOTIFY + /* Define to 1 if PJPROJECT has the PJSIP External Resolver Support feature. */ #undef HAVE_PJSIP_EXTERNAL_RESOLVER @@ -712,13 +712,13 @@ /* Define if your system has the PORTAUDIO libraries. */ #undef HAVE_PORTAUDIO -/* Define to 1 if you have the `pow' function. */ +/* Define to 1 if you have the 'pow' function. */ #undef HAVE_POW -/* Define to 1 if you have the `powl' function. */ +/* Define to 1 if you have the 'powl' function. */ #undef HAVE_POWL -/* Define to 1 if you have the `ppoll' function. */ +/* Define to 1 if you have the 'ppoll' function. */ #undef HAVE_PPOLL /* Define to 1 if you have the ISDN PRI library. */ @@ -823,10 +823,10 @@ /* Define to 1 if your system has pthread_spinlock_t in pthread.h */ #undef HAVE_PTHREAD_SPINLOCK -/* Define to 1 if the system has the type `ptrdiff_t'. */ +/* Define to 1 if the system has the type 'ptrdiff_t'. */ #undef HAVE_PTRDIFF_T -/* Define to 1 if you have the `putenv' function. */ +/* Define to 1 if you have the 'putenv' function. */ #undef HAVE_PUTENV /* Define to 1 if you have the header file. */ @@ -838,16 +838,16 @@ /* Define to 1 if you have the Radius Client library. */ #undef HAVE_RADIUS -/* Define to 1 if you have the `regcomp' function. */ +/* Define to 1 if you have the 'regcomp' function. */ #undef HAVE_REGCOMP /* Define to 1 if you have the header file. */ #undef HAVE_REGEX_H -/* Define to 1 if you have the `remainder' function. */ +/* Define to 1 if you have the 'remainder' function. */ #undef HAVE_REMAINDER -/* Define to 1 if you have the `remainderl' function. */ +/* Define to 1 if you have the 'remainderl' function. */ #undef HAVE_REMAINDERL /* Define to 1 if you have the LIBRESAMPLE library. */ @@ -865,22 +865,22 @@ /* Define to 1 if your system has the re-entrant resolver functions. */ #undef HAVE_RES_NINIT -/* Define to 1 if you have the `re_comp' function. */ +/* Define to 1 if you have the 're_comp' function. */ #undef HAVE_RE_COMP -/* Define to 1 if you have the `rint' function. */ +/* Define to 1 if you have the 'rint' function. */ #undef HAVE_RINT -/* Define to 1 if you have the `rintl' function. */ +/* Define to 1 if you have the 'rintl' function. */ #undef HAVE_RINTL -/* Define to 1 if you have the `round' function. */ +/* Define to 1 if you have the 'round' function. */ #undef HAVE_ROUND -/* Define to 1 if you have the `roundf' function. */ +/* Define to 1 if you have the 'roundf' function. */ #undef HAVE_ROUNDF -/* Define to 1 if you have the `roundl' function. */ +/* Define to 1 if you have the 'roundl' function. */ #undef HAVE_ROUNDL /* Define to 1 if rt has the Realtime functions feature. */ @@ -901,22 +901,22 @@ /* Define to 1 if you have the Sdl Image library. */ #undef HAVE_SDL_IMAGE -/* Define to 1 if you have the `select' function. */ +/* Define to 1 if you have the 'select' function. */ #undef HAVE_SELECT -/* Define to 1 if you have the `setenv' function. */ +/* Define to 1 if you have the 'setenv' function. */ #undef HAVE_SETENV -/* Define to 1 if you have the `sin' function. */ +/* Define to 1 if you have the 'sin' function. */ #undef HAVE_SIN -/* Define to 1 if you have the `sinl' function. */ +/* Define to 1 if you have the 'sinl' function. */ #undef HAVE_SINL /* Define to 1 if you have the libsndfile library. */ #undef HAVE_SNDFILE -/* Define to 1 if you have the `socket' function. */ +/* Define to 1 if you have the 'socket' function. */ #undef HAVE_SOCKET /* Define to 1 if your socket() implementation can accept SOCK_NONBLOCK. */ @@ -946,7 +946,7 @@ /* Define to 1 if you have the SQLite library. */ #undef HAVE_SQLITE3 -/* Define to 1 if you have the `sqrtl' function. */ +/* Define to 1 if you have the 'sqrtl' function. */ #undef HAVE_SQRTL /* Define to 1 if you have the Secure RTP library. */ @@ -974,7 +974,7 @@ /* Define to 1 if you have the ISDN SS7 library. */ #undef HAVE_SS7 -/* Define to 1 if `stat' has the bug that it succeeds when given the +/* Define to 1 if 'stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -996,29 +996,29 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define to 1 if you have the 'strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define to 1 if you have the `strcasestr' function. */ +/* Define to 1 if you have the 'strcasestr' function. */ #undef HAVE_STRCASESTR -/* Define to 1 if you have the `strchr' function. */ +/* Define to 1 if you have the 'strchr' function. */ #undef HAVE_STRCHR -/* Define to 1 if you have the `strcoll' function and it is properly defined. +/* Define to 1 if you have the 'strcoll' function and it is properly defined. */ #undef HAVE_STRCOLL -/* Define to 1 if you have the `strcspn' function. */ +/* Define to 1 if you have the 'strcspn' function. */ #undef HAVE_STRCSPN -/* Define to 1 if you have the `strdup' function. */ +/* Define to 1 if you have the 'strdup' function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the `strerror' function. */ +/* Define to 1 if you have the 'strerror' function. */ #undef HAVE_STRERROR -/* Define to 1 if you have the `strftime' function. */ +/* Define to 1 if you have the 'strftime' function. */ #undef HAVE_STRFTIME /* Define to 1 if you have the header file. */ @@ -1027,79 +1027,79 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define to 1 if you have the 'strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strncasecmp' function. */ +/* Define to 1 if you have the 'strncasecmp' function. */ #undef HAVE_STRNCASECMP -/* Define to 1 if you have the `strndup' function. */ +/* Define to 1 if you have the 'strndup' function. */ #undef HAVE_STRNDUP -/* Define to 1 if you have the `strnlen' function. */ +/* Define to 1 if you have the 'strnlen' function. */ #undef HAVE_STRNLEN -/* Define to 1 if you have the `strrchr' function. */ +/* Define to 1 if you have the 'strrchr' function. */ #undef HAVE_STRRCHR -/* Define to 1 if you have the `strsep' function. */ +/* Define to 1 if you have the 'strsep' function. */ #undef HAVE_STRSEP -/* Define to 1 if you have the `strspn' function. */ +/* Define to 1 if you have the 'strspn' function. */ #undef HAVE_STRSPN -/* Define to 1 if you have the `strstr' function. */ +/* Define to 1 if you have the 'strstr' function. */ #undef HAVE_STRSTR -/* Define to 1 if you have the `strtod' function. */ +/* Define to 1 if you have the 'strtod' function. */ #undef HAVE_STRTOD -/* Define to 1 if you have the `strtol' function. */ +/* Define to 1 if you have the 'strtol' function. */ #undef HAVE_STRTOL -/* Define to 1 if you have the `strtold' function. */ +/* Define to 1 if you have the 'strtold' function. */ #undef HAVE_STRTOLD -/* Define to 1 if you have the `strtoq' function. */ +/* Define to 1 if you have the 'strtoq' function. */ #undef HAVE_STRTOQ -/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */ +/* Define to 1 if 'ifr_ifru.ifru_hwaddr' is a member of 'struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR -/* Define to 1 if `uid' is a member of `struct sockpeercred'. */ +/* Define to 1 if 'uid' is a member of 'struct sockpeercred'. */ #undef HAVE_STRUCT_SOCKPEERCRED_UID -/* Define to 1 if `st_blksize' is a member of `struct stat'. */ +/* Define to 1 if 'st_blksize' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE -/* Define to 1 if `st_mtim' is a member of `struct stat'. */ +/* Define to 1 if 'st_mtim' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM -/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */ +/* Define to 1 if 'st_mtimensec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIMENSEC -/* Define to 1 if `st_mtimespec' is a member of `struct stat'. */ +/* Define to 1 if 'st_mtimespec' is a member of 'struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIMESPEC -/* Define to 1 if `cr_uid' is a member of `struct ucred'. */ +/* Define to 1 if 'cr_uid' is a member of 'struct ucred'. */ #undef HAVE_STRUCT_UCRED_CR_UID -/* Define to 1 if `uid' is a member of `struct ucred'. */ +/* Define to 1 if 'uid' is a member of 'struct ucred'. */ #undef HAVE_STRUCT_UCRED_UID -/* Define to 1 if `_u._ext.nsaddrs' is a member of `struct __res_state'. */ +/* Define to 1 if '_u._ext.nsaddrs' is a member of 'struct __res_state'. */ #undef HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS /* Define to 1 if you have the mISDN Supplemental Services library. */ #undef HAVE_SUPPSERV -/* Define to 1 if you have the `swapctl' function. */ +/* Define to 1 if you have the 'swapctl' function. */ #undef HAVE_SWAPCTL -/* Define to 1 if you have the `sysctl' function. */ +/* Define to 1 if you have the 'sysctl' function. */ #undef HAVE_SYSCTL /* Define to 1 if your system has sysinfo support */ @@ -1144,7 +1144,7 @@ /* Define if your system has the SYSTEMD libraries. */ #undef HAVE_SYSTEMD -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_SYS_DIR_H @@ -1164,7 +1164,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the header file, and it defines `DIR'. +/* Define to 1 if you have the header file, and it defines 'DIR'. */ #undef HAVE_SYS_NDIR_H @@ -1198,10 +1198,10 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the `tan' function. */ +/* Define to 1 if you have the 'tan' function. */ #undef HAVE_TAN -/* Define to 1 if you have the `tanl' function. */ +/* Define to 1 if you have the 'tanl' function. */ #undef HAVE_TANL /* Define to 1 if you have the header file. */ @@ -1219,10 +1219,10 @@ /* Define to 1 if you have the tonezone library. */ #undef HAVE_TONEZONE -/* Define to 1 if you have the `trunc' function. */ +/* Define to 1 if you have the 'trunc' function. */ #undef HAVE_TRUNC -/* Define to 1 if you have the `truncl' function. */ +/* Define to 1 if you have the 'truncl' function. */ #undef HAVE_TRUNCL /* Define to 1 if you have the unbound library. */ @@ -1234,35 +1234,35 @@ /* Define to 1 if you have the unixODBC library. */ #undef HAVE_UNIXODBC -/* Define to 1 if you have the `unsetenv' function. */ +/* Define to 1 if you have the 'unsetenv' function. */ #undef HAVE_UNSETENV /* Define to 1 if you have the uriparser library library. */ #undef HAVE_URIPARSER -/* Define to 1 if you have the `uselocale' function. */ +/* Define to 1 if you have the 'uselocale' function. */ #undef HAVE_USELOCALE -/* Define to 1 if you have the `utime' function. */ +/* Define to 1 if you have the 'utime' function. */ #undef HAVE_UTIME /* Define to 1 if you have the header file. */ #undef HAVE_UTIME_H -/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ +/* Define to 1 if 'utime(file, NULL)' sets file's timestamp to the present. */ #undef HAVE_UTIME_NULL -/* Define to 1 if you have the `uuid_generate_random' function. */ +/* Define to 1 if you have the 'uuid_generate_random' function. */ #undef HAVE_UUID_GENERATE_RANDOM /* Define to 1 if your system can support larger than default select bitmasks. */ #undef HAVE_VARIABLE_FDSET -/* Define to 1 if you have the `vasprintf' function. */ +/* Define to 1 if you have the 'vasprintf' function. */ #undef HAVE_VASPRINTF -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ @@ -1280,7 +1280,7 @@ /* Define if your system has the VoiceTronix API libraries. */ #undef HAVE_VPB -/* Define to 1 if you have the `vprintf' function. */ +/* Define to 1 if you have the 'vprintf' function. */ #undef HAVE_VPRINTF /* Define to 1 if you have the header file. */ @@ -1310,7 +1310,7 @@ /* Define to 1 if you have the zlib compression library. */ #undef HAVE_ZLIB -/* Define to 1 if the system has the type `_Bool'. */ +/* Define to 1 if the system has the type '_Bool'. */ #undef HAVE__BOOL /* Defined if libcurl supports AsynchDNS */ @@ -1376,7 +1376,7 @@ /* Defined if libcurl supports TFTP */ #undef LIBCURL_PROTOCOL_TFTP -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing +/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK @@ -1411,28 +1411,28 @@ /* Name of RADIUS library include header */ #undef RADIUS_HEADER_STR -/* Define to the type of arg 1 for `select'. */ +/* Define to the type of arg 1 for 'select'. */ #undef SELECT_TYPE_ARG1 -/* Define to the type of args 2, 3 and 4 for `select'. */ +/* Define to the type of args 2, 3 and 4 for 'select'. */ #undef SELECT_TYPE_ARG234 -/* Define to the type of arg 5 for `select'. */ +/* Define to the type of arg 5 for 'select'. */ #undef SELECT_TYPE_ARG5 -/* The size of `char *', as computed by sizeof. */ +/* The size of 'char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P -/* The size of `fd_set.fds_bits', as computed by sizeof. */ +/* The size of 'fd_set.fds_bits', as computed by sizeof. */ #undef SIZEOF_FD_SET_FDS_BITS -/* The size of `int', as computed by sizeof. */ +/* The size of 'int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of `long', as computed by sizeof. */ +/* The size of 'long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `long long', as computed by sizeof. */ +/* The size of 'long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG /* If using the C implementation of alloca, define if you know the @@ -1443,18 +1443,18 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to 1 if your declares `struct tm'. */ +/* Define to 1 if your declares 'struct tm'. */ #undef TM_IN_SYS_TIME /* Define to a type of the same size as fd_set.fds_bits[[0]] */ #undef TYPEOF_FD_SET_FDS_BITS -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -1515,11 +1515,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1556,47 +1560,53 @@ */ #undef _HAVE_STRING_ARCH_strsep -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES -/* Define to empty if `const' does not conform to ANSI C. */ +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT + +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const /* Define curl_free() as free() if our version of curl lacks curl_free. */ #undef curl_free -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef gid_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `int' if does not define. */ +/* Define to 'int' if does not define. */ #undef mode_t -/* Define to `long int' if does not define. */ +/* Define to 'long int' if does not define. */ #undef off_t /* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t -/* Define to `unsigned int' if does not define. */ +/* Define as 'unsigned int' if doesn't define. */ #undef size_t -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef uid_t /* Define as `fork' if `vfork' does not work. */ #undef vfork -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ +/* Define to empty if the keyword 'volatile' does not work. Warning: valid + code using 'volatile' can become incorrect without. Disable with care. */ #undef volatile #endif /* ASTERISK_AUTOCONFIG_H */ diff --git a/menuselect/autoconfig.h.in b/menuselect/autoconfig.h.in index 8047d7a84c..5199dcb8fe 100644 --- a/menuselect/autoconfig.h.in +++ b/menuselect/autoconfig.h.in @@ -4,28 +4,22 @@ #define MENUSELECT_AUTOCONFIG_H -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ +/* Define to 1 if using 'alloca.c'. */ #undef C_ALLOCA -/* Define to 1 if you have `alloca', as a function or macro. */ +/* Define to 1 if you have 'alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* Define to 1 if you have and it should be used (not on Ultrix). - */ +/* Define to 1 if works. */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the `asprintf' function. */ +/* Define to 1 if you have the 'asprintf' function. */ #undef HAVE_ASPRINTF /* Define to 1 if you have the curses library. */ #undef HAVE_CURSES -/* Define to 1 if you have the `getloadavg' function. */ +/* Define to 1 if you have the 'getloadavg' function. */ #undef HAVE_GETLOADAVG /* Define if your system has the GTK2 libraries. */ @@ -37,25 +31,25 @@ /* Define if your system has the LIBXML2 libraries. */ #undef HAVE_LIBXML2 -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the ncurses library. */ #undef HAVE_NCURSES /* Define to 1 if you have the newt library. */ #undef HAVE_NEWT -/* Define to 1 if you have the `setenv' function. */ +/* Define to 1 if you have the 'setenv' function. */ #undef HAVE_SETENV /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasestr' function. */ +/* Define to 1 if you have the 'strcasestr' function. */ #undef HAVE_STRCASESTR /* Define to 1 if you have the header file. */ @@ -64,13 +58,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strndup' function. */ +/* Define to 1 if you have the 'strndup' function. */ #undef HAVE_STRNDUP -/* Define to 1 if you have the `strnlen' function. */ +/* Define to 1 if you have the 'strnlen' function. */ #undef HAVE_STRNLEN -/* Define to 1 if you have the `strsep' function. */ +/* Define to 1 if you have the 'strsep' function. */ #undef HAVE_STRSEP /* Define to 1 if you have the header file. */ @@ -85,10 +79,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `unsetenv' function. */ +/* Define to 1 if you have the 'unsetenv' function. */ #undef HAVE_UNSETENV -/* Define to 1 if you have the `vasprintf' function. */ +/* Define to 1 if you have the 'vasprintf' function. */ #undef HAVE_VASPRINTF /* Define to the address where bug reports for this package should be sent. */ @@ -117,10 +111,12 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to `unsigned int' if does not define. */ +/* Define as 'unsigned int' if doesn't define. */ #undef size_t #endif diff --git a/menuselect/configure b/menuselect/configure index b598a3dda3..53199c46c8 100755 --- a/menuselect/configure +++ b/menuselect/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -17,7 +17,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -26,12 +25,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -103,7 +103,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -133,15 +133,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -149,12 +148,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -172,8 +172,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -187,14 +188,15 @@ test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -227,12 +229,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -254,7 +257,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,7 +276,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -312,14 +316,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -388,11 +384,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -406,21 +403,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -494,6 +484,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -542,7 +534,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -554,9 +545,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -581,10 +572,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -901,7 +894,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1114,7 +1107,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1130,7 +1123,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1160,8 +1153,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1169,7 +1162,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1219,7 +1212,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1287,7 +1280,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1315,7 +1308,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1329,11 +1322,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1341,10 +1334,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1418,7 +1411,7 @@ Some influential environment variables: GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config GTK2_LIBS linker flags for GTK2, overriding pkg-config -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1486,9 +1479,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1529,11 +1522,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1552,8 +1546,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 @@ -1583,12 +1577,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - eval "$3=yes" +else case e in #( + e) eval "$3=yes" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1609,8 +1605,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1618,10 +1614,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1661,11 +1659,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1707,12 +1706,13 @@ printf "%s\n" "$ac_try_echo"; } >&5 test $ac_status = 0; }; } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: program exited with status $ac_status" >&5 +else case e in #( + e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=$ac_status + ac_retval=$ac_status ;; +esac fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -1731,15 +1731,15 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. For example, HP-UX 11i declares gettimeofday. */ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include #undef $2 @@ -1750,7 +1750,7 @@ else $as_nop #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -1769,11 +1769,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1806,7 +1808,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2052,10 +2054,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2091,9 +2093,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2107,6 +2107,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2134,16 +2149,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2193,7 +2211,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2259,6 +2276,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2280,7 +2299,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2472,8 +2491,9 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +else case e in #( + e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; +esac fi @@ -2501,12 +2521,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2515,18 +2535,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2542,11 +2562,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2582,15 +2602,16 @@ printf %s "checking build system type... " >&6; } if test ${ac_cv_build+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_build_alias=$build_alias +else case e in #( + e) ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 printf "%s\n" "$ac_cv_build" >&6; } @@ -2617,14 +2638,15 @@ printf %s "checking host system type... " >&6; } if test ${ac_cv_host+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "x$host_alias" = x; then +else case e in #( + e) if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 printf "%s\n" "$ac_cv_host" >&6; } @@ -2692,8 +2714,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2715,7 +2737,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2737,8 +2760,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2760,7 +2783,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2795,8 +2819,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2818,7 +2842,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2840,8 +2865,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2880,7 +2905,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2904,8 +2930,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2927,7 +2953,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2953,8 +2980,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2976,7 +3003,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -3014,8 +3042,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3037,7 +3065,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -3059,8 +3088,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3082,7 +3111,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -3111,10 +3141,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3186,8 +3216,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -3207,7 +3237,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -3218,8 +3248,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -3228,13 +3259,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3258,10 +3290,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3271,11 +3303,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3291,6 +3324,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3330,26 +3365,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3381,16 +3417,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3401,8 +3439,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3419,12 +3457,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3442,8 +3482,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3461,8 +3501,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3477,8 +3517,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3495,12 +3535,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3527,8 +3570,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3545,25 +3588,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3573,8 +3619,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3591,25 +3637,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3619,8 +3668,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3637,25 +3686,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -3670,8 +3722,8 @@ printf %s "checking for GNU make... " >&6; } if test ${ac_cv_GNU_MAKE+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_GNU_MAKE='Not Found' ; +else case e in #( + e) ac_cv_GNU_MAKE='Not Found' ; ac_cv_GNU_MAKE_VERSION_MAJOR=0 ; ac_cv_GNU_MAKE_VERSION_MINOR=0 ; for a in make gmake gnumake ; do @@ -3683,7 +3735,8 @@ else $as_nop break; fi done ; - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5 printf "%s\n" "$ac_cv_GNU_MAKE" >&6; } ; @@ -3711,8 +3764,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PKG_CONFIG in +else case e in #( + e) case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; @@ -3737,6 +3790,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG @@ -3759,8 +3813,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PKG_CONFIG in +else case e in #( + e) case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; @@ -3785,6 +3839,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG @@ -3825,6 +3880,9 @@ printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi +if test -z "$PKG_CONFIG"; then + as_fn_error $? "pkg-config not found" "$LINENO" 5 +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3878,10 +3936,11 @@ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" if test "x$ac_cv_type_size_t" = xyes then : -else $as_nop - +else case e in #( + e) printf "%s\n" "#define size_t unsigned int" >>confdefs.h - + ;; +esac fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works @@ -3891,8 +3950,8 @@ printf %s "checking for working alloca.h... " >&6; } if test ${ac_cv_working_alloca_h+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -3907,11 +3966,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_working_alloca_h=yes -else $as_nop - ac_cv_working_alloca_h=no +else case e in #( + e) ac_cv_working_alloca_h=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 printf "%s\n" "$ac_cv_working_alloca_h" >&6; } @@ -3926,10 +3987,10 @@ printf %s "checking for alloca... " >&6; } if test ${ac_cv_func_alloca_works+y} then : printf %s "(cached) " >&6 -else $as_nop - if test $ac_cv_working_alloca_h = yes; then - ac_cv_func_alloca_works=yes -else +else case e in #( + e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h +if test "$ac_cv_func_alloca_works" != yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -3960,15 +4021,14 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_func_alloca_works=yes -else $as_nop - ac_cv_func_alloca_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext +fi ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 printf "%s\n" "$ac_cv_func_alloca_works" >&6; } -fi if test $ac_cv_func_alloca_works = yes; then @@ -3990,12 +4050,12 @@ printf %s "checking stack direction for C alloca... " >&6; } if test ${ac_cv_c_stack_direction+y} then : printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes +else case e in #( + e) if test "$cross_compiling" = yes then : ac_cv_c_stack_direction=0 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int @@ -4018,13 +4078,16 @@ _ACEOF if ac_fn_c_try_run "$LINENO" then : ac_cv_c_stack_direction=1 -else $as_nop - ac_cv_c_stack_direction=-1 +else case e in #( + e) ac_cv_c_stack_direction=-1 ;; +esac fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 printf "%s\n" "$ac_cv_c_stack_direction" >&6; } @@ -4276,16 +4339,22 @@ printf %s "checking for newtBell in -lnewt... " >&6; } if test ${ac_cv_lib_newt_newtBell+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lnewt ${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. */ -char newtBell (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char newtBell (void); int main (void) { @@ -4297,20 +4366,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_newt_newtBell=yes -else $as_nop - ac_cv_lib_newt_newtBell=no +else case e in #( + e) ac_cv_lib_newt_newtBell=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5 printf "%s\n" "$ac_cv_lib_newt_newtBell" >&6; } if test "x$ac_cv_lib_newt_newtBell" = xyes then : AST_NEWT_FOUND=yes -else $as_nop - AST_NEWT_FOUND=no +else case e in #( + e) AST_NEWT_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4332,8 +4404,9 @@ fi if test "x$ac_cv_header_newt_h" = xyes then : NEWT_HEADER_FOUND=1 -else $as_nop - NEWT_HEADER_FOUND=0 +else case e in #( + e) NEWT_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4372,16 +4445,22 @@ printf %s "checking for initscr in -lncurses... " >&6; } if test ${ac_cv_lib_ncurses_initscr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses ${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. */ -char initscr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (void); int main (void) { @@ -4393,20 +4472,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ncurses_initscr=yes -else $as_nop - ac_cv_lib_ncurses_initscr=no +else case e in #( + e) ac_cv_lib_ncurses_initscr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 printf "%s\n" "$ac_cv_lib_ncurses_initscr" >&6; } if test "x$ac_cv_lib_ncurses_initscr" = xyes then : AST_NCURSES_FOUND=yes -else $as_nop - AST_NCURSES_FOUND=no +else case e in #( + e) AST_NCURSES_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4428,8 +4510,9 @@ fi if test "x$ac_cv_header_ncurses_h" = xyes then : NCURSES_HEADER_FOUND=1 -else $as_nop - NCURSES_HEADER_FOUND=0 +else case e in #( + e) NCURSES_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4470,16 +4553,22 @@ printf %s "checking for initscr in -lncurses... " >&6; } if test ${ac_cv_lib_ncurses_initscr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses ${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. */ -char initscr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (void); int main (void) { @@ -4491,20 +4580,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_ncurses_initscr=yes -else $as_nop - ac_cv_lib_ncurses_initscr=no +else case e in #( + e) ac_cv_lib_ncurses_initscr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 printf "%s\n" "$ac_cv_lib_ncurses_initscr" >&6; } if test "x$ac_cv_lib_ncurses_initscr" = xyes then : AST_NCURSES_FOUND=yes -else $as_nop - AST_NCURSES_FOUND=no +else case e in #( + e) AST_NCURSES_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4526,8 +4618,9 @@ fi if test "x$ac_cv_header_ncurses_ncurses_h" = xyes then : NCURSES_HEADER_FOUND=1 -else $as_nop - NCURSES_HEADER_FOUND=0 +else case e in #( + e) NCURSES_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4567,16 +4660,22 @@ printf %s "checking for initscr in -lcurses... " >&6; } if test ${ac_cv_lib_curses_initscr+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses ${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. */ -char initscr (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (void); int main (void) { @@ -4588,20 +4687,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_curses_initscr=yes -else $as_nop - ac_cv_lib_curses_initscr=no +else case e in #( + e) ac_cv_lib_curses_initscr=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 printf "%s\n" "$ac_cv_lib_curses_initscr" >&6; } if test "x$ac_cv_lib_curses_initscr" = xyes then : AST_CURSES_FOUND=yes -else $as_nop - AST_CURSES_FOUND=no +else case e in #( + e) AST_CURSES_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4623,8 +4725,9 @@ fi if test "x$ac_cv_header_curses_h" = xyes then : CURSES_HEADER_FOUND=1 -else $as_nop - CURSES_HEADER_FOUND=0 +else case e in #( + e) CURSES_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4671,16 +4774,22 @@ printf %s "checking for keypad in -ltinfo... " >&6; } if test ${ac_cv_lib_tinfo_keypad+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo ${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. */ -char keypad (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char keypad (void); int main (void) { @@ -4692,20 +4801,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tinfo_keypad=yes -else $as_nop - ac_cv_lib_tinfo_keypad=no +else case e in #( + e) ac_cv_lib_tinfo_keypad=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5 printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; } if test "x$ac_cv_lib_tinfo_keypad" = xyes then : AST_TINFO_FOUND=yes -else $as_nop - AST_TINFO_FOUND=no +else case e in #( + e) AST_TINFO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4727,8 +4839,9 @@ fi if test "x$ac_cv_header_ncurses_ncurses_h" = xyes then : TINFO_HEADER_FOUND=1 -else $as_nop - TINFO_HEADER_FOUND=0 +else case e in #( + e) TINFO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4768,16 +4881,22 @@ printf %s "checking for keypad in -ltinfo... " >&6; } if test ${ac_cv_lib_tinfo_keypad+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo ${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. */ -char keypad (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char keypad (void); int main (void) { @@ -4789,20 +4908,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tinfo_keypad=yes -else $as_nop - ac_cv_lib_tinfo_keypad=no +else case e in #( + e) ac_cv_lib_tinfo_keypad=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5 printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; } if test "x$ac_cv_lib_tinfo_keypad" = xyes then : AST_TINFO_FOUND=yes -else $as_nop - AST_TINFO_FOUND=no +else case e in #( + e) AST_TINFO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4824,8 +4946,9 @@ fi if test "x$ac_cv_header_ncurses_h" = xyes then : TINFO_HEADER_FOUND=1 -else $as_nop - TINFO_HEADER_FOUND=0 +else case e in #( + e) TINFO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4866,16 +4989,22 @@ printf %s "checking for keypad in -ltinfo... " >&6; } if test ${ac_cv_lib_tinfo_keypad+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS +else case e in #( + e) ac_check_lib_save_LIBS=$LIBS LIBS="-ltinfo ${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. */ -char keypad (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char keypad (void); int main (void) { @@ -4887,20 +5016,23 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : ac_cv_lib_tinfo_keypad=yes -else $as_nop - ac_cv_lib_tinfo_keypad=no +else case e in #( + e) ac_cv_lib_tinfo_keypad=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +LIBS=$ac_check_lib_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5 printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; } if test "x$ac_cv_lib_tinfo_keypad" = xyes then : AST_TINFO_FOUND=yes -else $as_nop - AST_TINFO_FOUND=no +else case e in #( + e) AST_TINFO_FOUND=no ;; +esac fi CFLAGS="${ast_ext_lib_check_save_CFLAGS}" @@ -4922,8 +5054,9 @@ fi if test "x$ac_cv_header_curses_h" = xyes then : TINFO_HEADER_FOUND=1 -else $as_nop - TINFO_HEADER_FOUND=0 +else case e in #( + e) TINFO_HEADER_FOUND=0 ;; +esac fi CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" @@ -4945,83 +5078,8 @@ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -printf %s "checking for a sed that does not truncate output... " >&6; } -if test ${ac_cv_path_SED+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in sed gsed - do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - printf %s 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - printf "%s\n" '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf "%s\n" "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - - - if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then + if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5 @@ -5108,6 +5166,83 @@ printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h fi fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" | sed 99q >conftest.sed + $as_unset ac_script || ac_script= + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in #( +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +#( +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + ;; +esac +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then PBX_LIBXML2=0 @@ -5119,8 +5254,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_CONFIG_LIBXML2+y} then : printf %s "(cached) " >&6 -else $as_nop - case $CONFIG_LIBXML2 in +else case e in #( + e) case $CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) ac_cv_path_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test with a path. ;; @@ -5146,6 +5281,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2 @@ -5168,8 +5304,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ac_pt_CONFIG_LIBXML2+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_CONFIG_LIBXML2 in +else case e in #( + e) case $ac_pt_CONFIG_LIBXML2 in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_CONFIG_LIBXML2="$ac_pt_CONFIG_LIBXML2" # Let the user override the test with a path. ;; @@ -5195,6 +5331,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2 @@ -5267,7 +5404,7 @@ if test "${PBX_LIBXML2}" != 1; then fi - if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then + if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5 @@ -5372,8 +5509,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5403,14 +5540,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5500,7 +5637,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -5509,12 +5645,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -5586,7 +5723,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -5615,7 +5752,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -5655,11 +5791,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -5673,11 +5810,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -5760,9 +5898,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -5843,10 +5981,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -5862,7 +6002,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5893,7 +6033,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -5926,10 +6066,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5988,8 +6128,8 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; + as_fn_error $? "ambiguous option: '$1' +Try '$0 --help' for more information.";; --help | --hel | -h ) printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -5997,8 +6137,8 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6049,7 +6189,7 @@ do "autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconfig.h" ;; "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -6068,7 +6208,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -6092,7 +6232,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6250,13 +6390,13 @@ fi # test -n "$CONFIG_FILES" # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. +# This happens for instance with './config.status Makefile'. if test -n "$CONFIG_HEADERS"; then cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF -# Transform confdefs.h into an awk script `defines.awk', embedded as +# Transform confdefs.h into an awk script 'defines.awk', embedded as # here-document in config.status, that substitutes the proper values into # config.h.in to produce config.h. @@ -6366,7 +6506,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6388,19 +6528,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6524,7 +6664,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6553,9 +6693,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 29cbf534ce..f134667b8c 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -3796,35 +3796,20 @@ static void set_state_terminated(struct ast_sip_subscription *sub) * */ -/*! - * \brief PJSIP callback when underlying SIP subscription changes state - * - * Although this function is called for every state change, we only care - * about the TERMINATED state, and only when we're actually processing the final - * notify (SIP_SUB_TREE_TERMINATE_IN_PROGRESS) OR when a transmission failure - * occurs (PJSIP_EVENT_TSX_STATE). In this case, we do all the subscription tree - * cleanup tasks and decrement the evsub reference. + +/* The code in this function was previously in pubsub_on_evsub_state. As of + * pjsip 2.13 pubsub_on_evsub_state is called before pubsub_on_rx_refresh, so + * if we clean the sub tree in pubsub_on_evsub_state it won't be available in + * pubsub_on_rx_refresh. This means we won't be able to build or send the + * corresponding NOTIFY (which also causes pjsip to assert.) + * If HAVE_PJSIP_EVSUB_PENDING_NOTIFY is set based on configuration, this will + * be called from pubsub_on_rx_refresh. If not set, the result is the legacy + * behavior of calling this from pubsub_on_evsub_state. */ -static void pubsub_on_evsub_state(pjsip_evsub *evsub, pjsip_event *event) -{ - struct sip_subscription_tree *sub_tree = - pjsip_evsub_get_mod_data(evsub, pubsub_module.id); +static void clean_sub_tree(pjsip_evsub *evsub){ - ast_debug(3, "evsub %p state %s event %s sub_tree %p sub_tree state %s\n", evsub, - pjsip_evsub_get_state_name(evsub), pjsip_event_str(event->type), sub_tree, - (sub_tree ? sub_tree_state_description[sub_tree->state] : "UNKNOWN")); - - if (!sub_tree || pjsip_evsub_get_state(evsub) != PJSIP_EVSUB_STATE_TERMINATED) { - return; - } - - /* It's easier to write this as what we WANT to process, then negate it. */ - if (!(sub_tree->state == SIP_SUB_TREE_TERMINATE_IN_PROGRESS - || (event->type == PJSIP_EVENT_TSX_STATE && sub_tree->state == SIP_SUB_TREE_NORMAL) - )) { - ast_debug(3, "Do nothing.\n"); - return; - } + struct sip_subscription_tree *sub_tree; + sub_tree = pjsip_evsub_get_mod_data(evsub, pubsub_module.id); if (sub_tree->expiration_task) { char task_name[256]; @@ -3857,6 +3842,45 @@ static void pubsub_on_evsub_state(pjsip_evsub *evsub, pjsip_event *event) ao2_ref(sub_tree, -1); } +/*! + * \brief PJSIP callback when underlying SIP subscription changes state + * + * Although this function is called for every state change, we only care + * about the TERMINATED state, and only when we're actually processing the final + * notify (SIP_SUB_TREE_TERMINATE_IN_PROGRESS) OR when a transmission failure + * occurs (PJSIP_EVENT_TSX_STATE). In this case, we do all the subscription tree + * cleanup tasks and decrement the evsub reference. + */ +static void pubsub_on_evsub_state(pjsip_evsub *evsub, pjsip_event *event) +{ + struct sip_subscription_tree *sub_tree = + pjsip_evsub_get_mod_data(evsub, pubsub_module.id); + + ast_debug(3, "evsub %p state %s event %s sub_tree %p sub_tree state %s\n", evsub, + pjsip_evsub_get_state_name(evsub), pjsip_event_str(event->type), sub_tree, + (sub_tree ? sub_tree_state_description[sub_tree->state] : "UNKNOWN")); + + if (!sub_tree || pjsip_evsub_get_state(evsub) != PJSIP_EVSUB_STATE_TERMINATED) { + return; + } + + + /* It's easier to write this as what we WANT to process, then negate it. */ + if (!(sub_tree->state == SIP_SUB_TREE_TERMINATE_IN_PROGRESS + || (event->type == PJSIP_EVENT_TSX_STATE && sub_tree->state == SIP_SUB_TREE_NORMAL) + )) { + ast_debug(3, "Do nothing.\n"); + return; + } + +#ifndef HAVE_PJSIP_EVSUB_PENDING_NOTIFY + /* for pjproject <2.13, this cleanup occurs here. For >=2.13, pubsub_on_evsub_state + is called before pubsub_on_rx_refresh and so must be cleaned there.*/ + clean_sub_tree(evsub); +#endif + +} + static int pubsub_on_refresh_timeout(void *userdata) { struct sip_subscription_tree *sub_tree = userdata; @@ -3942,16 +3966,37 @@ static void pubsub_on_rx_refresh(pjsip_evsub *evsub, pjsip_rx_data *rdata, subscription_persistence_update(sub_tree, rdata, SUBSCRIPTION_PERSISTENCE_REFRESHED); +#ifdef HAVE_PJSIP_EVSUB_PENDING_NOTIFY + /* As of pjsip 2.13, the NOTIFY has to be sent within this function as pjproject now + requires it. Previously this would have caused an early NOTIFY to go out before the + SUBSCRIBE's 200 OK. The previous solution was to push the NOTIFY, but now pjproject + looks for the NOTIFY on send and delays it until after it auto-replies. + If the NOTIFY is not there when it looks to send, pjproject will assert. */ + serialized_pubsub_on_refresh_timeout(sub_tree); +#else if (ast_sip_push_task(sub_tree->serializer, serialized_pubsub_on_refresh_timeout, ao2_bump(sub_tree))) { /* If we can't push the NOTIFY refreshing task...we'll just go with it. */ ast_log(LOG_ERROR, "Failed to push task to send NOTIFY.\n"); sub_tree->state = SIP_SUB_TREE_NORMAL; ao2_ref(sub_tree, -1); } +#endif if (sub_tree->is_list) { pj_list_insert_before(res_hdr, create_require_eventlist(rdata->tp_info.pool)); } + +#ifdef HAVE_PJSIP_EVSUB_PENDING_NOTIFY + /* for pjproject <2.13, this cleanup occurs in pubsub_on_evsub_state. For >=2.13, + pubsub_on_rx_refresh is called after pubsub_on_evsub_state and so the tree must be + cleaned here. */ + if( pjsip_evsub_get_state(evsub) == PJSIP_EVSUB_STATE_TERMINATED && + sub_tree->state == SIP_SUB_TREE_TERMINATE_PENDING ) { + clean_sub_tree(evsub); + } +#endif + + } static void pubsub_on_rx_notify(pjsip_evsub *evsub, pjsip_rx_data *rdata, int *p_st_code, diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4 index f67ef577e2..69f30500b2 100644 --- a/third-party/pjproject/configure.m4 +++ b/third-party/pjproject/configure.m4 @@ -111,6 +111,8 @@ AC_DEFUN([_PJPROJECT_CONFIGURE], AC_DEFINE([HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE], 1, [Define if your system has HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE declared]) AC_DEFINE([HAVE_PJSIP_OAUTH_AUTHENTICATION], 1, [Define if your system has HAVE_PJSIP_OAUTH_AUTHENTICATION declared]) AC_DEFINE([HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK], 1, [Define if your system has the on_valid_pair pjnath callback.]) + AC_DEFINE([HAVE_PJSIP_TLS_TRANSPORT_RESTART], 1, [Define if your system has pjsip_tls_transport_restart support.]) + AC_DEFINE([HAVE_PJSIP_EVSUB_PENDING_NOTIFY], 1, [Define to 1 if evsub requires a NOTIFY on SUBSCRIBE.]) AC_SUBST([PJPROJECT_BUNDLED]) AC_SUBST([PJPROJECT_DIR]) diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch index 3c1f7498d8..2967e72cf3 100644 --- a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch +++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch @@ -1,47 +1,34 @@ -From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001 -From: Richard Mudgett -Date: Mon, 6 Aug 2018 11:24:25 -0500 -Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch - ---- - aconfigure | 6 +++++- - aconfigure.ac | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - diff --git a/aconfigure b/aconfigure -index 1c449b8..c4c6060 100755 +index d6f0e8809..9dcd46398 100755 --- a/aconfigure +++ b/aconfigure -@@ -7954,7 +7954,11 @@ else - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" -- LDFLAGS="$LDFLAGS -L$with_ssl/lib" -+ if test -d $with_ssl/lib; then -+ LDFLAGS="$LDFLAGS -L$with_ssl/lib" -+ else -+ LDFLAGS="$LDFLAGS -L$with_ssl" -+ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5 - $as_echo "Using SSL prefix... $with_ssl" >&6; } - fi +@@ -9768,7 +9768,11 @@ + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" +- LDFLAGS="$LDFLAGS -L$with_ssl/lib" ++ if test -d $with_ssl/lib; then ++ LDFLAGS="$LDFLAGS -L$with_ssl/lib" ++ else ++ LDFLAGS="$LDFLAGS -L$with_ssl" ++ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5 + printf "%s\n" "Using SSL prefix... $with_ssl" >&6; } + fi diff --git a/aconfigure.ac b/aconfigure.ac -index 2c272cd..a5d6d97 100644 +index 16b311045..849da81ab 100644 --- a/aconfigure.ac +++ b/aconfigure.ac -@@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl, - if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then - CFLAGS="$CFLAGS -I$with_ssl/include" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" -- LDFLAGS="$LDFLAGS -L$with_ssl/lib" -+ if test -d $with_ssl/lib; then -+ LDFLAGS="$LDFLAGS -L$with_ssl/lib" -+ else -+ LDFLAGS="$LDFLAGS -L$with_ssl" -+ fi - AC_MSG_RESULT([Using SSL prefix... $with_ssl]) - fi +@@ -2172,7 +2172,11 @@ + if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then + CFLAGS="$CFLAGS -I$with_ssl/include" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" +- LDFLAGS="$LDFLAGS -L$with_ssl/lib" ++ if test -d $with_ssl/lib; then ++ LDFLAGS="$LDFLAGS -L$with_ssl/lib" ++ else ++ LDFLAGS="$LDFLAGS -L$with_ssl" ++ fi + AC_MSG_RESULT([Using SSL prefix... $with_ssl]) + fi --- -2.7.4 - diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch index f25aeac176..ab6c6d1ec6 100644 --- a/third-party/pjproject/patches/0000-remove-third-party.patch +++ b/third-party/pjproject/patches/0000-remove-third-party.patch @@ -1,14 +1,5 @@ -From 665a2fbc3a09a71cd77988ae2deb3f5d3e205f63 Mon Sep 17 00:00:00 2001 -From: Richard Mudgett -Date: Thu, 23 Feb 2017 17:10:07 -0600 -Subject: [PATCH 2/5] 0000-remove-third-party.patch - ---- - build.mak.in | 97 ------------------------------------------------------------ - 1 file changed, 97 deletions(-) - diff --git a/build.mak.in b/build.mak.in -index 80ccad1..41ec64e 100644 +index 4bc464f8c..80681d961 100644 --- a/build.mak.in +++ b/build.mak.in @@ -1,4 +1,3 @@ @@ -16,10 +7,11 @@ index 80ccad1..41ec64e 100644 include $(PJDIR)/version.mak export PJ_DIR := $(PJDIR) -@@ -37,19 +36,6 @@ export APP_THIRD_PARTY_EXT := +@@ -42,21 +41,6 @@ export APP_THIRD_PARTY_EXT := export APP_THIRD_PARTY_LIBS := export APP_THIRD_PARTY_LIB_FILES := +-ifneq (@ac_no_srtp@,1) -ifneq (@ac_external_srtp@,0) -# External SRTP library -APP_THIRD_PARTY_EXT += -l@ac_external_srtp_lib@ @@ -32,11 +24,12 @@ index 80ccad1..41ec64e 100644 -APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX) -endif -endif +-endif - ifeq (@ac_pjmedia_resample@,libresample) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) ifeq ($(PJ_SHARED_LIBRARIES),) -@@ -66,89 +52,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI +@@ -73,102 +57,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI endif endif @@ -122,10 +115,20 @@ index 80ccad1..41ec64e 100644 -endif -endif - +-ifneq (@ac_no_webrtc_aec3@,1) +-ifeq (@ac_external_webrtc_aec3@,1) +-APP_THIRD_PARTY_EXT += -lwebrtc-aec3 +-else +-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX) +-ifeq ($(PJ_SHARED_LIBRARIES),) +-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME) +-else +-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3 +-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX) +-endif +-endif +-endif - + # Additional flags @ac_build_mak_vars@ - --- -2.7.4 - diff --git a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch b/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch deleted file mode 100644 index b1fe02c0d5..0000000000 --- a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c40ad6ba454fdf6456d8ffa92faa4cd49f2c807d Mon Sep 17 00:00:00 2001 -From: Richard Mudgett -Date: Thu, 23 Feb 2017 17:11:00 -0600 -Subject: [PATCH 3/5] 0000-set_apps_initial_log_level.patch - ---- - pjsip-apps/src/pjsua/main.c | 2 ++ - pjsip-apps/src/pjsystest/main_console.c | 2 ++ - pjsip-apps/src/python/_pjsua.c | 3 ++- - 3 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c -index 2baaf82..11831f2 100644 ---- a/pjsip-apps/src/pjsua/main.c -+++ b/pjsip-apps/src/pjsua/main.c -@@ -126,5 +126,7 @@ int main_func(int argc, char *argv[]) - - int main(int argc, char *argv[]) - { -+ pj_log_set_level(1); -+ - return pj_run_app(&main_func, argc, argv, 0); - } -diff --git a/pjsip-apps/src/pjsystest/main_console.c b/pjsip-apps/src/pjsystest/main_console.c -index 122cdc7..dc79eab 100644 ---- a/pjsip-apps/src/pjsystest/main_console.c -+++ b/pjsip-apps/src/pjsystest/main_console.c -@@ -133,6 +133,8 @@ void gui_sleep(unsigned sec) - - int main() - { -+ pj_log_set_level(1); -+ - if (systest_init() != PJ_SUCCESS) - return 1; - -diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c -index 31b835e..3e15030 100644 ---- a/pjsip-apps/src/python/_pjsua.c -+++ b/pjsip-apps/src/python/_pjsua.c -@@ -4434,7 +4434,8 @@ init_pjsua(void) - PyObject* m = NULL; - #define ADD_CONSTANT(mod,name) PyModule_AddIntConstant(mod,#name,name) - -- -+ pj_log_set_level(1); -+ - PyEval_InitThreads(); - - if (PyType_Ready(&PyTyp_pjsua_callback) < 0) --- -2.7.4 - diff --git a/third-party/pjproject/patches/0000-solaris.patch b/third-party/pjproject/patches/0000-solaris.patch deleted file mode 100644 index 155cdbee5e..0000000000 --- a/third-party/pjproject/patches/0000-solaris.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 1ac599a0f29500a15faf0dbbdc2565cc7dce2420 Mon Sep 17 00:00:00 2001 -From: Shaun Ruffell -Date: Fri, 7 Sep 2012 14:31:19 -0500 -Subject: [PATCH 4/5] pjproject: Fix for Solaris builds. Do not undef s_addr. - -pjproject, in order to solve build problems on Windows [1], undefines s_addr in -one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr is -not a structure member, but defined to map to the real strucuture member, -therefore when building on Solaris it's possible to get build errors like: - - [CC] res_rtp_asterisk.c -> res_rtp_asterisk.o - In file included from /export/home/admin/asterisk-11-svn/include/asterisk/stun.h:29, - from res_rtp_asterisk.c:51: - /export/home/admin/asterisk-11-svn/include/asterisk/network.h: In function `inaddrcmp': - /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr' - /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr' - res_rtp_asterisk.c: In function `ast_rtp_on_ice_tx_pkt': - res_rtp_asterisk.c:706: warning: dereferencing type-punned pointer will break strict-aliasing rules - res_rtp_asterisk.c:710: warning: dereferencing type-punned pointer will break strict-aliasing rules - res_rtp_asterisk.c: In function `rtp_add_candidates_to_ice': - res_rtp_asterisk.c:1085: error: structure has no member named `s_addr' - make[2]: *** [res_rtp_asterisk.o] Error 1 - make[1]: *** [res] Error 2 - make[1]: Leaving directory `/export/home/admin/asterisk-11-svn' - gmake: *** [_cleantest_all] Error 2 - -Unfortunately, in order to make this work, I also had to make sure pjproject -only used the typdef pj_in_addr and not the struct pj_in_addr so that when -building Asterisk I could "typedef struct in_addr pj_in_addr". It's possible -then that the library and users of those interfaces in Asterisk have a different -idea about the type of the argument. While on the surface it looks like they are -all 32 bit big endian values. - -[1] http://trac.pjsip.org/repos/changeset/484 - -Reported-by: Ben Klang -(issues ASTERISK-20366) - -Updated by ASTERISK-27997 ---- - pjlib/include/pj/sock.h | 8 +++++++- - pjlib/src/pj/sock_bsd.c | 2 +- - pjlib/src/pj/sock_symbian.cpp | 2 +- - pjlib/src/pj/sock_uwp.cpp | 2 +- - pjsip/src/test/transport_test.c | 2 +- - 5 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h -index 4daf298..c35833c 100644 ---- a/pjlib/include/pj/sock.h -+++ b/pjlib/include/pj/sock.h -@@ -484,6 +484,7 @@ typedef enum pj_socket_sd_type - */ - #define PJ_INVALID_SOCKET (-1) - -+#ifndef _ASTERISK_H - /* Must undefine s_addr because of pj_in_addr below */ - #undef s_addr - -@@ -495,6 +496,11 @@ typedef struct pj_in_addr - pj_uint32_t s_addr; /**< The 32bit IP address. */ - } pj_in_addr; - -+#else -+#include -+#include -+typedef struct in_addr pj_in_addr; -+#endif - - /** - * Maximum length of text representation of an IPv4 address. -@@ -712,7 +718,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr); - * - * @return nonzero if the address is valid, zero if not. - */ --PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp); -+PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp); - - /** - * This function converts an address in its standard text presentation form -diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c -index e416991..940fce1 100644 ---- a/pjlib/src/pj/sock_bsd.c -+++ b/pjlib/src/pj/sock_bsd.c -@@ -244,7 +244,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) - * numbers-and-dots notation into binary data and stores it in the structure - * that inp points to. - */ --PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp) -+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp) - { - char tempaddr[PJ_INET_ADDRSTRLEN]; - -diff --git a/pjlib/src/pj/sock_symbian.cpp b/pjlib/src/pj/sock_symbian.cpp -index 09239b0..e72bbda 100644 ---- a/pjlib/src/pj/sock_symbian.cpp -+++ b/pjlib/src/pj/sock_symbian.cpp -@@ -299,7 +299,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) - * numbers-and-dots notation into binary data and stores it in the structure - * that inp points to. - */ --PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp) -+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp) - { - enum { MAXIPLEN = PJ_INET_ADDRSTRLEN }; - -diff --git a/pjlib/src/pj/sock_uwp.cpp b/pjlib/src/pj/sock_uwp.cpp -index 876c328..40250bf 100644 ---- a/pjlib/src/pj/sock_uwp.cpp -+++ b/pjlib/src/pj/sock_uwp.cpp -@@ -933,7 +933,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr) - * numbers-and-dots notation into binary data and stores it in the structure - * that inp points to. - */ --PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp) -+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp) - { - char tempaddr[PJ_INET_ADDRSTRLEN]; - -diff --git a/pjsip/src/test/transport_test.c b/pjsip/src/test/transport_test.c -index e5083d1..c429cc7 100644 ---- a/pjsip/src/test/transport_test.c -+++ b/pjsip/src/test/transport_test.c -@@ -35,7 +35,7 @@ int generic_transport_test(pjsip_transport *tp) - - /* Check that local address name is valid. */ - { -- struct pj_in_addr addr; -+ pj_in_addr addr; - - if (pj_inet_pton(pj_AF_INET(), &tp->local_name.host, - &addr) == PJ_SUCCESS) --- -2.7.4 - diff --git a/third-party/pjproject/patches/0010-Avoid_deadlock_between_transport_and_transaction.patch b/third-party/pjproject/patches/0010-Avoid_deadlock_between_transport_and_transaction.patch new file mode 100644 index 0000000000..e23af92b84 --- /dev/null +++ b/third-party/pjproject/patches/0010-Avoid_deadlock_between_transport_and_transaction.patch @@ -0,0 +1,158 @@ +From edde06f261ac807a89a6086b7f03460867675f95 Mon Sep 17 00:00:00 2001 +From: Nanang Izzuddin +Date: Tue, 1 Jul 2025 15:13:36 +0700 +Subject: [PATCH] Avoid deadlock between transport and transaction (#4453) + +--- + pjsip/include/pjsip/sip_transaction.h | 1 + + pjsip/src/pjsip/sip_transaction.c | 101 ++++++++++++++++++++++---- + 2 files changed, 88 insertions(+), 14 deletions(-) + +diff --git a/pjsip/include/pjsip/sip_transaction.h b/pjsip/include/pjsip/sip_transaction.h +index 72d4bc81c5..5f28b2d69c 100644 +--- a/pjsip/include/pjsip/sip_transaction.h ++++ b/pjsip/include/pjsip/sip_transaction.h +@@ -141,6 +141,7 @@ struct pjsip_transaction + int retransmit_count;/**< Retransmission count. */ + pj_timer_entry retransmit_timer;/**< Retransmit timer. */ + pj_timer_entry timeout_timer; /**< Timeout timer. */ ++ pj_timer_entry misc_timer; /**< Miscellaneous timer. */ + + /** Module specific data. */ + void *mod_data[PJSIP_MAX_MODULE]; +diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c +index 4335f11ff5..31dbaaab6e 100644 +--- a/pjsip/src/pjsip/sip_transaction.c ++++ b/pjsip/src/pjsip/sip_transaction.c +@@ -140,6 +140,7 @@ static int max_retrans_count = -1; + #define TRANSPORT_ERR_TIMER 3 + #define TRANSPORT_DISC_TIMER 4 + #define TERMINATE_TIMER 5 ++#define TRANSPORT_CB_TIMER 6 + + /* Flags for tsx_set_state() */ + enum +@@ -2265,23 +2266,21 @@ static void send_msg_callback( pjsip_send_state *send_state, + } + + +-/* Transport callback. */ +-static void transport_callback(void *token, pjsip_tx_data *tdata, +- pj_ssize_t sent) +-{ +- pjsip_transaction *tsx = (pjsip_transaction*) token; ++/* Transport callback parameter. */ ++struct tp_cb_param { ++ pjsip_transaction* tsx; ++ pjsip_tx_data* tdata; ++ pj_ssize_t sent; ++}; + +- /* Check if the transaction layer has been shutdown. */ +- if (mod_tsx_layer.mod.id < 0) +- return; + +- /* In other circumstances, locking tsx->grp_lock AFTER transport mutex +- * will introduce deadlock if another thread is currently sending a +- * SIP message to the transport. But this should be safe as there should +- * be no way this callback could be called while another thread is +- * sending a message. +- */ ++/* Transport callback actual implementation. */ ++static void transport_callback_impl(pjsip_transaction *tsx, ++ pjsip_tx_data* tdata, ++ pj_ssize_t sent) ++{ + pj_grp_lock_acquire(tsx->grp_lock); ++ + tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT); + + if (sent > 0 || tsx->role == PJSIP_ROLE_UAS) { +@@ -2299,6 +2298,7 @@ static void transport_callback(void *token, pjsip_tx_data *tdata, + tsx_set_state( tsx, PJSIP_TSX_STATE_DESTROYED, + PJSIP_EVENT_UNKNOWN, NULL, 0 ); + pj_grp_lock_release(tsx->grp_lock); ++ pj_grp_lock_dec_ref(tsx->grp_lock); + return; + } + +@@ -2354,6 +2354,79 @@ static void transport_callback(void *token, pjsip_tx_data *tdata, + } + + ++/* Timer callback for transport callback. ++ * This is currently only used to avoid deadlock due to inversed locking order ++ * between transport and transaction. ++ */ ++static void tsx_misc_timer_callback(pj_timer_heap_t *theap, ++ pj_timer_entry *entry) ++{ ++ PJ_UNUSED_ARG(theap); ++ ++ if (entry->id == TRANSPORT_CB_TIMER) { ++ struct tp_cb_param* param = (struct tp_cb_param*)entry->user_data; ++ ++ /* Check if the transaction layer has been shutdown. */ ++ if (mod_tsx_layer.mod.id >= 0) { ++ /* Call transport callback implementation */ ++ transport_callback_impl(param->tsx, param->tdata, param->sent); ++ } ++ ++ /* Release tdata */ ++ pjsip_tx_data_dec_ref(param->tdata); ++ } ++} ++ ++ ++/* Transport callback. */ ++static void transport_callback(void *token, pjsip_tx_data *tdata, ++ pj_ssize_t sent) ++{ ++ pjsip_transaction *tsx = (pjsip_transaction*) token; ++ pj_status_t status; ++ ++ /* Check if the transaction layer has been shutdown. */ ++ if (mod_tsx_layer.mod.id < 0) ++ return; ++ ++ /* In other circumstances, locking tsx->grp_lock AFTER transport mutex ++ * will introduce deadlock if another thread is currently sending a ++ * SIP message to the transport. But this should be safe as there should ++ * be no way this callback could be called while another thread is ++ * sending a message. ++ */ ++ // Deadlock does happen, see #4453. ++ // So now, to avoid deadlock, we'll try to acquire the group lock first, ++ // and if it fails, we'll schedule the processing via timer. ++ status = pj_grp_lock_tryacquire(tsx->grp_lock); ++ if (status != PJ_SUCCESS) { ++ pj_time_val delay = { 0, 0 }; ++ struct tp_cb_param *param = NULL; ++ ++ lock_timer(tsx); ++ tsx_cancel_timer(tsx, &tsx->misc_timer); ++ ++ /* Increment tdata ref count to avoid premature destruction. ++ * Note that tsx ref count is already handled by tsx_schedule_timer(). ++ */ ++ pjsip_tx_data_add_ref(tdata); ++ ++ param = PJ_POOL_ZALLOC_T(tsx->pool, struct tp_cb_param); ++ param->sent = sent; ++ param->tdata = tdata; ++ param->tsx = tsx; ++ pj_timer_entry_init(&tsx->misc_timer, TIMER_INACTIVE, param, ++ &tsx_misc_timer_callback); ++ tsx_schedule_timer(tsx, &tsx->misc_timer, &delay, TRANSPORT_CB_TIMER); ++ unlock_timer(tsx); ++ return; ++ } ++ ++ transport_callback_impl(tsx, tdata, sent); ++ pj_grp_lock_release(tsx->grp_lock); ++} ++ ++ + /* + * Callback when transport state changes. + */ diff --git a/third-party/pjproject/patches/0011-sip_inv_patch.patch b/third-party/pjproject/patches/0011-sip_inv_patch.patch deleted file mode 100644 index 7f77c74792..0000000000 --- a/third-party/pjproject/patches/0011-sip_inv_patch.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit c3c1bf45cae2a35003aa16c267d59f97027f9c5e -Author: Kevin Harwell -Date: Thu Jun 11 11:11:13 2020 -0500 - - sip_inv - fix invite session ref count crash - - Ensure the session's ref count is only decremented under proper conditons. - - For more details see the following issue report: - https://github.com/pjsip/pjproject/issues/2443 - - Patch supplied by sauwming - -diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c -index ca225015b..7c11b1c8e 100644 ---- a/pjsip/src/pjsip-ua/sip_inv.c -+++ b/pjsip/src/pjsip-ua/sip_inv.c -@@ -323,9 +323,19 @@ static void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state, - (*mod_inv.cb.on_state_changed)(inv, e); - pjsip_inv_dec_ref(inv); - -- /* Only decrement when previous state is not already DISCONNECTED */ -+ /* The above callback may change the state, so we need to be careful here -+ * and only decrement inv under the following conditions: -+ * 1. If the state parameter is DISCONNECTED, and previous state is not -+ * already DISCONNECTED. -+ * This is to make sure that dec_ref() is not called more than once. -+ * 2. If current state is PJSIP_INV_STATE_DISCONNECTED. -+ * This is to make sure that dec_ref() is not called if user restarts -+ * inv within the callback. Note that this check must be last since -+ * inv may have already been destroyed. -+ */ - if (state == PJSIP_INV_STATE_DISCONNECTED && -- prev_state != PJSIP_INV_STATE_DISCONNECTED) -+ prev_state != PJSIP_INV_STATE_DISCONNECTED && -+ inv->state == PJSIP_INV_STATE_DISCONNECTED) - { - pjsip_inv_dec_ref(inv); - } diff --git a/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch b/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch deleted file mode 100644 index 09f72d825e..0000000000 --- a/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit 40dd48d10911f4ff9b8dfbf16428fbc9acc434ba -Author: Riza Sulistyo -Date: Thu Jul 9 17:47:24 2020 +0700 - - Modify timer_id check on cancel() (#2463) - - * modify timer_id check on cancel(). - - * modification based on comments. - -diff --git a/pjlib/include/pj/timer.h b/pjlib/include/pj/timer.h -index b738a6e76..4b76ab65d 100644 ---- a/pjlib/include/pj/timer.h -+++ b/pjlib/include/pj/timer.h -@@ -120,7 +120,10 @@ typedef struct pj_timer_entry - - /** - * Internal unique timer ID, which is assigned by the timer heap. -- * Application should not touch this ID. -+ * Positive values indicate that the timer entry is running, -+ * while -1 means that it's not. Any other value may indicate that it -+ * hasn't been properly initialised or is in a bad state. -+ * Application should not touch this ID. - */ - pj_timer_id_t _timer_id; - -diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c -index 66516fce8..34966c481 100644 ---- a/pjlib/src/pj/timer.c -+++ b/pjlib/src/pj/timer.c -@@ -535,7 +535,7 @@ static int cancel( pj_timer_heap_t *ht, - PJ_CHECK_STACK(); - - // Check to see if the timer_id is out of range -- if (entry->_timer_id < 0 || (pj_size_t)entry->_timer_id > ht->max_size) { -+ if (entry->_timer_id < 1 || (pj_size_t)entry->_timer_id >= ht->max_size) { - entry->_timer_id = -1; - return 0; - } diff --git a/third-party/pjproject/patches/0050-fix-race-parallel-build.patch b/third-party/pjproject/patches/0050-fix-race-parallel-build.patch deleted file mode 100644 index 674baa2b38..0000000000 --- a/third-party/pjproject/patches/0050-fix-race-parallel-build.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 78683646c8bc670ec730a42494e075f671a08e28 Mon Sep 17 00:00:00 2001 -From: Guido Falsi -Date: Mon, 11 May 2020 08:50:39 +0200 -Subject: [PATCH] Fix race condition in parallel builds (#2426) - -* Some targets residing in `OBJDIRS` are missing a dependency on that directory, which results in a race condition, causing build to fail sometimes due to the directory not existing when running parallel builds. - -* The `PJSUA_LIB` variable is not defined anywhere, resulting in an empty value, and no correct dependency on the pjsua shared library for `pjsua2`. The correct variable seems to be `PJSUA_LIB_LIB`, defined at the start of this same `Makefile`. ---- - build/rules.mak | 12 ++++++------ - pjsip/build/Makefile | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/build/rules.mak b/build/rules.mak -index 8fa98655e..912199c41 100644 ---- a/build/rules.mak -+++ b/build/rules.mak -@@ -129,7 +129,7 @@ endif - $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS) - $(CROSS_COMPILE)ld -r -o $@ $(OBJS) - --$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o -+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS) - @echo Creating kbuild Makefile... - @echo "# Our module name:" > $(OBJDIR)/Makefile - @echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile -@@ -154,27 +154,27 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o - ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko - cp $(OBJDIR)/$(app).ko ../lib - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS) - $(CC) $($(APP)_CFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS) - $(CXX) $($(APP)_CXXFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) - --$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc -+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS) - $(CXX) $($(APP)_CXXFLAGS) \ - $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ - $(subst /,$(HOST_PSEP),$<) -diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile -index b85c7817a..20777909f 100644 ---- a/pjsip/build/Makefile -+++ b/pjsip/build/Makefile -@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL - - pjsua2-lib: $(PJSUA2_LIB_LIB) - $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB) --$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) -+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) - $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) - - pjsip-test: $(TEST_EXE) diff --git a/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch b/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch deleted file mode 100644 index f1f180ae7f..0000000000 --- a/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur source.orig/pjmedia/src/pjmedia/sdp_neg.c source/pjmedia/src/pjmedia/sdp_neg.c ---- source.orig/pjmedia/src/pjmedia/sdp_neg.c 2020-07-02 10:35:42.022459904 +0200 -+++ source/pjmedia/src/pjmedia/sdp_neg.c 2020-07-02 10:33:24.996316867 +0200 -@@ -906,7 +906,7 @@ - * after receiving remote answer. - */ - static pj_status_t process_answer(pj_pool_t *pool, -- pjmedia_sdp_session *offer, -+ pjmedia_sdp_session *local_offer, - pjmedia_sdp_session *answer, - pj_bool_t allow_asym, - pjmedia_sdp_session **p_active) -@@ -914,10 +914,14 @@ - unsigned omi = 0; /* Offer media index */ - unsigned ami = 0; /* Answer media index */ - pj_bool_t has_active = PJ_FALSE; -+ pjmedia_sdp_session *offer; - pj_status_t status; - - /* Check arguments. */ -- PJ_ASSERT_RETURN(pool && offer && answer && p_active, PJ_EINVAL); -+ PJ_ASSERT_RETURN(pool && local_offer && answer && p_active, PJ_EINVAL); -+ -+ /* Duplicate local offer SDP. */ -+ offer = pjmedia_sdp_session_clone(pool, local_offer); - - /* Check that media count match between offer and answer */ - // Ticket #527, different media count is allowed for more interoperability, diff --git a/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch b/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch deleted file mode 100644 index 95725c1ecc..0000000000 --- a/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ce18018cc17bef8f80c08686e3a7b28384ef3ba5 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Mon, 12 Oct 2020 13:31:25 +0800 -Subject: [PATCH] Fix incorrect copying of destination info when creating - CANCEL (#2546) - ---- - pjsip/src/pjsip/sip_util.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c -index d10a6fa30..a1bf878ea 100644 ---- a/pjsip/src/pjsip/sip_util.c -+++ b/pjsip/src/pjsip/sip_util.c -@@ -779,14 +779,14 @@ PJ_DEF(pj_status_t) pjsip_endpt_create_cancel( pjsip_endpoint *endpt, - pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route); - } - -- /* Copy the destination host name from the original request */ -- pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, -- &req_tdata->dest_info.name); -- -- /* Finally copy the destination info from the original request */ -+ /* Copy the destination info from the original request */ - pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info, - sizeof(req_tdata->dest_info)); - -+ /* Finally, copy the destination host name from the original request */ -+ pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, -+ &req_tdata->dest_info.name); -+ - /* Done. - * Return the transmit buffer containing the CANCEL request. - */ --- -2.25.1 - diff --git a/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch b/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch deleted file mode 100644 index c27a489914..0000000000 --- a/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c -index 3b85b4273..a14009662 100644 ---- a/pjmedia/src/pjmedia/sdp_neg.c -+++ b/pjmedia/src/pjmedia/sdp_neg.c -@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( - { - pjmedia_sdp_session *new_offer; - pjmedia_sdp_session *old_offer; -- char media_used[PJMEDIA_MAX_SDP_MEDIA]; - unsigned oi; /* old offer media index */ - pj_status_t status; - -@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( - /* Change state to STATE_LOCAL_OFFER */ - neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER; - -+ /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE, -+ * it means that the previous initial SDP nego must have been failed, -+ * so we'll just set the local SDP offer here. -+ */ -+ if (!neg->active_local_sdp) { -+ neg->initial_sdp_tmp = NULL; -+ neg->initial_sdp = pjmedia_sdp_session_clone(pool, local); -+ neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local); -+ -+ return PJ_SUCCESS; -+ } -+ - /* Init vars */ -- pj_bzero(media_used, sizeof(media_used)); - old_offer = neg->active_local_sdp; - new_offer = pjmedia_sdp_session_clone(pool, local); - diff --git a/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch b/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch deleted file mode 100644 index a2db2200e7..0000000000 --- a/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch +++ /dev/null @@ -1,212 +0,0 @@ -From bdbeb7c4b2b11efc2e59f5dee7aa4360a2bc9fff Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Thu, 22 Apr 2021 14:03:28 +0800 -Subject: [PATCH 90/90] Skip unsupported digest algorithm (#2408) - -Co-authored-by: Nanang Izzuddin ---- - pjsip/src/pjsip/sip_auth_client.c | 32 +++++-- - tests/pjsua/scripts-sipp/uas-auth-two-algo.py | 7 ++ - .../pjsua/scripts-sipp/uas-auth-two-algo.xml | 83 +++++++++++++++++++ - 3 files changed, 117 insertions(+), 5 deletions(-) - create mode 100644 tests/pjsua/scripts-sipp/uas-auth-two-algo.py - create mode 100644 tests/pjsua/scripts-sipp/uas-auth-two-algo.xml - -diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c -index 828b04db9..7eb2f5cd1 100644 ---- a/pjsip/src/pjsip/sip_auth_client.c -+++ b/pjsip/src/pjsip/sip_auth_client.c -@@ -1042,7 +1042,7 @@ static pj_status_t process_auth( pj_pool_t *req_pool, - pjsip_hdr *hdr; - pj_status_t status; - -- /* See if we have sent authorization header for this realm */ -+ /* See if we have sent authorization header for this realm (and scheme) */ - hdr = tdata->msg->hdr.next; - while (hdr != &tdata->msg->hdr) { - if ((hchal->type == PJSIP_H_WWW_AUTHENTICATE && -@@ -1052,7 +1052,8 @@ static pj_status_t process_auth( pj_pool_t *req_pool, - { - sent_auth = (pjsip_authorization_hdr*) hdr; - if (pj_stricmp(&hchal->challenge.common.realm, -- &sent_auth->credential.common.realm )==0) -+ &sent_auth->credential.common.realm)==0 && -+ pj_stricmp(&hchal->scheme, &sent_auth->scheme)==0) - { - /* If this authorization has empty response, remove it. */ - if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 && -@@ -1062,6 +1063,14 @@ static pj_status_t process_auth( pj_pool_t *req_pool, - hdr = hdr->next; - pj_list_erase(sent_auth); - continue; -+ } else -+ if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 && -+ pj_stricmp(&sent_auth->credential.digest.algorithm, -+ &hchal->challenge.digest.algorithm)!=0) -+ { -+ /* Same 'digest' scheme but different algo */ -+ hdr = hdr->next; -+ continue; - } else { - /* Found previous authorization attempt */ - break; -@@ -1155,9 +1164,10 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req( pjsip_auth_clt_sess *sess, - { - pjsip_tx_data *tdata; - const pjsip_hdr *hdr; -- unsigned chal_cnt; -+ unsigned chal_cnt, auth_cnt; - pjsip_via_hdr *via; - pj_status_t status; -+ pj_status_t last_auth_err; - - PJ_ASSERT_RETURN(sess && rdata && old_request && new_request, - PJ_EINVAL); -@@ -1178,6 +1188,8 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req( pjsip_auth_clt_sess *sess, - */ - hdr = rdata->msg_info.msg->hdr.next; - chal_cnt = 0; -+ auth_cnt = 0; -+ last_auth_err = PJSIP_EAUTHNOAUTH; - while (hdr != &rdata->msg_info.msg->hdr) { - pjsip_cached_auth *cached_auth; - const pjsip_www_authenticate_hdr *hchal; -@@ -1222,8 +1234,13 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req( pjsip_auth_clt_sess *sess, - */ - status = process_auth(tdata->pool, hchal, tdata->msg->line.req.uri, - tdata, sess, cached_auth, &hauth); -- if (status != PJ_SUCCESS) -- return status; -+ if (status != PJ_SUCCESS) { -+ last_auth_err = status; -+ -+ /* Process next header. */ -+ hdr = hdr->next; -+ continue; -+ } - - if (pj_pool_get_used_size(cached_auth->pool) > - PJSIP_AUTH_CACHED_POOL_MAX_SIZE) -@@ -1236,12 +1253,17 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req( pjsip_auth_clt_sess *sess, - - /* Process next header. */ - hdr = hdr->next; -+ auth_cnt++; - } - - /* Check if challenge is present */ - if (chal_cnt == 0) - return PJSIP_EAUTHNOCHAL; - -+ /* Check if any authorization header has been created */ -+ if (auth_cnt == 0) -+ return last_auth_err; -+ - /* Remove branch param in Via header. */ - via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL); - via->branch_param.slen = 0; -diff --git a/tests/pjsua/scripts-sipp/uas-auth-two-algo.py b/tests/pjsua/scripts-sipp/uas-auth-two-algo.py -new file mode 100644 -index 000000000..c79c9f6d3 ---- /dev/null -+++ b/tests/pjsua/scripts-sipp/uas-auth-two-algo.py -@@ -0,0 +1,7 @@ -+# $Id$ -+# -+import inc_const as const -+ -+PJSUA = ["--null-audio --max-calls=1 --id=sip:a@localhost --username=a --realm=* --registrar=$SIPP_URI"] -+ -+PJSUA_EXPECTS = [[0, "registration success", ""]] -diff --git a/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml b/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml -new file mode 100644 -index 000000000..bd4871940 ---- /dev/null -+++ b/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml -@@ -0,0 +1,83 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.31.1 - diff --git a/third-party/pjproject/patches/0100-fix-double-stun-free.patch b/third-party/pjproject/patches/0100-fix-double-stun-free.patch deleted file mode 100644 index b1cfcfd512..0000000000 --- a/third-party/pjproject/patches/0100-fix-double-stun-free.patch +++ /dev/null @@ -1,82 +0,0 @@ -commit f0ff5817d0647bdecd1ec99488db9378e304cf83 -Author: sauwming -Date: Mon May 17 09:56:27 2021 +0800 - - Fix double free of stun session (#2709) - -diff --git a/pjnath/include/pjnath/stun_session.h b/pjnath/include/pjnath/stun_session.h -index bee630ab4..afca06911 100644 ---- a/pjnath/include/pjnath/stun_session.h -+++ b/pjnath/include/pjnath/stun_session.h -@@ -341,6 +341,7 @@ struct pj_stun_tx_data - pj_pool_t *pool; /**< Pool. */ - pj_stun_session *sess; /**< The STUN session. */ - pj_stun_msg *msg; /**< The STUN message. */ -+ pj_bool_t is_destroying; /**< Is destroying? */ - - void *token; /**< The token. */ - -diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c -index f2b4f7058..d436b94bf 100644 ---- a/pjnath/src/pjnath/stun_session.c -+++ b/pjnath/src/pjnath/stun_session.c -@@ -167,16 +167,27 @@ static void tdata_on_destroy(void *arg) - { - pj_stun_tx_data *tdata = (pj_stun_tx_data*)arg; - -+ if (tdata->grp_lock) { -+ pj_grp_lock_dec_ref(tdata->sess->grp_lock); -+ } -+ - pj_pool_safe_release(&tdata->pool); - } - - static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force) - { -- TRACE_((THIS_FILE, "tdata %p destroy request, force=%d, tsx=%p", tdata, -- force, tdata->client_tsx)); -+ TRACE_((THIS_FILE, -+ "tdata %p destroy request, force=%d, tsx=%p, destroying=%d", -+ tdata, force, tdata->client_tsx, tdata->is_destroying)); -+ -+ /* Just return if destroy has been requested before */ -+ if (tdata->is_destroying) -+ return; - - /* STUN session may have been destroyed, except when tdata is cached. */ - -+ tdata->is_destroying = PJ_TRUE; -+ - if (tdata->res_timer.id != PJ_FALSE) { - pj_timer_heap_cancel_if_active(tdata->sess->cfg->timer_heap, - &tdata->res_timer, PJ_FALSE); -@@ -189,7 +200,6 @@ static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force) - pj_stun_client_tsx_set_data(tdata->client_tsx, NULL); - } - if (tdata->grp_lock) { -- pj_grp_lock_dec_ref(tdata->sess->grp_lock); - pj_grp_lock_dec_ref(tdata->grp_lock); - } else { - tdata_on_destroy(tdata); -@@ -200,11 +210,11 @@ static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force) - /* "Probably" this is to absorb retransmission */ - pj_time_val delay = {0, 300}; - pj_stun_client_tsx_schedule_destroy(tdata->client_tsx, &delay); -+ tdata->is_destroying = PJ_FALSE; - - } else { - pj_list_erase(tdata); - if (tdata->grp_lock) { -- pj_grp_lock_dec_ref(tdata->sess->grp_lock); - pj_grp_lock_dec_ref(tdata->grp_lock); - } else { - tdata_on_destroy(tdata); -@@ -238,7 +248,7 @@ static void on_cache_timeout(pj_timer_heap_t *timer_heap, - sess = tdata->sess; - - pj_grp_lock_acquire(sess->grp_lock); -- if (sess->is_destroying) { -+ if (sess->is_destroying || tdata->is_destroying) { - pj_grp_lock_release(sess->grp_lock); - return; - } diff --git a/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch b/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch deleted file mode 100644 index 81781f2db1..0000000000 --- a/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch +++ /dev/null @@ -1,166 +0,0 @@ -From bb92c97ea512aa0ef316c9b2335c7d57b84dfc9a Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Wed, 16 Jun 2021 12:12:35 +0700 -Subject: [PATCH 1/2] - Avoid SSL socket parent/listener getting destroyed - during handshake by increasing parent's reference count. - Add missing SSL - socket close when the newly accepted SSL socket is discarded in SIP TLS - transport. - ---- - pjlib/src/pj/ssl_sock_imp_common.c | 44 +++++++++++++++++++++-------- - pjsip/src/pjsip/sip_transport_tls.c | 23 ++++++++++++++- - 2 files changed, 55 insertions(+), 12 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c -index bc468bcb3..abec31805 100644 ---- a/pjlib/src/pj/ssl_sock_imp_common.c -+++ b/pjlib/src/pj/ssl_sock_imp_common.c -@@ -224,6 +224,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - - /* Accepting */ - if (ssock->is_server) { -+ pj_bool_t ret = PJ_TRUE; -+ - if (status != PJ_SUCCESS) { - /* Handshake failed in accepting, destroy our self silently. */ - -@@ -241,6 +243,12 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - status); - } - -+ /* Decrement ref count of parent */ -+ if (ssock->parent->param.grp_lock) { -+ pj_grp_lock_dec_ref(ssock->parent->param.grp_lock); -+ ssock->parent = NULL; -+ } -+ - /* Originally, this is a workaround for ticket #985. However, - * a race condition may occur in multiple worker threads - * environment when we are destroying SSL objects while other -@@ -284,23 +292,29 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - - return PJ_FALSE; - } -+ - /* Notify application the newly accepted SSL socket */ - if (ssock->param.cb.on_accept_complete2) { -- pj_bool_t ret; - ret = (*ssock->param.cb.on_accept_complete2) - (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, - pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), - status); -- if (ret == PJ_FALSE) -- return PJ_FALSE; - } else if (ssock->param.cb.on_accept_complete) { -- pj_bool_t ret; - ret = (*ssock->param.cb.on_accept_complete) - (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, - pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr)); -- if (ret == PJ_FALSE) -- return PJ_FALSE; - } -+ -+ /* Decrement ref count of parent and reset parent (we don't need it -+ * anymore, right?). -+ */ -+ if (ssock->parent->param.grp_lock) { -+ pj_grp_lock_dec_ref(ssock->parent->param.grp_lock); -+ ssock->parent = NULL; -+ } -+ -+ if (ret == PJ_FALSE) -+ return PJ_FALSE; - } - - /* Connecting */ -@@ -864,9 +878,13 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock, - if (status != PJ_SUCCESS) - goto on_return; - -+ /* Set parent and add ref count (avoid parent destroy during handshake) */ -+ ssock->parent = ssock_parent; -+ if (ssock->parent->param.grp_lock) -+ pj_grp_lock_add_ref(ssock->parent->param.grp_lock); -+ - /* Update new SSL socket attributes */ - ssock->sock = newsock; -- ssock->parent = ssock_parent; - ssock->is_server = PJ_TRUE; - if (ssock_parent->cert) { - status = pj_ssl_sock_set_certificate(ssock, ssock->pool, -@@ -913,16 +931,20 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock, - ssock->asock_rbuf = (void**)pj_pool_calloc(ssock->pool, - ssock->param.async_cnt, - sizeof(void*)); -- if (!ssock->asock_rbuf) -- return PJ_ENOMEM; -+ if (!ssock->asock_rbuf) { -+ status = PJ_ENOMEM; -+ goto on_return; -+ } - - for (i = 0; iparam.async_cnt; ++i) { -- ssock->asock_rbuf[i] = (void*) pj_pool_alloc( -+ ssock->asock_rbuf[i] = (void*) pj_pool_alloc( - ssock->pool, - ssock->param.read_buffer_size + - sizeof(read_data_t*)); -- if (!ssock->asock_rbuf[i]) -- return PJ_ENOMEM; -+ if (!ssock->asock_rbuf[i]) { -+ status = PJ_ENOMEM; -+ goto on_return; -+ } - } - - /* Create active socket */ -diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c -index 17b7ae3de..ce524d53f 100644 ---- a/pjsip/src/pjsip/sip_transport_tls.c -+++ b/pjsip/src/pjsip/sip_transport_tls.c -@@ -1325,9 +1325,26 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - PJ_UNUSED_ARG(src_addr_len); - - listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock); -+ if (!listener) { -+ /* Listener already destroyed, e.g: after TCP accept but before SSL -+ * handshake is completed. -+ */ -+ if (new_ssock && accept_status == PJ_SUCCESS) { -+ /* Close the SSL socket if the accept op is successful */ -+ PJ_LOG(4,(THIS_FILE, -+ "Incoming TLS connection from %s (sock=%d) is discarded " -+ "because listener is already destroyed", -+ pj_sockaddr_print(src_addr, addr, sizeof(addr), 3), -+ new_ssock)); -+ -+ pj_ssl_sock_close(new_ssock); -+ } -+ -+ return PJ_FALSE; -+ } - - if (accept_status != PJ_SUCCESS) { -- if (listener && listener->tls_setting.on_accept_fail_cb) { -+ if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_ssl_sock_info ssi; - -@@ -1350,6 +1367,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - PJ_ASSERT_RETURN(new_ssock, PJ_TRUE); - - if (!listener->is_registered) { -+ pj_ssl_sock_close(new_ssock); -+ - if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_bzero(¶m, sizeof(param)); -@@ -1401,6 +1420,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock, - ssl_info.grp_lock, &tls); - - if (status != PJ_SUCCESS) { -+ pj_ssl_sock_close(new_ssock); -+ - if (listener->tls_setting.on_accept_fail_cb) { - pjsip_tls_on_accept_fail_param param; - pj_bzero(¶m, sizeof(param)); diff --git a/third-party/pjproject/patches/0111-ssl-premature-destroy.patch b/third-party/pjproject/patches/0111-ssl-premature-destroy.patch deleted file mode 100644 index 9de2915b5a..0000000000 --- a/third-party/pjproject/patches/0111-ssl-premature-destroy.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 68c69f516f95df1faa42e5647e9ce7cfdc41ac38 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Wed, 16 Jun 2021 12:15:29 +0700 -Subject: [PATCH 2/2] - Fix silly mistake: accepted active socket created - without group lock in SSL socket. - Replace assertion with normal validation - check of SSL socket instance in OpenSSL verification callback (verify_cb()) - to avoid crash, e.g: if somehow race condition with SSL socket destroy - happens or OpenSSL application data index somehow gets corrupted. - ---- - pjlib/src/pj/ssl_sock_imp_common.c | 3 +- - pjlib/src/pj/ssl_sock_ossl.c | 45 +++++++++++++++++++++++++----- - 2 files changed, 40 insertions(+), 8 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c -index bc468bcb3..c2b8a846b 100644 ---- a/pjlib/src/pj/ssl_sock_imp_common.c -+++ b/pjlib/src/pj/ssl_sock_imp_common.c -@@ -927,6 +927,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock, - - /* Create active socket */ - pj_activesock_cfg_default(&asock_cfg); -+ asock_cfg.grp_lock = ssock->param.grp_lock; - asock_cfg.async_cnt = ssock->param.async_cnt; - asock_cfg.concurrency = ssock->param.concurrency; - asock_cfg.whole_data = PJ_TRUE; -@@ -942,7 +943,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock, - goto on_return; - - pj_grp_lock_add_ref(glock); -- asock_cfg.grp_lock = ssock->param.grp_lock = glock; -+ ssock->param.grp_lock = glock; - pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock, - ssl_on_destroy); - } -diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c -index a95b339a5..56841f80a 100644 ---- a/pjlib/src/pj/ssl_sock_ossl.c -+++ b/pjlib/src/pj/ssl_sock_ossl.c -@@ -327,7 +327,8 @@ static pj_status_t STATUS_FROM_SSL_ERR(char *action, pj_ssl_sock_t *ssock, - ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock); - } - -- ssock->last_err = err; -+ if (ssock) -+ ssock->last_err = err; - return GET_STATUS_FROM_SSL_ERR(err); - } - -@@ -344,7 +345,8 @@ static pj_status_t STATUS_FROM_SSL_ERR2(char *action, pj_ssl_sock_t *ssock, - /* Dig for more from OpenSSL error queue */ - SSLLogErrors(action, ret, err, len, ssock); - -- ssock->last_err = ssl_err; -+ if (ssock) -+ ssock->last_err = ssl_err; - return GET_STATUS_FROM_SSL_ERR(ssl_err); - } - -@@ -587,6 +589,13 @@ static pj_status_t init_openssl(void) - - /* Create OpenSSL application data index for SSL socket */ - sslsock_idx = SSL_get_ex_new_index(0, "SSL socket", NULL, NULL, NULL); -+ if (sslsock_idx == -1) { -+ status = STATUS_FROM_SSL_ERR2("Init", NULL, -1, ERR_get_error(), 0); -+ PJ_LOG(1,(THIS_FILE, -+ "Fatal error: failed to get application data index for " -+ "SSL socket")); -+ return status; -+ } - - return status; - } -@@ -614,21 +623,36 @@ static int password_cb(char *buf, int num, int rwflag, void *user_data) - } - - --/* SSL password callback. */ -+/* SSL certificate verification result callback. -+ * Note that this callback seems to be always called from library worker -+ * thread, e.g: active socket on_read_complete callback, which should have -+ * already been equipped with race condition avoidance mechanism (should not -+ * be destroyed while callback is being invoked). -+ */ - static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) - { -- pj_ssl_sock_t *ssock; -- SSL *ossl_ssl; -+ pj_ssl_sock_t *ssock = NULL; -+ SSL *ossl_ssl = NULL; - int err; - - /* Get SSL instance */ - ossl_ssl = X509_STORE_CTX_get_ex_data(x509_ctx, - SSL_get_ex_data_X509_STORE_CTX_idx()); -- pj_assert(ossl_ssl); -+ if (!ossl_ssl) { -+ PJ_LOG(1,(THIS_FILE, -+ "SSL verification callback failed to get SSL instance")); -+ goto on_return; -+ } - - /* Get SSL socket instance */ - ssock = SSL_get_ex_data(ossl_ssl, sslsock_idx); -- pj_assert(ssock); -+ if (!ssock) { -+ /* SSL socket may have been destroyed */ -+ PJ_LOG(1,(THIS_FILE, -+ "SSL verification callback failed to get SSL socket " -+ "instance (sslsock_idx=%d).", sslsock_idx)); -+ goto on_return; -+ } - - /* Store verification status */ - err = X509_STORE_CTX_get_error(x509_ctx); -@@ -706,6 +730,7 @@ static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx) - if (PJ_FALSE == ssock->param.verify_peer) - preverify_ok = 1; - -+on_return: - return preverify_ok; - } - -@@ -1213,6 +1238,12 @@ static void ssl_destroy(pj_ssl_sock_t *ssock) - static void ssl_reset_sock_state(pj_ssl_sock_t *ssock) - { - ossl_sock_t *ossock = (ossl_sock_t *)ssock; -+ -+ /* Detach from SSL instance */ -+ if (ossock->ossl_ssl) { -+ SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL); -+ } -+ - /** - * Avoid calling SSL_shutdown() if handshake wasn't completed. - * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an diff --git a/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch b/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch deleted file mode 100644 index 1b1fcad177..0000000000 --- a/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2ae784030b0d9cf217c3d562af20e4967f19a3dc Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Tue, 14 Sep 2021 10:47:29 -0600 -Subject: [PATCH] pjmedia_sdp_attr_get_rtpmap: Strip param trailing whitespace - -Use pj_scan_get() to parse the param part of rtpmap so -trailing whitespace is automatically stripped. - -Fixes #2827 ---- - pjmedia/src/pjmedia/sdp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c -index 5d05a0d9c..3448749c9 100644 ---- a/pjmedia/src/pjmedia/sdp.c -+++ b/pjmedia/src/pjmedia/sdp.c -@@ -313,9 +313,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr, - - /* Expecting either '/' or EOF */ - if (*scanner.curptr == '/') { -+ /* Skip the '/' */ - pj_scan_get_char(&scanner); -- rtpmap->param.ptr = scanner.curptr; -- rtpmap->param.slen = scanner.end - scanner.curptr; -+ pj_scan_get(&scanner, &cs_token, &rtpmap->param); - } else { - rtpmap->param.slen = 0; - } --- -2.31.1 - diff --git a/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch b/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch deleted file mode 100644 index 91feefb4bf..0000000000 --- a/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch +++ /dev/null @@ -1,661 +0,0 @@ -From 0ed41eb5fd0e4192e1b7dc374f819d17aef3e805 Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Tue, 21 Dec 2021 19:32:22 -0700 -Subject: [PATCH] sip_inv: Additional multipart support (#2919) (#2920) - ---- - pjsip/include/pjsip-ua/sip_inv.h | 108 ++++++++++- - pjsip/src/pjsip-ua/sip_inv.c | 240 ++++++++++++++++++++----- - pjsip/src/test/inv_offer_answer_test.c | 103 ++++++++++- - 3 files changed, 394 insertions(+), 57 deletions(-) - -diff --git a/pjsip/include/pjsip-ua/sip_inv.h b/pjsip/include/pjsip-ua/sip_inv.h -index 14f2d23fa..c33551786 100644 ---- a/pjsip/include/pjsip-ua/sip_inv.h -+++ b/pjsip/include/pjsip-ua/sip_inv.h -@@ -451,11 +451,11 @@ struct pjsip_inv_session - - - /** -- * This structure represents SDP information in a pjsip_rx_data. Application -- * retrieve this information by calling #pjsip_rdata_get_sdp_info(). This -+ * This structure represents SDP information in a pjsip_(rx|tx)_data. Application -+ * retrieve this information by calling #pjsip_get_sdp_info(). This - * mechanism supports multipart message body. - */ --typedef struct pjsip_rdata_sdp_info -+typedef struct pjsip_sdp_info - { - /** - * Pointer and length of the text body in the incoming message. If -@@ -475,7 +475,15 @@ typedef struct pjsip_rdata_sdp_info - */ - pjmedia_sdp_session *sdp; - --} pjsip_rdata_sdp_info; -+} pjsip_sdp_info; -+ -+/** -+ * For backwards compatibility and completeness, -+ * pjsip_rdata_sdp_info and pjsip_tdata_sdp_info -+ * are typedef'd to pjsip_sdp_info. -+ */ -+typedef pjsip_sdp_info pjsip_rdata_sdp_info; -+typedef pjsip_sdp_info pjsip_tdata_sdp_info; - - - /** -@@ -1045,6 +1053,44 @@ PJ_DECL(pj_status_t) pjsip_create_sdp_body(pj_pool_t *pool, - pjmedia_sdp_session *sdp, - pjsip_msg_body **p_body); - -+/** -+ * This is a utility function to create a multipart body with the -+ * SIP body as the first part. -+ * -+ * @param pool Pool to allocate memory. -+ * @param sdp SDP session to be put in the SIP message body. -+ * @param p_body Pointer to receive SIP message body containing -+ * the SDP session. -+ * -+ * @return PJ_SUCCESS on success. -+ */ -+PJ_DECL(pj_status_t) pjsip_create_multipart_sdp_body( pj_pool_t *pool, -+ pjmedia_sdp_session *sdp, -+ pjsip_msg_body **p_body); -+ -+/** -+ * Retrieve SDP information from a message body. Application should -+ * prefer to use this function rather than parsing the SDP manually since -+ * this function supports multipart message body. -+ * -+ * This function will only parse the SDP once, the first time it is called -+ * on the same message. Subsequent call on the same message will just pick -+ * up the already parsed SDP from the message. -+ * -+ * @param pool Pool to allocate memory. -+ * @param body The message body. -+ * @param msg_media_type From the rdata or tdata Content-Type header, if available. -+ * If NULL, the content_type from the body will be used. -+ * @param search_media_type The media type to search for. -+ * If NULL, "application/sdp" will be used. -+ * -+ * @return The SDP info. -+ */ -+PJ_DECL(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool, -+ pjsip_msg_body *body, -+ pjsip_media_type *msg_media_type, -+ const pjsip_media_type *search_media_type); -+ - /** - * Retrieve SDP information from an incoming message. Application should - * prefer to use this function rather than parsing the SDP manually since -@@ -1061,6 +1107,60 @@ PJ_DECL(pj_status_t) pjsip_create_sdp_body(pj_pool_t *pool, - PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata); - - -+/** -+ * Retrieve SDP information from an incoming message. Application should -+ * prefer to use this function rather than parsing the SDP manually since -+ * this function supports multipart message body. -+ * -+ * This function will only parse the SDP once, the first time it is called -+ * on the same message. Subsequent call on the same message will just pick -+ * up the already parsed SDP from the message. -+ * -+ * @param rdata The incoming message. -+ * @param search_media_type The SDP media type to search for. -+ * If NULL, "application/sdp" will be used. -+ * -+ * @return The SDP info. -+ */ -+PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2( -+ pjsip_rx_data *rdata, -+ const pjsip_media_type *search_media_type); -+ -+/** -+ * Retrieve SDP information from an outgoing message. Application should -+ * prefer to use this function rather than parsing the SDP manually since -+ * this function supports multipart message body. -+ * -+ * This function will only parse the SDP once, the first time it is called -+ * on the same message. Subsequent call on the same message will just pick -+ * up the already parsed SDP from the message. -+ * -+ * @param tdata The outgoing message. -+ * -+ * @return The SDP info. -+ */ -+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata); -+ -+/** -+ * Retrieve SDP information from an outgoing message. Application should -+ * prefer to use this function rather than parsing the SDP manually since -+ * this function supports multipart message body. -+ * -+ * This function will only parse the SDP once, the first time it is called -+ * on the same message. Subsequent call on the same message will just pick -+ * up the already parsed SDP from the message. -+ * -+ * @param tdata The outgoing message. -+ * @param search_media_type The SDP media type to search for. -+ * If NULL, "application/sdp" will be used. -+ * -+ * @return The SDP info. -+ */ -+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2( -+ pjsip_tx_data *tdata, -+ const pjsip_media_type *search_media_type); -+ -+ - PJ_END_DECL - - /** -diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c -index ca225015b..b68ae0f16 100644 ---- a/pjsip/src/pjsip-ua/sip_inv.c -+++ b/pjsip/src/pjsip-ua/sip_inv.c -@@ -118,6 +118,8 @@ static pj_status_t handle_timer_response(pjsip_inv_session *inv, - static pj_bool_t inv_check_secure_dlg(pjsip_inv_session *inv, - pjsip_event *e); - -+static int print_sdp(pjsip_msg_body *body, char *buf, pj_size_t len); -+ - static void (*inv_state_handler[])( pjsip_inv_session *inv, pjsip_event *e) = - { - &inv_on_state_null, -@@ -946,66 +948,170 @@ PJ_DEF(pj_status_t) pjsip_inv_create_uac( pjsip_dialog *dlg, - return PJ_SUCCESS; - } - --PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata) -+PJ_DEF(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool, -+ pjsip_msg_body *body, -+ pjsip_media_type *msg_media_type, -+ const pjsip_media_type *search_media_type) - { -- pjsip_rdata_sdp_info *sdp_info; -- pjsip_msg_body *body = rdata->msg_info.msg->body; -- pjsip_ctype_hdr *ctype_hdr = rdata->msg_info.ctype; -- pjsip_media_type app_sdp; -+ pjsip_sdp_info *sdp_info; -+ pjsip_media_type search_type; -+ pjsip_media_type multipart_mixed; -+ pjsip_media_type multipart_alternative; -+ pjsip_media_type *msg_type; -+ pj_status_t status; - -- sdp_info = (pjsip_rdata_sdp_info*) -- rdata->endpt_info.mod_data[mod_inv.mod.id]; -- if (sdp_info) -- return sdp_info; -+ sdp_info = PJ_POOL_ZALLOC_T(pool, -+ pjsip_sdp_info); - -- sdp_info = PJ_POOL_ZALLOC_T(rdata->tp_info.pool, -- pjsip_rdata_sdp_info); - PJ_ASSERT_RETURN(mod_inv.mod.id >= 0, sdp_info); -- rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info; - -- pjsip_media_type_init2(&app_sdp, "application", "sdp"); -+ if (!body) { -+ return sdp_info; -+ } - -- if (body && ctype_hdr && -- pj_stricmp(&ctype_hdr->media.type, &app_sdp.type)==0 && -- pj_stricmp(&ctype_hdr->media.subtype, &app_sdp.subtype)==0) -+ if (msg_media_type) { -+ msg_type = msg_media_type; -+ } else { -+ if (body->content_type.type.slen == 0) { -+ return sdp_info; -+ } -+ msg_type = &body->content_type; -+ } -+ -+ if (!search_media_type) { -+ pjsip_media_type_init2(&search_type, "application", "sdp"); -+ } else { -+ pj_memcpy(&search_type, search_media_type, sizeof(search_type)); -+ } -+ -+ pjsip_media_type_init2(&multipart_mixed, "multipart", "mixed"); -+ pjsip_media_type_init2(&multipart_alternative, "multipart", "alternative"); -+ -+ if (pjsip_media_type_cmp(msg_type, &search_type, PJ_FALSE) == 0) - { -- sdp_info->body.ptr = (char*)body->data; -- sdp_info->body.slen = body->len; -- } else if (body && ctype_hdr && -- pj_stricmp2(&ctype_hdr->media.type, "multipart")==0 && -- (pj_stricmp2(&ctype_hdr->media.subtype, "mixed")==0 || -- pj_stricmp2(&ctype_hdr->media.subtype, "alternative")==0)) -+ /* -+ * If the print_body function is print_sdp, we know that -+ * body->data is a pjmedia_sdp_session object and came from -+ * a tx_data. If not, it's the text representation of the -+ * sdp from an rx_data. -+ */ -+ if (body->print_body == print_sdp) { -+ sdp_info->sdp = body->data; -+ } else { -+ sdp_info->body.ptr = (char*)body->data; -+ sdp_info->body.slen = body->len; -+ } -+ } else if (pjsip_media_type_cmp(&multipart_mixed, msg_type, PJ_FALSE) == 0 || -+ pjsip_media_type_cmp(&multipart_alternative, msg_type, PJ_FALSE) == 0) - { -- pjsip_multipart_part *part; -+ pjsip_multipart_part *part; -+ part = pjsip_multipart_find_part(body, &search_type, NULL); -+ if (part) { -+ if (part->body->print_body == print_sdp) { -+ sdp_info->sdp = part->body->data; -+ } else { -+ sdp_info->body.ptr = (char*)part->body->data; -+ sdp_info->body.slen = part->body->len; -+ } -+ } -+ } - -- part = pjsip_multipart_find_part(body, &app_sdp, NULL); -- if (part) { -- sdp_info->body.ptr = (char*)part->body->data; -- sdp_info->body.slen = part->body->len; -- } -+ /* -+ * If the body was already a pjmedia_sdp_session, we can just -+ * return it. If not and there wasn't a text representation -+ * of the sdp either, we can also just return. -+ */ -+ if (sdp_info->sdp || !sdp_info->body.ptr) { -+ return sdp_info; - } - -- if (sdp_info->body.ptr) { -- pj_status_t status; -- status = pjmedia_sdp_parse(rdata->tp_info.pool, -- sdp_info->body.ptr, -- sdp_info->body.slen, -- &sdp_info->sdp); -- if (status == PJ_SUCCESS) -- status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE); -+ /* -+ * If the body was the text representation of teh SDP, we need -+ * to parse it to create a pjmedia_sdp_session object. -+ */ -+ status = pjmedia_sdp_parse(pool, -+ sdp_info->body.ptr, -+ sdp_info->body.slen, -+ &sdp_info->sdp); -+ if (status == PJ_SUCCESS) -+ status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE); - -- if (status != PJ_SUCCESS) { -- sdp_info->sdp = NULL; -- PJ_PERROR(1,(THIS_FILE, status, -- "Error parsing/validating SDP body")); -- } -+ if (status != PJ_SUCCESS) { -+ sdp_info->sdp = NULL; -+ PJ_PERROR(1, (THIS_FILE, status, -+ "Error parsing/validating SDP body")); -+ } -+ -+ sdp_info->sdp_err = status; -+ -+ return sdp_info; -+} - -- sdp_info->sdp_err = status; -+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2( -+ pjsip_rx_data *rdata, -+ const pjsip_media_type *search_media_type) -+{ -+ pjsip_media_type *msg_media_type = NULL; -+ pjsip_rdata_sdp_info *sdp_info; -+ -+ if (rdata->endpt_info.mod_data[mod_inv.mod.id]) { -+ return (pjsip_rdata_sdp_info *)rdata->endpt_info.mod_data[mod_inv.mod.id]; -+ } -+ -+ /* -+ * rdata should have a Content-Type header at this point but we'll -+ * make sure. -+ */ -+ if (rdata->msg_info.ctype) { -+ msg_media_type = &rdata->msg_info.ctype->media; -+ } -+ sdp_info = pjsip_get_sdp_info(rdata->tp_info.pool, -+ rdata->msg_info.msg->body, -+ msg_media_type, -+ search_media_type); -+ rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info; -+ -+ return sdp_info; -+} -+ -+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata) -+{ -+ return pjsip_rdata_get_sdp_info2(rdata, NULL); -+} -+ -+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2( -+ pjsip_tx_data *tdata, -+ const pjsip_media_type *search_media_type) -+{ -+ pjsip_ctype_hdr *ctype_hdr = NULL; -+ pjsip_media_type *msg_media_type = NULL; -+ pjsip_tdata_sdp_info *sdp_info; -+ -+ if (tdata->mod_data[mod_inv.mod.id]) { -+ return (pjsip_tdata_sdp_info *)tdata->mod_data[mod_inv.mod.id]; -+ } -+ /* -+ * tdata won't usually have a Content-Type header at this point -+ * but we'll check just the same, -+ */ -+ ctype_hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTENT_TYPE, NULL); -+ if (ctype_hdr) { -+ msg_media_type = &ctype_hdr->media; - } - -+ sdp_info = pjsip_get_sdp_info(tdata->pool, -+ tdata->msg->body, -+ msg_media_type, -+ search_media_type); -+ tdata->mod_data[mod_inv.mod.id] = sdp_info; -+ - return sdp_info; - } - -+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata) -+{ -+ return pjsip_tdata_get_sdp_info2(tdata, NULL); -+} - - /* - * Verify incoming INVITE request. -@@ -1730,13 +1836,55 @@ PJ_DEF(pj_status_t) pjsip_create_sdp_body( pj_pool_t *pool, - return PJ_SUCCESS; - } - -+static pjsip_multipart_part* create_sdp_part(pj_pool_t *pool, pjmedia_sdp_session *sdp) -+{ -+ pjsip_multipart_part *sdp_part; -+ pjsip_media_type media_type; -+ -+ pjsip_media_type_init2(&media_type, "application", "sdp"); -+ -+ sdp_part = pjsip_multipart_create_part(pool); -+ PJ_ASSERT_RETURN(sdp_part != NULL, NULL); -+ -+ sdp_part->body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body); -+ PJ_ASSERT_RETURN(sdp_part->body != NULL, NULL); -+ -+ pjsip_media_type_cp(pool, &sdp_part->body->content_type, &media_type); -+ -+ sdp_part->body->data = sdp; -+ sdp_part->body->clone_data = clone_sdp; -+ sdp_part->body->print_body = print_sdp; -+ -+ return sdp_part; -+} -+ -+PJ_DEF(pj_status_t) pjsip_create_multipart_sdp_body(pj_pool_t *pool, -+ pjmedia_sdp_session *sdp, -+ pjsip_msg_body **p_body) -+{ -+ pjsip_media_type media_type; -+ pjsip_msg_body *multipart; -+ pjsip_multipart_part *sdp_part; -+ -+ pjsip_media_type_init2(&media_type, "multipart", "mixed"); -+ multipart = pjsip_multipart_create(pool, &media_type, NULL); -+ PJ_ASSERT_RETURN(multipart != NULL, PJ_ENOMEM); -+ -+ sdp_part = create_sdp_part(pool, sdp); -+ PJ_ASSERT_RETURN(sdp_part != NULL, PJ_ENOMEM); -+ pjsip_multipart_add_part(pool, multipart, sdp_part); -+ *p_body = multipart; -+ -+ return PJ_SUCCESS; -+} -+ - static pjsip_msg_body *create_sdp_body(pj_pool_t *pool, - const pjmedia_sdp_session *c_sdp) - { - pjsip_msg_body *body; - pj_status_t status; - -- status = pjsip_create_sdp_body(pool, -+ status = pjsip_create_sdp_body(pool, - pjmedia_sdp_session_clone(pool, c_sdp), - &body); - -@@ -2059,6 +2207,7 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, - ) - ) - { -+ pjsip_sdp_info *tdata_sdp_info; - const pjmedia_sdp_session *reoffer_sdp = NULL; - - PJ_LOG(4,(inv->obj_name, "Received %s response " -@@ -2067,14 +2216,15 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, - (st_code/10==18? "early" : "final" ))); - - /* Retrieve original SDP offer from INVITE request */ -- reoffer_sdp = (const pjmedia_sdp_session*) -- tsx->last_tx->msg->body->data; -+ tdata_sdp_info = pjsip_tdata_get_sdp_info(tsx->last_tx); -+ reoffer_sdp = tdata_sdp_info->sdp; - - /* Feed the original offer to negotiator */ - status = pjmedia_sdp_neg_modify_local_offer2(inv->pool_prov, - inv->neg, - inv->sdp_neg_flags, - reoffer_sdp); -+ - if (status != PJ_SUCCESS) { - PJ_LOG(1,(inv->obj_name, "Error updating local offer for " - "forked 2xx/18x response (err=%d)", status)); -diff --git a/pjsip/src/test/inv_offer_answer_test.c b/pjsip/src/test/inv_offer_answer_test.c -index ad5fcd409..9cdd2654b 100644 ---- a/pjsip/src/test/inv_offer_answer_test.c -+++ b/pjsip/src/test/inv_offer_answer_test.c -@@ -137,6 +137,7 @@ typedef struct inv_test_param_t - pj_bool_t need_established; - unsigned count; - oa_t oa[4]; -+ pj_bool_t multipart_body; - } inv_test_param_t; - - typedef struct inv_test_t -@@ -257,6 +258,17 @@ static void on_media_update(pjsip_inv_session *inv_ses, - } - } - -+ /* Special handling for standard offer/answer */ -+ if (inv_test.param.count == 1 && -+ inv_test.param.oa[0] == OFFERER_UAC && -+ inv_test.param.need_established) -+ { -+ jobs[job_cnt].type = ESTABLISH_CALL; -+ jobs[job_cnt].who = PJSIP_ROLE_UAS; -+ job_cnt++; -+ TRACE_((THIS_FILE, " C+++")); -+ } -+ - pj_assert(job_cnt <= PJ_ARRAY_SIZE(jobs)); - } - } -@@ -333,6 +345,15 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) - NULL, &tdata); - pj_assert(status == PJ_SUCCESS); - -+ /* Use multipart body, if configured */ -+ if (sdp && inv_test.param.multipart_body) { -+ status = pjsip_create_multipart_sdp_body( -+ tdata->pool, -+ pjmedia_sdp_session_clone(tdata->pool, sdp), -+ &tdata->msg->body); -+ } -+ pj_assert(status == PJ_SUCCESS); -+ - status = pjsip_inv_send_msg(inv_test.uas, tdata); - pj_assert(status == PJ_SUCCESS); - -@@ -426,6 +447,7 @@ static int perform_test(inv_test_param_t *param) - sdp = NULL; - - status = pjsip_inv_create_uac(dlg, sdp, inv_test.param.inv_option, &inv_test.uac); -+ //inv_test.uac->create_multipart = param->multipart_body; - PJ_ASSERT_RETURN(status==PJ_SUCCESS, -20); - - TRACE_((THIS_FILE, " Sending INVITE %s offer", (sdp ? "with" : "without"))); -@@ -436,8 +458,17 @@ static int perform_test(inv_test_param_t *param) - status = pjsip_inv_invite(inv_test.uac, &tdata); - PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30); - -+ /* Use multipart body, if configured */ -+ if (sdp && param->multipart_body) { -+ status = pjsip_create_multipart_sdp_body( -+ tdata->pool, -+ pjmedia_sdp_session_clone(tdata->pool, sdp), -+ &tdata->msg->body); -+ } -+ PJ_ASSERT_RETURN(status==PJ_SUCCESS, -40); -+ - status = pjsip_inv_send_msg(inv_test.uac, tdata); -- PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30); -+ PJ_ASSERT_RETURN(status==PJ_SUCCESS, -50); - - /* - * Wait until test completes -@@ -525,13 +556,14 @@ static inv_test_param_t test_params[] = - 200/INVITE (answer) <-- - ACK --> - */ --#if 0 -+#if 1 - { - "Standard INVITE with offer", - 0, - PJ_TRUE, - 1, -- { OFFERER_UAC } -+ { OFFERER_UAC }, -+ PJ_FALSE - }, - - { -@@ -539,7 +571,25 @@ static inv_test_param_t test_params[] = - PJSIP_INV_REQUIRE_100REL, - PJ_TRUE, - 1, -- { OFFERER_UAC } -+ { OFFERER_UAC }, -+ PJ_FALSE -+ }, -+ { -+ "Standard INVITE with offer, with Multipart", -+ 0, -+ PJ_TRUE, -+ 1, -+ { OFFERER_UAC }, -+ PJ_TRUE -+ }, -+ -+ { -+ "Standard INVITE with offer, with 100rel, with Multipart", -+ PJSIP_INV_REQUIRE_100REL, -+ PJ_TRUE, -+ 1, -+ { OFFERER_UAC }, -+ PJ_TRUE - }, - #endif - -@@ -555,7 +605,8 @@ static inv_test_param_t test_params[] = - 0, - PJ_TRUE, - 1, -- { OFFERER_UAS } -+ { OFFERER_UAS }, -+ PJ_FALSE - }, - - { -@@ -563,7 +614,25 @@ static inv_test_param_t test_params[] = - PJSIP_INV_REQUIRE_100REL, - PJ_TRUE, - 1, -- { OFFERER_UAS } -+ { OFFERER_UAS }, -+ PJ_FALSE -+ }, -+ { -+ "INVITE with no offer, with Multipart", -+ 0, -+ PJ_TRUE, -+ 1, -+ { OFFERER_UAS }, -+ PJ_TRUE -+ }, -+ -+ { -+ "INVITE with no offer, with 100rel, with Multipart", -+ PJSIP_INV_REQUIRE_100REL, -+ PJ_TRUE, -+ 1, -+ { OFFERER_UAS }, -+ PJ_TRUE - }, - #endif - -@@ -584,14 +653,24 @@ static inv_test_param_t test_params[] = - 0, - PJ_TRUE, - 2, -- { OFFERER_UAC, OFFERER_UAC } -+ { OFFERER_UAC, OFFERER_UAC }, -+ PJ_FALSE -+ }, -+ { -+ "INVITE and UPDATE by UAC, with Multipart", -+ 0, -+ PJ_TRUE, -+ 2, -+ { OFFERER_UAC, OFFERER_UAC }, -+ PJ_TRUE - }, - { - "INVITE and UPDATE by UAC, with 100rel", - PJSIP_INV_REQUIRE_100REL, - PJ_TRUE, - 2, -- { OFFERER_UAC, OFFERER_UAC } -+ { OFFERER_UAC, OFFERER_UAC }, -+ PJ_FALSE - }, - #endif - -@@ -617,6 +696,14 @@ static inv_test_param_t test_params[] = - 4, - { OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS } - }, -+ { -+ "INVITE and many UPDATE by UAC and UAS, with Multipart", -+ 0, -+ PJ_TRUE, -+ 4, -+ { OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS }, -+ PJ_TRUE -+ }, - - }; - --- -2.33.1 - diff --git a/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch b/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch deleted file mode 100644 index 6ddb3469cc..0000000000 --- a/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 7e3dfd8a15fd0f98dbf0e04d2d7a5bded90ee401 Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Tue, 11 Jan 2022 09:27:23 -0700 -Subject: [PATCH] Create generic pjsip_hdr_find functions - -pjsip_msg_find_hdr(), pjsip_msg_find_hdr_by_name(), and -pjsip_msg_find_hdr_by_names() require a pjsip_msg to be passed in -so if you need to search a header list that's not in a pjsip_msg, -you have to do it yourself. This commit adds generic versions of -those 3 functions that take in the actual header list head instead -of a pjsip_msg so if you need to search a list of headers in -something like a pjsip_multipart_part, you can do so easily. ---- - pjsip/include/pjsip/sip_msg.h | 53 +++++++++++++++++++++++++++++++++++ - pjsip/src/pjsip/sip_msg.c | 51 +++++++++++++++++++++++---------- - 2 files changed, 89 insertions(+), 15 deletions(-) - -diff --git a/pjsip/include/pjsip/sip_msg.h b/pjsip/include/pjsip/sip_msg.h -index 4c9100d39..e3502e94e 100644 ---- a/pjsip/include/pjsip/sip_msg.h -+++ b/pjsip/include/pjsip/sip_msg.h -@@ -362,6 +362,59 @@ PJ_DECL(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr ); - */ - PJ_DECL(int) pjsip_hdr_print_on( void *hdr, char *buf, pj_size_t len); - -+/** -+ * Find a header in a header list by the header type. -+ * -+ * @param hdr_list The "head" of the header list. -+ * @param type The header type to find. -+ * @param start The first header field where the search should begin. -+ * If NULL is specified, then the search will begin from the -+ * first header, otherwise the search will begin at the -+ * specified header. -+ * -+ * @return The header field, or NULL if no header with the specified -+ * type is found. -+ */ -+PJ_DECL(void*) pjsip_hdr_find( const void *hdr_list, -+ pjsip_hdr_e type, -+ const void *start); -+ -+/** -+ * Find a header in a header list by its name. -+ * -+ * @param hdr_list The "head" of the header list. -+ * @param name The header name to find. -+ * @param start The first header field where the search should begin. -+ * If NULL is specified, then the search will begin from the -+ * first header, otherwise the search will begin at the -+ * specified header. -+ * -+ * @return The header field, or NULL if no header with the specified -+ * type is found. -+ */ -+PJ_DECL(void*) pjsip_hdr_find_by_name( const void *hdr_list, -+ const pj_str_t *name, -+ const void *start); -+ -+/** -+ * Find a header in a header list by its name and short name version. -+ * -+ * @param hdr_list The "head" of the header list. -+ * @param name The header name to find. -+ * @param sname The short name version of the header name. -+ * @param start The first header field where the search should begin. -+ * If NULL is specified, then the search will begin from the -+ * first header, otherwise the search will begin at the -+ * specified header. -+ * -+ * @return The header field, or NULL if no header with the specified -+ * type is found. -+ */ -+PJ_DECL(void*) pjsip_hdr_find_by_names( const void *hdr_list, -+ const pj_str_t *name, -+ const pj_str_t *sname, -+ const void *start); -+ - /** - * @} - */ -diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c -index 6ba3054da..2a6a96af0 100644 ---- a/pjsip/src/pjsip/sip_msg.c -+++ b/pjsip/src/pjsip/sip_msg.c -@@ -356,13 +356,13 @@ PJ_DEF(pjsip_msg*) pjsip_msg_clone( pj_pool_t *pool, const pjsip_msg *src) - return dst; - } - --PJ_DEF(void*) pjsip_msg_find_hdr( const pjsip_msg *msg, -- pjsip_hdr_e hdr_type, const void *start) -+PJ_DEF(void*) pjsip_hdr_find( const void *hdr_list, -+ pjsip_hdr_e hdr_type, const void *start) - { -- const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=&msg->hdr; -+ const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list; - - if (hdr == NULL) { -- hdr = msg->hdr.next; -+ hdr = end->next; - } - for (; hdr!=end; hdr = hdr->next) { - if (hdr->type == hdr_type) -@@ -371,14 +371,14 @@ PJ_DEF(void*) pjsip_msg_find_hdr( const pjsip_msg *msg, - return NULL; - } - --PJ_DEF(void*) pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, -- const pj_str_t *name, -- const void *start) -+PJ_DEF(void*) pjsip_hdr_find_by_name( const void *hdr_list, -+ const pj_str_t *name, -+ const void *start) - { -- const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr; -+ const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list; - - if (hdr == NULL) { -- hdr = msg->hdr.next; -+ hdr = end->next; - } - for (; hdr!=end; hdr = hdr->next) { - if (pj_stricmp(&hdr->name, name) == 0) -@@ -387,15 +387,15 @@ PJ_DEF(void*) pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, - return NULL; - } - --PJ_DEF(void*) pjsip_msg_find_hdr_by_names( const pjsip_msg *msg, -- const pj_str_t *name, -- const pj_str_t *sname, -- const void *start) -+PJ_DEF(void*) pjsip_hdr_find_by_names( const void *hdr_list, -+ const pj_str_t *name, -+ const pj_str_t *sname, -+ const void *start) - { -- const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr; -+ const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list; - - if (hdr == NULL) { -- hdr = msg->hdr.next; -+ hdr = end->next; - } - for (; hdr!=end; hdr = hdr->next) { - if (pj_stricmp(&hdr->name, name) == 0) -@@ -406,6 +406,27 @@ PJ_DEF(void*) pjsip_msg_find_hdr_by_names( const pjsip_msg *msg, - return NULL; - } - -+PJ_DEF(void*) pjsip_msg_find_hdr( const pjsip_msg *msg, -+ pjsip_hdr_e hdr_type, const void *start) -+{ -+ return pjsip_hdr_find(&msg->hdr, hdr_type, start); -+} -+ -+PJ_DEF(void*) pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, -+ const pj_str_t *name, -+ const void *start) -+{ -+ return pjsip_hdr_find_by_name(&msg->hdr, name, start); -+} -+ -+PJ_DEF(void*) pjsip_msg_find_hdr_by_names( const pjsip_msg *msg, -+ const pj_str_t *name, -+ const pj_str_t *sname, -+ const void *start) -+{ -+ return pjsip_hdr_find_by_names(&msg->hdr, name, sname, start); -+} -+ - PJ_DEF(void*) pjsip_msg_find_remove_hdr( pjsip_msg *msg, - pjsip_hdr_e hdr_type, void *start) - { --- -2.34.1 - diff --git a/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch b/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch deleted file mode 100644 index 373f9b8abe..0000000000 --- a/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch +++ /dev/null @@ -1,644 +0,0 @@ -From b7ecff22e77887626fd8e8608c4dd73bc7b7366f Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Tue, 18 Jan 2022 06:14:31 -0700 -Subject: [PATCH] Additional multipart improvements - -Added the following APIs: -pjsip_multipart_find_part_by_header() -pjsip_multipart_find_part_by_header_str() -pjsip_multipart_find_part_by_cid_str() -pjsip_multipart_find_part_by_cid_uri() ---- - pjsip/include/pjsip/sip_multipart.h | 83 ++++++++++ - pjsip/src/pjsip/sip_multipart.c | 223 +++++++++++++++++++++++++++ - pjsip/src/test/multipart_test.c | 225 +++++++++++++++++++++++++++- - 3 files changed, 530 insertions(+), 1 deletion(-) - -diff --git a/pjsip/include/pjsip/sip_multipart.h b/pjsip/include/pjsip/sip_multipart.h -index 1c05767c5..c6b82b0b4 100644 ---- a/pjsip/include/pjsip/sip_multipart.h -+++ b/pjsip/include/pjsip/sip_multipart.h -@@ -153,6 +153,89 @@ pjsip_multipart_find_part( const pjsip_msg_body *mp, - const pjsip_media_type *content_type, - const pjsip_multipart_part *start); - -+/** -+ * Find a body inside multipart bodies which has a header matching the -+ * supplied one. Most useful for finding a part with a specific Content-ID. -+ * -+ * @param pool Memory pool to use for temp space. -+ * @param mp The multipart body. -+ * @param search_hdr Header to search for. -+ * @param start If specified, the search will begin at -+ * start->next part. Otherwise it will begin at -+ * the first part in the multipart bodies. -+ * -+ * @return The first part which has a header matching the -+ * specified one, or NULL if not found. -+ */ -+PJ_DECL(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_header(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ void *search_hdr, -+ const pjsip_multipart_part *start); -+ -+/** -+ * Find a body inside multipart bodies which has a header matching the -+ * supplied name and value. Most useful for finding a part with a specific -+ * Content-ID. -+ * -+ * @param pool Memory pool to use for temp space. -+ * @param mp The multipart body. -+ * @param hdr_name Header name to search for. -+ * @param hdr_value Header value search for. -+ * @param start If specified, the search will begin at -+ * start->next part. Otherwise it will begin at -+ * the first part in the multipart bodies. -+ * -+ * @return The first part which has a header matching the -+ * specified one, or NULL if not found. -+ */ -+PJ_DECL(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ const pj_str_t *hdr_name, -+ const pj_str_t *hdr_value, -+ const pjsip_multipart_part *start); -+ -+ -+ -+/** -+ * Find a body inside multipart bodies which has a Content-ID value matching the -+ * supplied "cid" URI in pj_str form. The "cid:" scheme will be assumed if the -+ * URL doesn't start with it. Enclosing angle brackets will also be handled -+ * correctly if they exist. -+ * -+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators -+ * -+ * @param pool Memory pool to use for temp space. -+ * @param mp The multipart body. -+ * @param cid The "cid" URI to search for in pj_str form. -+ * -+ * @return The first part which has a Content-ID header matching the -+ * specified "cid" URI. or NULL if not found. -+ */ -+PJ_DECL(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ pj_str_t *cid); -+ -+/** -+ * Find a body inside multipart bodies which has a Content-ID value matching the -+ * supplied "cid" URI. -+ * -+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators -+ * -+ * @param pool Memory pool to use for temp space. -+ * @param mp The multipart body. -+ * @param cid The "cid" URI to search for. -+ * -+ * @return The first part which had a Content-ID header matching the -+ * specified "cid" URI. or NULL if not found. -+ */ -+PJ_DECL(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ pjsip_other_uri *cid_uri); -+ - /** - * Parse multipart message. - * -diff --git a/pjsip/src/pjsip/sip_multipart.c b/pjsip/src/pjsip/sip_multipart.c -index e7d722d2e..9d8be55b0 100644 ---- a/pjsip/src/pjsip/sip_multipart.c -+++ b/pjsip/src/pjsip/sip_multipart.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -416,6 +417,220 @@ pjsip_multipart_find_part( const pjsip_msg_body *mp, - return NULL; - } - -+/* -+ * Find a body inside multipart bodies which has the header and value. -+ */ -+PJ_DEF(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ const pj_str_t *hdr_name, -+ const pj_str_t *hdr_value, -+ const pjsip_multipart_part *start) -+{ -+ struct multipart_data *m_data; -+ pjsip_multipart_part *part; -+ pjsip_hdr *found_hdr; -+ pj_str_t found_hdr_str; -+ pj_str_t found_hdr_value; -+ pj_size_t expected_hdr_slen; -+ pj_size_t buf_size; -+ int hdr_name_len; -+#define REASONABLE_PADDING 32 -+#define SEPARATOR_LEN 2 -+ /* Must specify mandatory params */ -+ PJ_ASSERT_RETURN(mp && hdr_name && hdr_value, NULL); -+ -+ /* mp must really point to an actual multipart msg body */ -+ PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL); -+ -+ /* -+ * We'll need to "print" each header we find to test it but -+ * allocating a buffer of PJSIP_MAX_URL_SIZE is overkill. -+ * Instead, we'll allocate one large enough to hold the search -+ * header name, the ": " separator, the search hdr value, and -+ * the NULL terminator. If we can't print the found header -+ * into that buffer then it can't be a match. -+ * -+ * Some header print functions such as generic_int require enough -+ * space to print the maximum possible header length so we'll -+ * add a reasonable amount to the print buffer size. -+ */ -+ expected_hdr_slen = hdr_name->slen + SEPARATOR_LEN + hdr_value->slen; -+ buf_size = expected_hdr_slen + REASONABLE_PADDING; -+ found_hdr_str.ptr = pj_pool_alloc(pool, buf_size); -+ found_hdr_str.slen = 0; -+ hdr_name_len = hdr_name->slen + SEPARATOR_LEN; -+ -+ m_data = (struct multipart_data*)mp->data; -+ -+ if (start) -+ part = start->next; -+ else -+ part = m_data->part_head.next; -+ -+ while (part != &m_data->part_head) { -+ found_hdr = NULL; -+ while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, hdr_name, -+ (found_hdr ? found_hdr->next : NULL))) != NULL) { -+ -+ found_hdr_str.slen = pjsip_hdr_print_on((void*) found_hdr, found_hdr_str.ptr, buf_size); -+ /* -+ * If the buffer was too small (slen = -1) or the result wasn't -+ * the same length as the search header, it can't be a match. -+ */ -+ if (found_hdr_str.slen != expected_hdr_slen) { -+ continue; -+ } -+ /* -+ * Set the value overlay to start at the found header value... -+ */ -+ found_hdr_value.ptr = found_hdr_str.ptr + hdr_name_len; -+ found_hdr_value.slen = found_hdr_str.slen - hdr_name_len; -+ /* ...and compare it to the supplied header value. */ -+ if (pj_strcmp(hdr_value, &found_hdr_value) == 0) { -+ return part; -+ } -+ } -+ part = part->next; -+ } -+ return NULL; -+#undef SEPARATOR_LEN -+#undef REASONABLE_PADDING -+} -+ -+PJ_DEF(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_header(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ void *search_for, -+ const pjsip_multipart_part *start) -+{ -+ struct multipart_data *m_data; -+ pjsip_hdr *search_hdr = search_for; -+ pj_str_t search_buf; -+ -+ /* Must specify mandatory params */ -+ PJ_ASSERT_RETURN(mp && search_hdr, NULL); -+ -+ /* mp must really point to an actual multipart msg body */ -+ PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL); -+ -+ /* -+ * Unfortunately, there isn't enough information to determine -+ * the maximum printed size of search_hdr at this point so we -+ * have to allocate a reasonable max. -+ */ -+ search_buf.ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); -+ search_buf.slen = pjsip_hdr_print_on(search_hdr, search_buf.ptr, PJSIP_MAX_URL_SIZE - 1); -+ if (search_buf.slen <= 0) { -+ return NULL; -+ } -+ /* -+ * Set the header value to start after the header name plus the ":", then -+ * strip leading and trailing whitespace. -+ */ -+ search_buf.ptr += (search_hdr->name.slen + 1); -+ search_buf.slen -= (search_hdr->name.slen + 1); -+ pj_strtrim(&search_buf); -+ -+ return pjsip_multipart_find_part_by_header_str(pool, mp, &search_hdr->name, &search_buf, start); -+} -+ -+/* -+ * Convert a Content-ID URI to it's corresponding header value. -+ * RFC2392 says... -+ * A "cid" URL is converted to the corresponding Content-ID message -+ * header by removing the "cid:" prefix, converting the % encoded -+ * character(s) to their equivalent US-ASCII characters, and enclosing -+ * the remaining parts with an angle bracket pair, "<" and ">". -+ * -+ * This implementation will accept URIs with or without the "cid:" -+ * scheme and optional angle brackets. -+ */ -+static pj_str_t cid_uri_to_hdr_value(pj_pool_t *pool, pj_str_t *cid_uri) -+{ -+ pj_size_t cid_len = pj_strlen(cid_uri); -+ pj_size_t alloc_len = cid_len + 2 /* for the leading and trailing angle brackets */; -+ pj_str_t uri_overlay; -+ pj_str_t cid_hdr; -+ pj_str_t hdr_overlay; -+ -+ pj_strassign(&uri_overlay, cid_uri); -+ /* If the URI is already enclosed in angle brackets, remove them. */ -+ if (uri_overlay.ptr[0] == '<') { -+ uri_overlay.ptr++; -+ uri_overlay.slen -= 2; -+ } -+ /* If the URI starts with the "cid:" scheme, skip over it. */ -+ if (pj_strncmp2(&uri_overlay, "cid:", 4) == 0) { -+ uri_overlay.ptr += 4; -+ uri_overlay.slen -= 4; -+ } -+ /* Start building */ -+ cid_hdr.ptr = pj_pool_alloc(pool, alloc_len); -+ cid_hdr.ptr[0] = '<'; -+ cid_hdr.slen = 1; -+ hdr_overlay.ptr = cid_hdr.ptr + 1; -+ hdr_overlay.slen = 0; -+ pj_strcpy_unescape(&hdr_overlay, &uri_overlay); -+ cid_hdr.slen += hdr_overlay.slen; -+ cid_hdr.ptr[cid_hdr.slen] = '>'; -+ cid_hdr.slen++; -+ -+ return cid_hdr; -+} -+ -+PJ_DEF(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ pj_str_t *cid) -+{ -+ struct multipart_data *m_data; -+ pjsip_multipart_part *part; -+ pjsip_generic_string_hdr *found_hdr; -+ pj_str_t found_hdr_value; -+ static pj_str_t hdr_name = { "Content-ID", 10}; -+ pj_str_t hdr_value; -+ -+ PJ_ASSERT_RETURN(pool && mp && cid && (pj_strlen(cid) > 0), NULL); -+ -+ hdr_value = cid_uri_to_hdr_value(pool, cid); -+ if (pj_strlen(&hdr_value) == 0) { -+ return NULL; -+ } -+ -+ m_data = (struct multipart_data*)mp->data; -+ part = m_data->part_head.next; -+ -+ while (part != &m_data->part_head) { -+ found_hdr = NULL; -+ while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, &hdr_name, -+ (found_hdr ? found_hdr->next : NULL))) != NULL) { -+ if (pj_strcmp(&hdr_value, &found_hdr->hvalue) == 0) { -+ return part; -+ } -+ } -+ part = part->next; -+ } -+ return NULL; -+} -+ -+PJ_DEF(pjsip_multipart_part*) -+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool, -+ const pjsip_msg_body *mp, -+ pjsip_other_uri *cid_uri) -+{ -+ PJ_ASSERT_RETURN(pool && mp && cid_uri, NULL); -+ -+ if (pj_strcmp2(&cid_uri->scheme, "cid") != 0) { -+ return NULL; -+ } -+ /* -+ * We only need to pass the URI content so we -+ * can do that directly. -+ */ -+ return pjsip_multipart_find_part_by_cid_str(pool, mp, &cid_uri->content); -+} -+ - /* Parse a multipart part. "pct" is parent content-type */ - static pjsip_multipart_part *parse_multipart_part(pj_pool_t *pool, - char *start, -@@ -584,6 +799,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, - (int)boundary.slen, boundary.ptr)); - } - -+ - /* Build the delimiter: - * delimiter = "--" boundary - */ -@@ -630,6 +846,8 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, - if (*curptr=='\r') ++curptr; - if (*curptr!='\n') { - /* Expecting a newline here */ -+ PJ_LOG(2, (THIS_FILE, "Failed to find newline")); -+ - return NULL; - } - ++curptr; -@@ -645,6 +863,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, - curptr = pj_strstr(&subbody, &delim); - if (!curptr) { - /* We're really expecting end delimiter to be found. */ -+ PJ_LOG(2, (THIS_FILE, "Failed to find end-delimiter")); - return NULL; - } - } -@@ -670,9 +889,13 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, - part = parse_multipart_part(pool, start_body, end_body - start_body, - ctype); - if (part) { -+ TRACE_((THIS_FILE, "Adding part")); - pjsip_multipart_add_part(pool, body, part); -+ } else { -+ PJ_LOG(2, (THIS_FILE, "Failed to add part")); - } - } -+ TRACE_((THIS_FILE, "pjsip_multipart_parse finished: %p", body)); - - return body; - } -diff --git a/pjsip/src/test/multipart_test.c b/pjsip/src/test/multipart_test.c -index 4f16e68bf..97267a290 100644 ---- a/pjsip/src/test/multipart_test.c -+++ b/pjsip/src/test/multipart_test.c -@@ -28,6 +28,7 @@ - typedef pj_status_t (*verify_ptr)(pj_pool_t*,pjsip_msg_body*); - - static pj_status_t verify1(pj_pool_t *pool, pjsip_msg_body *body); -+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body); - - static struct test_t - { -@@ -68,7 +69,41 @@ static struct test_t - "This is epilogue, which should be ignored too", - - &verify1 -+ }, -+ { -+ /* Content-type */ -+ "multipart", "mixed", "12345", -+ -+ /* Body: */ -+ "This is the prolog, which should be ignored.\r\n" -+ "--12345\r\n" -+ "Content-Type: text/plain\r\n" -+ "Content-ID: \r\n" -+ "Content-ID: <\"header1\"@example.org>\r\n" -+ "Content-Length: 13\r\n" -+ "\r\n" -+ "has header1\r\n" -+ "--12345 \t\r\n" -+ "Content-Type: application/pidf+xml\r\n" -+ "Content-ID: \r\n" -+ "Content-ID: \r\n" -+ "Content-Length: 13\r\n" -+ "\r\n" -+ "has header2\r\n" -+ "--12345\r\n" -+ "Content-Type: text/plain\r\n" -+ "Content-ID: \r\n" -+ "Content-ID: \r\n" -+ "Content-ID: \r\n" -+ "Content-Length: 13\r\n" -+ "\r\n" -+ "has header4\r\n" -+ "--12345--\r\n" -+ "This is epilogue, which should be ignored too", -+ -+ &verify2 - } -+ - }; - - static void init_media_type(pjsip_media_type *mt, -@@ -87,6 +122,192 @@ static void init_media_type(pjsip_media_type *mt, - } - } - -+static int verify_hdr(pj_pool_t *pool, pjsip_msg_body *multipart_body, -+ void *hdr, char *part_body) -+{ -+ pjsip_media_type mt; -+ pjsip_multipart_part *part; -+ pj_str_t the_body; -+ -+ -+ part = pjsip_multipart_find_part_by_header(pool, multipart_body, hdr, NULL); -+ if (!part) { -+ return -1; -+ } -+ -+ the_body.ptr = (char*)part->body->data; -+ the_body.slen = part->body->len; -+ -+ if (pj_strcmp2(&the_body, part_body) != 0) { -+ return -2; -+ } -+ -+ return 0; -+} -+ -+static int verify_cid_str(pj_pool_t *pool, pjsip_msg_body *multipart_body, -+ pj_str_t cid_url, char *part_body) -+{ -+ pjsip_media_type mt; -+ pjsip_multipart_part *part; -+ pj_str_t the_body; -+ -+ part = pjsip_multipart_find_part_by_cid_str(pool, multipart_body, &cid_url); -+ if (!part) { -+ return -3; -+ } -+ -+ the_body.ptr = (char*)part->body->data; -+ the_body.slen = part->body->len; -+ -+ if (pj_strcmp2(&the_body, part_body) != 0) { -+ return -4; -+ } -+ -+ return 0; -+} -+ -+static int verify_cid_uri(pj_pool_t *pool, pjsip_msg_body *multipart_body, -+ pjsip_other_uri *cid_uri, char *part_body) -+{ -+ pjsip_media_type mt; -+ pjsip_multipart_part *part; -+ pj_str_t the_body; -+ -+ part = pjsip_multipart_find_part_by_cid_uri(pool, multipart_body, cid_uri); -+ if (!part) { -+ return -5; -+ } -+ -+ the_body.ptr = (char*)part->body->data; -+ the_body.slen = part->body->len; -+ -+ if (pj_strcmp2(&the_body, part_body) != 0) { -+ return -6; -+ } -+ -+ return 0; -+} -+ -+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body) -+{ -+ int rc = 0; -+ int rcbase = 300; -+ pjsip_other_uri *cid_uri; -+ pjsip_ctype_hdr *ctype_hdr = pjsip_ctype_hdr_create(pool); -+ -+ ctype_hdr->media.type = pj_str("application"); -+ ctype_hdr->media.subtype = pj_str("pidf+xml"); -+ -+ rc = verify_hdr(pool, body, ctype_hdr, "has header2"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("cid:header1@example.org"), "has header1"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("%22header1%22@example.org"), "has header1"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "", -+ strlen(""), 0)); -+ rcbase += 10; -+ rc = verify_cid_uri(pool, body, cid_uri, "has header1"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str(""), "has header2"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("cid:my%ffheader2@example.org"), "has header2"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "", -+ strlen(""), 0)); -+ rcbase += 10; -+ rc = verify_cid_uri(pool, body, cid_uri, "has header2"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("cid:my%20header3@example.org"), "has header4"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str(""), "has header4"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "", -+ strlen(""), 0)); -+ rcbase += 10; -+ rc = verify_cid_uri(pool, body, cid_uri, "has header4"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str(""), "has header4"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ /* These should all fail for malformed or missing URI */ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("cid:"), "has header4"); -+ if (!rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str(""), "has header4"); -+ if (!rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("<>"), "has header4"); -+ if (!rc) { -+ return (rc - rcbase); -+ } -+ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str(""), "has header4"); -+ if (!rc) { -+ return (rc - rcbase); -+ } -+ -+ /* -+ * This is going to pass but the ' ' in the uri is un-encoded which is invalid -+ * so we should never see it. -+ */ -+ rcbase += 10; -+ rc = verify_cid_str(pool, body, pj_str("cid:my header3@example.org"), "has header4"); -+ if (rc) { -+ return (rc - rcbase); -+ } -+ -+ return 0; -+} -+ - static int verify_part(pjsip_multipart_part *part, - char *h_content_type, - char *h_content_subtype, -@@ -236,8 +457,10 @@ static int parse_test(void) - - pj_strdup2_with_null(pool, &str, p_tests[i].msg); - body = pjsip_multipart_parse(pool, str.ptr, str.slen, &ctype, 0); -- if (!body) -+ if (!body) { -+ pj_pool_release(pool); - return -100; -+ } - - if (p_tests[i].verify) { - rc = p_tests[i].verify(pool, body); --- -2.34.1 - diff --git a/third-party/pjproject/patches/0170-stun-integer-underflow.patch b/third-party/pjproject/patches/0170-stun-integer-underflow.patch deleted file mode 100644 index 011f8c431a..0000000000 --- a/third-party/pjproject/patches/0170-stun-integer-underflow.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 15663e3f37091069b8c98a7fce680dc04bc8e865 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Tue, 10 Aug 2021 11:53:25 +0800 -Subject: [PATCH] Merge pull request from GHSA-2qpg-f6wf-w984 - ---- - pjnath/src/pjnath/stun_msg.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index cd5870f82..bd83351e6 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -1763,6 +1763,9 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, - /* Get pointer to the string in the message */ - value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); - value.slen = attr->hdr.length - 4; -+ /* Make sure the length is never negative */ -+ if (value.slen < 0) -+ value.slen = 0; - - /* Copy the string to the attribute */ - pj_strdup(pool, &attr->reason, &value); --- -2.25.1 - diff --git a/third-party/pjproject/patches/0171-dialog-set-free.patch b/third-party/pjproject/patches/0171-dialog-set-free.patch deleted file mode 100644 index 50fa505826..0000000000 --- a/third-party/pjproject/patches/0171-dialog-set-free.patch +++ /dev/null @@ -1,114 +0,0 @@ -From db3235953baa56d2fb0e276ca510fefca751643f Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Mon, 21 Feb 2022 06:24:52 +0700 -Subject: [PATCH] Merge pull request from GHSA-ffff-m5fm-qm62 - -* Update pjsip_ua_unregister_dlg(): -- update the hash key if the dialog being unregistered is used as hash key. -- add an assertion check to make sure that the dlg_set to be removed is valid (can be found in the hash table). - -* Change hash key string comparison method. ---- - pjsip/src/pjsip/sip_ua_layer.c | 48 +++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 6 deletions(-) - -diff --git a/pjsip/src/pjsip/sip_ua_layer.c b/pjsip/src/pjsip/sip_ua_layer.c -index 59c2524ba..5d79882a1 100644 ---- a/pjsip/src/pjsip/sip_ua_layer.c -+++ b/pjsip/src/pjsip/sip_ua_layer.c -@@ -65,6 +65,9 @@ struct dlg_set - /* This is the buffer to store this entry in the hash table. */ - pj_hash_entry_buf ht_entry; - -+ /* Entry key in the hash table */ -+ pj_str_t ht_key; -+ - /* List of dialog in this dialog set. */ - struct dlg_set_head dlg_list; - }; -@@ -327,6 +330,7 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua, - * Create the dialog set and add this dialog to it. - */ - dlg_set = alloc_dlgset_node(); -+ dlg_set->ht_key = dlg->local.info->tag; - pj_list_init(&dlg_set->dlg_list); - pj_list_push_back(&dlg_set->dlg_list, dlg); - -@@ -334,8 +338,8 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua, - - /* Register the dialog set in the hash table. */ - pj_hash_set_np_lower(mod_ua.dlg_table, -- dlg->local.info->tag.ptr, -- (unsigned)dlg->local.info->tag.slen, -+ dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, - dlg->local.tag_hval, dlg_set->ht_entry, - dlg_set); - } -@@ -345,14 +349,15 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua, - struct dlg_set *dlg_set; - - dlg_set = alloc_dlgset_node(); -+ dlg_set->ht_key = dlg->local.info->tag; - pj_list_init(&dlg_set->dlg_list); - pj_list_push_back(&dlg_set->dlg_list, dlg); - - dlg->dlg_set = dlg_set; - - pj_hash_set_np_lower(mod_ua.dlg_table, -- dlg->local.info->tag.ptr, -- (unsigned)dlg->local.info->tag.slen, -+ dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, - dlg->local.tag_hval, dlg_set->ht_entry, dlg_set); - } - -@@ -397,12 +402,43 @@ PJ_DEF(pj_status_t) pjsip_ua_unregister_dlg( pjsip_user_agent *ua, - - /* If dialog list is empty, remove the dialog set from the hash table. */ - if (pj_list_empty(&dlg_set->dlg_list)) { -- pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg->local.info->tag.ptr, -- (unsigned)dlg->local.info->tag.slen, -+ -+ /* Verify that the dialog set is valid */ -+ pj_assert(pj_hash_get_lower(mod_ua.dlg_table, dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, -+ &dlg->local.tag_hval) == dlg_set); -+ -+ pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, - dlg->local.tag_hval, NULL); - - /* Return dlg_set to free nodes. */ - pj_list_push_back(&mod_ua.free_dlgset_nodes, dlg_set); -+ } else { -+ /* If the just unregistered dialog is being used as hash key, -+ * reset the dlg_set entry with a new key (i.e: from the first dialog -+ * in dlg_set). -+ */ -+ if (dlg_set->ht_key.ptr == dlg->local.info->tag.ptr && -+ dlg_set->ht_key.slen == dlg->local.info->tag.slen) -+ { -+ pjsip_dialog* key_dlg = dlg_set->dlg_list.next; -+ -+ /* Verify that the old & new keys share the hash value */ -+ pj_assert(key_dlg->local.tag_hval == dlg->local.tag_hval); -+ -+ pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, -+ dlg->local.tag_hval, NULL); -+ -+ dlg_set->ht_key = key_dlg->local.info->tag; -+ -+ pj_hash_set_np_lower(mod_ua.dlg_table, -+ dlg_set->ht_key.ptr, -+ (unsigned)dlg_set->ht_key.slen, -+ key_dlg->local.tag_hval, dlg_set->ht_entry, -+ dlg_set); -+ } - } - - /* Unlock user agent. */ --- -2.25.1 - diff --git a/third-party/pjproject/patches/0172-prevent-multipart-oob.patch b/third-party/pjproject/patches/0172-prevent-multipart-oob.patch deleted file mode 100644 index 2c82035a97..0000000000 --- a/third-party/pjproject/patches/0172-prevent-multipart-oob.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 077b465c33f0aec05a49cd2ca456f9a1b112e896 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Wed, 26 Jan 2022 13:28:57 +0800 -Subject: [PATCH] Merge pull request from GHSA-7fw8-54cv-r7pm - ---- - pjlib-util/src/pjlib-util/scanner.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/pjlib-util/src/pjlib-util/scanner.c b/pjlib-util/src/pjlib-util/scanner.c -index 27a0b8831..a54edf2d8 100644 ---- a/pjlib-util/src/pjlib-util/scanner.c -+++ b/pjlib-util/src/pjlib-util/scanner.c -@@ -444,16 +444,21 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner, - - PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner ) - { -- int chr = *scanner->curptr; -+ register char *s = scanner->curptr; -+ int chr; - -- if (!chr) { -+ if (s >= scanner->end || !*s) { - pj_scan_syntax_err(scanner); - return 0; - } - -- ++scanner->curptr; -+ chr = *s; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) { -+ ++s; -+ scanner->curptr = s; -+ if (PJ_SCAN_CHECK_EOF(s) && PJ_SCAN_IS_PROBABLY_SPACE(*s) && -+ scanner->skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - return chr; --- -2.25.1 - diff --git a/third-party/pjproject/patches/0200-cert-18.9-potential-buffer-overflow-in-pjlib-scanner-and-pjmedia.patch b/third-party/pjproject/patches/0200-cert-18.9-potential-buffer-overflow-in-pjlib-scanner-and-pjmedia.patch deleted file mode 100644 index fa18860392..0000000000 --- a/third-party/pjproject/patches/0200-cert-18.9-potential-buffer-overflow-in-pjlib-scanner-and-pjmedia.patch +++ /dev/null @@ -1,307 +0,0 @@ -From aefc5f83f7de651e3a37e7e1781bfaef46dab9c4 Mon Sep 17 00:00:00 2001 -From: Ben Ford -Date: Wed, 30 Nov 2022 11:28:16 -0600 -Subject: [PATCH] Merge pull request from GHSA-fq45-m3f7-3mhj - -* Initial patch - -* Use 'pj_scan_is_eof(scanner)' - -Co-authored-by: Aaron Lichtman - -* Use 'pj_scan_is_eof(scanner)' - -Co-authored-by: Aaron Lichtman - -* Use 'pj_scan_is_eof(scanner)' - -Co-authored-by: Aaron Lichtman - -* Use `!pj_scan_is_eof` instead of manually checking `scanner->curptr < scanner->end` - -Co-authored-by: Maksim Mukosey - -* Update pjlib-util/src/pjlib-util/scanner.c - -Co-authored-by: Aaron Lichtman - -* Update pjlib-util/src/pjlib-util/scanner.c - -Co-authored-by: Aaron Lichtman - -* Update pjlib-util/src/pjlib-util/scanner.c - -Co-authored-by: Aaron Lichtman - -* Revert '>=' back to '>' in pj_scan_stricmp_alnum() - -* Fix error compiles. - -Co-authered-by: sauwming -Co-authored-by: Nanang Izzuddin -Co-authored-by: Aaron Lichtman -Co-authored-by: Maksim Mukosey ---- - pjlib-util/src/pjlib-util/scanner.c | 41 +++++++++++++++++++---------- - pjmedia/src/pjmedia/rtp.c | 11 +++++--- - pjmedia/src/pjmedia/sdp.c | 24 ++++++++++------- - 3 files changed, 48 insertions(+), 28 deletions(-) - -diff --git a/pjlib-util/src/pjlib-util/scanner.c b/pjlib-util/src/pjlib-util/scanner.c -index c18b74c55..ea27bbec9 100644 ---- a/pjlib-util/src/pjlib-util/scanner.c -+++ b/pjlib-util/src/pjlib-util/scanner.c -@@ -195,7 +195,13 @@ PJ_DEF(void) pj_scan_skip_whitespace( pj_scanner *scanner ) - - PJ_DEF(void) pj_scan_skip_line( pj_scanner *scanner ) - { -- char *s = pj_ansi_strchr(scanner->curptr, '\n'); -+ char *s; -+ -+ if (pj_scan_is_eof(scanner)) { -+ return; -+ } -+ -+ s = pj_memchr(scanner->curptr, '\n', scanner->end - scanner->curptr); - if (!s) { - scanner->curptr = scanner->end; - } else { -@@ -264,8 +270,7 @@ PJ_DEF(void) pj_scan_get( pj_scanner *scanner, - - pj_assert(pj_cis_match(spec,0)==0); - -- /* EOF is detected implicitly */ -- if (!pj_cis_match(spec, *s)) { -+ if (pj_scan_is_eof(scanner) || !pj_cis_match(spec, *s)) { - pj_scan_syntax_err(scanner); - return; - } -@@ -299,8 +304,7 @@ PJ_DEF(void) pj_scan_get_unescape( pj_scanner *scanner, - /* Must not match character '%' */ - pj_assert(pj_cis_match(spec,'%')==0); - -- /* EOF is detected implicitly */ -- if (!pj_cis_match(spec, *s) && *s != '%') { -+ if (pj_scan_is_eof(scanner) || !pj_cis_match(spec, *s) && *s != '%') { - pj_scan_syntax_err(scanner); - return; - } -@@ -436,7 +440,9 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner, - - scanner->curptr += N; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) { -+ if (!pj_scan_is_eof(scanner) && -+ PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - } -@@ -462,15 +468,16 @@ PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner ) - - PJ_DEF(void) pj_scan_get_newline( pj_scanner *scanner ) - { -- if (!PJ_SCAN_IS_NEWLINE(*scanner->curptr)) { -+ if (pj_scan_is_eof(scanner) || !PJ_SCAN_IS_NEWLINE(*scanner->curptr)) { - pj_scan_syntax_err(scanner); - return; - } - -+ /* We have checked scanner->curptr validity above */ - if (*scanner->curptr == '\r') { - ++scanner->curptr; - } -- if (*scanner->curptr == '\n') { -+ if (!pj_scan_is_eof(scanner) && *scanner->curptr == '\n') { - ++scanner->curptr; - } - -@@ -515,7 +522,9 @@ PJ_DEF(void) pj_scan_get_until( pj_scanner *scanner, - - scanner->curptr = s; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*s) && scanner->skip_ws) { -+ if (!pj_scan_is_eof(scanner) && PJ_SCAN_IS_PROBABLY_SPACE(*s) && -+ scanner->skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - } -@@ -539,7 +548,9 @@ PJ_DEF(void) pj_scan_get_until_ch( pj_scanner *scanner, - - scanner->curptr = s; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*s) && scanner->skip_ws) { -+ if (!pj_scan_is_eof(scanner) && PJ_SCAN_IS_PROBABLY_SPACE(*s) && -+ scanner->skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - } -@@ -565,7 +576,9 @@ PJ_DEF(void) pj_scan_get_until_chr( pj_scanner *scanner, - - scanner->curptr = s; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*s) && scanner->skip_ws) { -+ if (!pj_scan_is_eof(scanner) && PJ_SCAN_IS_PROBABLY_SPACE(*s) && -+ scanner->skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - } -@@ -580,7 +593,9 @@ PJ_DEF(void) pj_scan_advance_n( pj_scanner *scanner, - - scanner->curptr += N; - -- if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && skip_ws) { -+ if (!pj_scan_is_eof(scanner) && -+ PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && skip_ws) -+ { - pj_scan_skip_whitespace(scanner); - } - } -@@ -631,5 +646,3 @@ PJ_DEF(void) pj_scan_restore_state( pj_scanner *scanner, - scanner->line = state->line; - scanner->start_line = state->start_line; - } -- -- -diff --git a/pjmedia/src/pjmedia/rtp.c b/pjmedia/src/pjmedia/rtp.c -index 6c571010c..c987cd0ad 100644 ---- a/pjmedia/src/pjmedia/rtp.c -+++ b/pjmedia/src/pjmedia/rtp.c -@@ -183,6 +183,11 @@ PJ_DEF(pj_status_t) pjmedia_rtp_decode_rtp2( - /* Payload is located right after header plus CSRC */ - offset = sizeof(pjmedia_rtp_hdr) + ((*hdr)->cc * sizeof(pj_uint32_t)); - -+ /* Check that offset is less than packet size */ -+ if (offset >= pkt_len) { -+ return PJMEDIA_RTP_EINLEN; -+ } -+ - /* Decode RTP extension. */ - if ((*hdr)->x) { - dec_hdr->ext_hdr = (pjmedia_rtp_ext_hdr*)(((pj_uint8_t*)pkt) + offset); -@@ -195,8 +200,8 @@ PJ_DEF(pj_status_t) pjmedia_rtp_decode_rtp2( - dec_hdr->ext_len = 0; - } - -- /* Check that offset is less than packet size */ -- if (offset > pkt_len) -+ /* Check again that offset is still less than packet size */ -+ if (offset >= pkt_len) - return PJMEDIA_RTP_EINLEN; - - /* Find and set payload. */ -@@ -386,5 +391,3 @@ void pjmedia_rtp_seq_update( pjmedia_rtp_seq_session *sess, - seq_status->status.value = st.status.value; - } - } -- -- -diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c -index c443d863f..f27a1a84f 100644 ---- a/pjmedia/src/pjmedia/sdp.c -+++ b/pjmedia/src/pjmedia/sdp.c -@@ -967,13 +967,13 @@ static void parse_version(pj_scanner *scanner, parse_context *ctx) - ctx->last_error = PJMEDIA_SDP_EINVER; - - /* check equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if (scanner->curptr+1 >= scanner->end || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return; - } - - /* check version is 0 */ -- if (*(scanner->curptr+2) != '0') { -+ if (scanner->curptr+2 >= scanner->end || *(scanner->curptr+2) != '0') { - on_scanner_error(scanner); - return; - } -@@ -990,7 +990,7 @@ static void parse_origin(pj_scanner *scanner, pjmedia_sdp_session *ses, - ctx->last_error = PJMEDIA_SDP_EINORIGIN; - - /* check equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if (scanner->curptr+1 >= scanner->end || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return; - } -@@ -1036,7 +1036,7 @@ static void parse_time(pj_scanner *scanner, pjmedia_sdp_session *ses, - ctx->last_error = PJMEDIA_SDP_EINTIME; - - /* check equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if (scanner->curptr+1 >= scanner->end || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return; - } -@@ -1064,7 +1064,7 @@ static void parse_generic_line(pj_scanner *scanner, pj_str_t *str, - ctx->last_error = PJMEDIA_SDP_EINSDP; - - /* check equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if ((scanner->curptr+1 >= scanner->end) || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return; - } -@@ -1133,7 +1133,7 @@ static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med, - ctx->last_error = PJMEDIA_SDP_EINMEDIA; - - /* check the equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if (scanner->curptr+1 >= scanner->end || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return; - } -@@ -1148,6 +1148,10 @@ static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med, - /* port */ - pj_scan_get(scanner, &cs_token, &str); - med->desc.port = (unsigned short)pj_strtoul(&str); -+ if (pj_scan_is_eof(scanner)) { -+ on_scanner_error(scanner); -+ return; -+ } - if (*scanner->curptr == '/') { - /* port count */ - pj_scan_get_char(scanner); -@@ -1159,7 +1163,7 @@ static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med, - } - - if (pj_scan_get_char(scanner) != ' ') { -- PJ_THROW(SYNTAX_ERROR); -+ on_scanner_error(scanner); - } - - /* transport */ -@@ -1167,7 +1171,7 @@ static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med, - - /* format list */ - med->desc.fmt_count = 0; -- while (*scanner->curptr == ' ') { -+ while (scanner->curptr < scanner->end && *scanner->curptr == ' ') { - pj_str_t fmt; - - pj_scan_get_char(scanner); -@@ -1207,7 +1211,7 @@ static pjmedia_sdp_attr *parse_attr( pj_pool_t *pool, pj_scanner *scanner, - attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); - - /* check equal sign */ -- if (*(scanner->curptr+1) != '=') { -+ if (scanner->curptr+1 >= scanner->end || *(scanner->curptr+1) != '=') { - on_scanner_error(scanner); - return NULL; - } -@@ -1226,7 +1230,7 @@ static pjmedia_sdp_attr *parse_attr( pj_pool_t *pool, pj_scanner *scanner, - pj_scan_get_char(scanner); - - /* get value */ -- if (*scanner->curptr != '\r' && *scanner->curptr != '\n') { -+ if (!pj_scan_is_eof(scanner) && *scanner->curptr != '\r' && *scanner->curptr != '\n') { - pj_scan_get_until_chr(scanner, "\r\n", &attr->value); - } else { - attr->value.ptr = NULL; --- -2.25.1 - diff --git a/third-party/pjproject/patches/0201-potential-stack-buffer-overflow-when-parsing-message-as-a-STUN-client.patch b/third-party/pjproject/patches/0201-potential-stack-buffer-overflow-when-parsing-message-as-a-STUN-client.patch deleted file mode 100644 index 76f02fccf3..0000000000 --- a/third-party/pjproject/patches/0201-potential-stack-buffer-overflow-when-parsing-message-as-a-STUN-client.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Tue, 7 Jun 2022 12:00:13 +0800 -Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj - ---- - pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c -index 722519584..d0549176d 100644 ---- a/pjlib-util/src/pjlib-util/stun_simple.c -+++ b/pjlib-util/src/pjlib-util/stun_simple.c -@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - { - pj_uint16_t msg_type, msg_len; - char *p_attr; -+ int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr); - - PJ_CHECK_STACK(); - -@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - msg->attr_count = 0; - p_attr = (char*)buf + sizeof(pjstun_msg_hdr); - -- while (msg_len > 0) { -+ while (msg_len > 0 && msg->attr_count < attr_max_cnt) { - pjstun_attr_hdr **attr = &msg->attr[msg->attr_count]; - pj_uint32_t len; - pj_uint16_t attr_type; -@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - p_attr += len; - ++msg->attr_count; - } -+ if (msg->attr_count == attr_max_cnt) { -+ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.", -+ attr_max_cnt)); -+ } - - return PJ_SUCCESS; - } --- -2.25.1 - diff --git a/third-party/pjproject/patches/0220-log-dropped-packet-in-debug.patch b/third-party/pjproject/patches/0220-log-dropped-packet-in-debug.patch deleted file mode 100644 index 9bfc5162f9..0000000000 --- a/third-party/pjproject/patches/0220-log-dropped-packet-in-debug.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c -index 4f483faa1..12439e3ee 100644 ---- a/pjsip/src/pjsip/sip_transport.c -+++ b/pjsip/src/pjsip/sip_transport.c -@@ -2071,15 +2071,17 @@ - * which were sent to keep NAT bindings. - */ - if (tmp.slen) { -- PJ_LOG(1, (THIS_FILE, -- "Error processing %d bytes packet from %s %s:%d %.*s:\n" -- "%.*s\n" -- "-- end of packet.", -+ PJ_LOG(2, (THIS_FILE, -+ "Dropping %d bytes packet from %s %s:%d %.*s\n", - msg_fragment_size, - rdata->tp_info.transport->type_name, -- rdata->pkt_info.src_name, -+ rdata->pkt_info.src_name, - rdata->pkt_info.src_port, -- (int)tmp.slen, tmp.ptr, -+ (int)tmp.slen, tmp.ptr)); -+ PJ_LOG(4, (THIS_FILE, -+ "Dropped packet:" -+ "%.*s\n" -+ "-- end of packet.", - (int)msg_fragment_size, - rdata->msg_info.msg_buf)); - } diff --git a/third-party/pjproject/patches/0300-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch b/third-party/pjproject/patches/0300-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch deleted file mode 100644 index 7516514094..0000000000 --- a/third-party/pjproject/patches/0300-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 0731f6ac75f251302b6b135f9534c8a94fe75e62 Mon Sep 17 00:00:00 2001 -From: Nanang Izzuddin -Date: Tue, 20 Dec 2022 11:39:12 +0700 -Subject: [PATCH 300/303] Merge pull request from GHSA-9pfh-r8x4-w26w - -* Fix buffer overread in STUN message decoder - -* Updates based on comments ---- - pjnath/include/pjnath/stun_msg.h | 4 ++++ - pjnath/src/pjnath/stun_msg.c | 32 ++++++++++++++++++++------------ - 2 files changed, 24 insertions(+), 12 deletions(-) - -diff --git a/pjnath/include/pjnath/stun_msg.h b/pjnath/include/pjnath/stun_msg.h -index f4fc5a1e4..c9dd7cf0d 100644 ---- a/pjnath/include/pjnath/stun_msg.h -+++ b/pjnath/include/pjnath/stun_msg.h -@@ -432,20 +432,21 @@ typedef enum pj_stun_status - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - Transaction ID - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_msg_hdr - { - /** - * STUN message type, which the first two bits must be zeroes. - */ - pj_uint16_t type; - - /** - * The message length is the size, in bytes, of the message not - * including the 20 byte STUN header. -@@ -463,53 +464,56 @@ typedef struct pj_stun_msg_hdr - * The transaction ID is a 96 bit identifier. STUN transactions are - * identified by their unique 96-bit transaction ID. For request/ - * response transactions, the transaction ID is chosen by the STUN - * client and MUST be unique for each new STUN transaction generated by - * that STUN client. The transaction ID MUST be uniformly and randomly - * distributed between 0 and 2**96 - 1. - */ - pj_uint8_t tsx_id[12]; - - } pj_stun_msg_hdr; -+#pragma pack() - - - /** - * This structre describes STUN attribute header. Each attribute is - * TLV encoded, with a 16 bit type, 16 bit length, and variable value. - * Each STUN attribute ends on a 32 bit boundary: - * - * \verbatim - - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Type | Length | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - \endverbatim - */ -+#pragma pack(1) - typedef struct pj_stun_attr_hdr - { - /** - * STUN attribute type. - */ - pj_uint16_t type; - - /** - * The Length refers to the length of the actual useful content of the - * Value portion of the attribute, measured in bytes. The value - * in the Length field refers to the length of the Value part of the - * attribute prior to padding - i.e., the useful content. - */ - pj_uint16_t length; - - } pj_stun_attr_hdr; -+#pragma pack() - - - /** - * This structure describes STUN generic IP address attribute, used for - * example to represent STUN MAPPED-ADDRESS attribute. - * - * The generic IP address attribute indicates the transport address. - * It consists of an eight bit address family, and a sixteen bit port, - * followed by a fixed length value representing the IP address. If the - * address family is IPv4, the address is 32 bits, in network byte -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index bd83351e6..fd15230bc 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -739,22 +739,22 @@ PJ_DEF(int) pj_stun_set_padding_char(int chr) - int old_pad = padding_char; - padding_char = chr; - return old_pad; - } - - - ////////////////////////////////////////////////////////////////////////////// - - - #define INIT_ATTR(a,t,l) (a)->hdr.type=(pj_uint16_t)(t), \ -- (a)->hdr.length=(pj_uint16_t)(l) --#define ATTR_HDR_LEN 4 -+ (a)->hdr.length=(pj_uint16_t)(l) -+#define ATTR_HDR_LEN sizeof(pj_stun_attr_hdr) - - static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos) - { - return (pj_uint16_t) ((buf[pos + 0] << 8) | \ - (buf[pos + 1] << 0)); - } - - /*unused PJ_INLINE(pj_uint16_t) GETVAL16N(const pj_uint8_t *buf, unsigned pos) - { - return pj_htons(GETVAL16H(buf,pos)); -@@ -2318,56 +2318,64 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, - PJ_ASSERT_RETURN(pool && pdu && pdu_len && p_msg, PJ_EINVAL); - PJ_ASSERT_RETURN(sizeof(pj_stun_msg_hdr) == 20, PJ_EBUG); - - if (p_parsed_len) - *p_parsed_len = 0; - if (p_response) - *p_response = NULL; - - /* Check if this is a STUN message, if necessary */ - if (options & PJ_STUN_CHECK_PACKET) { -- status = pj_stun_msg_check(pdu, pdu_len, options); -- if (status != PJ_SUCCESS) -- return status; -+ status = pj_stun_msg_check(pdu, pdu_len, options); -+ if (status != PJ_SUCCESS) -+ return status; -+ } else { -+ /* For safety, verify packet length at least */ -+ pj_uint32_t msg_len = GETVAL16H(pdu, 2) + 20; -+ if (msg_len > pdu_len || -+ ((options & PJ_STUN_IS_DATAGRAM) && msg_len != pdu_len)) -+ { -+ return PJNATH_EINSTUNMSGLEN; -+ } - } - - /* Create the message, copy the header, and convert to host byte order */ - msg = PJ_POOL_ZALLOC_T(pool, pj_stun_msg); - pj_memcpy(&msg->hdr, pdu, sizeof(pj_stun_msg_hdr)); - msg->hdr.type = pj_ntohs(msg->hdr.type); - msg->hdr.length = pj_ntohs(msg->hdr.length); - msg->hdr.magic = pj_ntohl(msg->hdr.magic); - - pdu += sizeof(pj_stun_msg_hdr); - /* pdu_len -= sizeof(pj_stun_msg_hdr); */ - pdu_len = msg->hdr.length; - - /* No need to create response if this is not a request */ - if (!PJ_STUN_IS_REQUEST(msg->hdr.type)) - p_response = NULL; - - /* Parse attributes */ -- while (pdu_len >= 4) { -- unsigned attr_type, attr_val_len; -- const struct attr_desc *adesc; -+ while (pdu_len >= ATTR_HDR_LEN) { -+ unsigned attr_type, attr_val_len; -+ const struct attr_desc *adesc; - - /* Get attribute type and length. If length is not aligned - * to 4 bytes boundary, add padding. - */ - attr_type = GETVAL16H(pdu, 0); - attr_val_len = GETVAL16H(pdu, 2); - attr_val_len = (attr_val_len + 3) & (~3); - -- /* Check length */ -- if (pdu_len < attr_val_len) { -- pj_str_t err_msg; -- char err_msg_buf[80]; -+ /* Check length */ -+ if (pdu_len < attr_val_len + ATTR_HDR_LEN) { -+ pj_str_t err_msg; -+ char err_msg_buf[80]; - - err_msg.ptr = err_msg_buf; - err_msg.slen = pj_ansi_snprintf(err_msg_buf, sizeof(err_msg_buf), - "Attribute %s has invalid length", - pj_stun_get_attr_name(attr_type)); - - PJ_LOG(4,(THIS_FILE, "Error decoding message: %.*s", - (int)err_msg.slen, err_msg.ptr)); - - if (p_response) { --- -2.41.0 - diff --git a/third-party/pjproject/patches/0301-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch b/third-party/pjproject/patches/0301-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch deleted file mode 100644 index 44039d0e3b..0000000000 --- a/third-party/pjproject/patches/0301-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 5c50a482986750c83db0dee2963599b8906e6951 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Fri, 23 Dec 2022 15:05:28 +0800 -Subject: [PATCH 301/303] Merge pull request from GHSA-cxwq-5g9x-x7fr - -* Fixed heap buffer overflow when parsing STUN errcode attribute - -* Also fixed uint parsing ---- - pjnath/src/pjnath/stun_msg.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c -index fd15230bc..d3aaae5bf 100644 ---- a/pjnath/src/pjnath/stun_msg.c -+++ b/pjnath/src/pjnath/stun_msg.c -@@ -1432,26 +1432,26 @@ static pj_status_t decode_uint_attr(pj_pool_t *pool, - void **p_attr) - { - pj_stun_uint_attr *attr; - - PJ_UNUSED_ARG(msghdr); - - /* Create the attribute */ - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr); - GETATTRHDR(buf, &attr->hdr); - -- attr->value = GETVAL32H(buf, 4); -- - /* Check that the attribute length is valid */ - if (attr->hdr.length != 4) - return PJNATH_ESTUNINATTRLEN; - -+ attr->value = GETVAL32H(buf, 4); -+ - /* Done */ - *p_attr = attr; - - return PJ_SUCCESS; - } - - - static pj_status_t encode_uint_attr(const void *a, pj_uint8_t *buf, - unsigned len, - const pj_stun_msg_hdr *msghdr, -@@ -1751,28 +1751,29 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool, - { - pj_stun_errcode_attr *attr; - pj_str_t value; - - PJ_UNUSED_ARG(msghdr); - - /* Create the attribute */ - attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr); - GETATTRHDR(buf, &attr->hdr); - -+ /* Check that the attribute length is valid */ -+ if (attr->hdr.length < 4) -+ return PJNATH_ESTUNINATTRLEN; -+ - attr->err_code = buf[6] * 100 + buf[7]; - - /* Get pointer to the string in the message */ - value.ptr = ((char*)buf + ATTR_HDR_LEN + 4); - value.slen = attr->hdr.length - 4; -- /* Make sure the length is never negative */ -- if (value.slen < 0) -- value.slen = 0; - - /* Copy the string to the attribute */ - pj_strdup(pool, &attr->reason, &value); - - /* Done */ - *p_attr = attr; - - return PJ_SUCCESS; - } - --- -2.41.0 - diff --git a/third-party/pjproject/patches/0302-Locking-fix-so-that-SSL_shutdown-and-SSL_write-are-n.patch b/third-party/pjproject/patches/0302-Locking-fix-so-that-SSL_shutdown-and-SSL_write-are-n.patch deleted file mode 100644 index 45ef73b087..0000000000 --- a/third-party/pjproject/patches/0302-Locking-fix-so-that-SSL_shutdown-and-SSL_write-are-n.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 67e62627240b3f925c765cbda63ccbec328fed29 Mon Sep 17 00:00:00 2001 -From: Matthew Fredrickson -Date: Tue, 30 May 2023 04:33:05 -0500 -Subject: [PATCH 302/303] Locking fix so that SSL_shutdown and SSL_write are - not called at same time (#3583) - ---- - pjlib/src/pj/ssl_sock_ossl.c | 82 ++++++++++++++++++++++-------------- - 1 file changed, 51 insertions(+), 31 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c -index 56841f80a..5c68edb2b 100644 ---- a/pjlib/src/pj/ssl_sock_ossl.c -+++ b/pjlib/src/pj/ssl_sock_ossl.c -@@ -1230,44 +1230,58 @@ static void ssl_destroy(pj_ssl_sock_t *ssock) - /* Potentially shutdown OpenSSL library if this is the last - * context exists. - */ - shutdown_openssl(); - } - - - /* Reset SSL socket state */ - static void ssl_reset_sock_state(pj_ssl_sock_t *ssock) - { -+ int post_unlock_flush_circ_buf = 0; -+ - ossl_sock_t *ossock = (ossl_sock_t *)ssock; - -+ /* Must lock around SSL calls, particularly SSL_shutdown -+ * as it can modify the write BIOs and destructively -+ * interfere with any ssl_write() calls in progress -+ * above in a multithreaded environment */ -+ pj_lock_acquire(ssock->write_mutex); -+ - /* Detach from SSL instance */ - if (ossock->ossl_ssl) { - SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL); - } - - /** - * Avoid calling SSL_shutdown() if handshake wasn't completed. - * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an - * SSL handshake, while previous versions always return 0. - */ - if (ossock->ossl_ssl && SSL_in_init(ossock->ossl_ssl) == 0) { -- int ret = SSL_shutdown(ossock->ossl_ssl); -- if (ret == 0) { -- /* Flush data to send close notify. */ -- flush_circ_buf_output(ssock, &ssock->shutdown_op_key, 0, 0); -- } -+ int ret = SSL_shutdown(ossock->ossl_ssl); -+ if (ret == 0) { -+ /* SSL_shutdown will potentially trigger a bunch of -+ * data to dump to the socket */ -+ post_unlock_flush_circ_buf = 1; -+ } - } - -- pj_lock_acquire(ssock->write_mutex); - ssock->ssl_state = SSL_STATE_NULL; -+ - pj_lock_release(ssock->write_mutex); - -+ if (post_unlock_flush_circ_buf) { -+ /* Flush data to send close notify. */ -+ flush_circ_buf_output(ssock, &ssock->shutdown_op_key, 0, 0); -+ } -+ - ssl_close_sockets(ssock); - - /* Upon error, OpenSSL may leave any error description in the thread - * error queue, which sometime may cause next call to SSL API returning - * false error alarm, e.g: in Linux, SSL_CTX_use_certificate_chain_file() - * returning false error after a handshake error (in different SSL_CTX!). - * For now, just clear thread error queue here. - */ - ERR_clear_error(); - } -@@ -1855,52 +1869,58 @@ static pj_status_t ssl_read(pj_ssl_sock_t *ssock, void *data, int *size) - { - ossl_sock_t *ossock = (ossl_sock_t *)ssock; - int size_ = *size; - int len = size_; - - /* SSL_read() may write some data to write buffer when re-negotiation - * is on progress, so let's protect it with write mutex. - */ - pj_lock_acquire(ssock->write_mutex); - *size = size_ = SSL_read(ossock->ossl_ssl, data, size_); -- pj_lock_release(ssock->write_mutex); - - if (size_ <= 0) { - pj_status_t status; - int err = SSL_get_error(ossock->ossl_ssl, size_); - -- /* SSL might just return SSL_ERROR_WANT_READ in -- * re-negotiation. -- */ -- if (err != SSL_ERROR_NONE && err != SSL_ERROR_WANT_READ) { -- if (err == SSL_ERROR_SYSCALL && size_ == -1 && -- ERR_peek_error() == 0 && errno == 0) -- { -- status = STATUS_FROM_SSL_ERR2("Read", ssock, size_, -- err, len); -- PJ_LOG(4,("SSL", "SSL_read() = -1, with " -- "SSL_ERROR_SYSCALL, no SSL error, " -- "and errno = 0 - skip BIO error")); -- /* Ignore these errors */ -- } else { -- /* Reset SSL socket state, then return PJ_FALSE */ -- status = STATUS_FROM_SSL_ERR2("Read", ssock, size_, -- err, len); -- ssl_reset_sock_state(ssock); -- return status; -- } -- } -- -- /* Need renegotiation */ -- return PJ_EEOF; -+ /* SSL might just return SSL_ERROR_WANT_READ in -+ * re-negotiation. -+ */ -+ if (err != SSL_ERROR_NONE && err != SSL_ERROR_WANT_READ) { -+ if (err == SSL_ERROR_SYSCALL && size_ == -1 && -+ ERR_peek_error() == 0 && errno == 0) -+ { -+ status = STATUS_FROM_SSL_ERR2("Read", ssock, size_, -+ err, len); -+ PJ_LOG(4,("SSL", "SSL_read() = -1, with " -+ "SSL_ERROR_SYSCALL, no SSL error, " -+ "and errno = 0 - skip BIO error")); -+ /* Ignore these errors */ -+ } else { -+ /* Reset SSL socket state, then return PJ_FALSE */ -+ status = STATUS_FROM_SSL_ERR2("Read", ssock, size_, -+ err, len); -+ pj_lock_release(ssock->write_mutex); -+ /* Unfortunately we can't hold the lock here to reset all the state. -+ * We probably should though. -+ */ -+ ssl_reset_sock_state(ssock); -+ return status; -+ } -+ } -+ -+ pj_lock_release(ssock->write_mutex); -+ /* Need renegotiation */ -+ return PJ_EEOF; - } - -+ pj_lock_release(ssock->write_mutex); -+ - return PJ_SUCCESS; - } - - - /* Write plain data to SSL and flush write BIO. */ - static pj_status_t ssl_write(pj_ssl_sock_t *ssock, const void *data, - pj_ssize_t size, int *nwritten) - { - ossl_sock_t *ossock = (ossl_sock_t *)ssock; - pj_status_t status = PJ_SUCCESS; --- -2.41.0 - diff --git a/third-party/pjproject/patches/0303-Don-t-call-SSL_shutdown-when-receiving-SSL_ERROR_SYS.patch b/third-party/pjproject/patches/0303-Don-t-call-SSL_shutdown-when-receiving-SSL_ERROR_SYS.patch deleted file mode 100644 index dc52894bc2..0000000000 --- a/third-party/pjproject/patches/0303-Don-t-call-SSL_shutdown-when-receiving-SSL_ERROR_SYS.patch +++ /dev/null @@ -1,123 +0,0 @@ -From a677cd8fb690ed103fed11ab0252b44bd62b0d3e Mon Sep 17 00:00:00 2001 -From: Riza Sulistyo -Date: Wed, 5 Jul 2023 10:38:21 +0700 -Subject: [PATCH 303/303] Don't call SSL_shutdown() when receiving - SSL_ERROR_SYSCALL or SSL_ERROR_SSL (#3577) - ---- - pjlib/src/pj/ssl_sock_imp_common.c | 1 + - pjlib/src/pj/ssl_sock_imp_common.h | 13 +++++++------ - pjlib/src/pj/ssl_sock_ossl.c | 17 ++++++++++++----- - 3 files changed, 20 insertions(+), 11 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c -index 8dbfe175a..2b00a7bcc 100644 ---- a/pjlib/src/pj/ssl_sock_imp_common.c -+++ b/pjlib/src/pj/ssl_sock_imp_common.c -@@ -205,20 +205,21 @@ static void ssl_close_sockets(pj_ssl_sock_t *ssock) - } - - /* When handshake completed: - * - notify application - * - if handshake failed, reset SSL state - * - return PJ_FALSE when SSL socket instance is destroyed by application. - */ - static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock, - pj_status_t status) - { -+ ssock->handshake_status = status; - /* Cancel handshake timer */ - if (ssock->timer.id == TIMER_HANDSHAKE_TIMEOUT) { - pj_timer_heap_cancel(ssock->param.timer_heap, &ssock->timer); - ssock->timer.id = TIMER_NONE; - } - - /* Update certificates info on successful handshake */ - if (status == PJ_SUCCESS) - ssl_update_certs_info(ssock); - -diff --git a/pjlib/src/pj/ssl_sock_imp_common.h b/pjlib/src/pj/ssl_sock_imp_common.h -index 5e2520341..da26f1e04 100644 ---- a/pjlib/src/pj/ssl_sock_imp_common.h -+++ b/pjlib/src/pj/ssl_sock_imp_common.h -@@ -100,26 +100,27 @@ struct pj_ssl_sock_t - * information allocation. Don't use for - * other purposes. */ - pj_ssl_sock_t *parent; - pj_ssl_sock_param param; - pj_ssl_sock_param newsock_param; - pj_ssl_cert_t *cert; - - pj_ssl_cert_info local_cert_info; - pj_ssl_cert_info remote_cert_info; - -- pj_bool_t is_server; -- enum ssl_state ssl_state; -- pj_ioqueue_op_key_t handshake_op_key; -- pj_ioqueue_op_key_t shutdown_op_key; -- pj_timer_entry timer; -- pj_status_t verify_status; -+ pj_bool_t is_server; -+ enum ssl_state ssl_state; -+ pj_ioqueue_op_key_t handshake_op_key; -+ pj_ioqueue_op_key_t shutdown_op_key; -+ pj_timer_entry timer; -+ pj_status_t verify_status; -+ pj_status_t handshake_status; - - unsigned long last_err; - - pj_sock_t sock; - pj_activesock_t *asock; - - pj_sockaddr local_addr; - pj_sockaddr rem_addr; - int addr_len; - -diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c -index 5c68edb2b..9f66a7485 100644 ---- a/pjlib/src/pj/ssl_sock_ossl.c -+++ b/pjlib/src/pj/ssl_sock_ossl.c -@@ -1249,27 +1249,34 @@ static void ssl_reset_sock_state(pj_ssl_sock_t *ssock) - - /* Detach from SSL instance */ - if (ossock->ossl_ssl) { - SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL); - } - - /** - * Avoid calling SSL_shutdown() if handshake wasn't completed. - * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an - * SSL handshake, while previous versions always return 0. -+ * Call SSL_shutdown() when there is a timeout handshake failure or -+ * the last error is not SSL_ERROR_SYSCALL and not SSL_ERROR_SSL. - */ - if (ossock->ossl_ssl && SSL_in_init(ossock->ossl_ssl) == 0) { -- int ret = SSL_shutdown(ossock->ossl_ssl); -- if (ret == 0) { -- /* SSL_shutdown will potentially trigger a bunch of -- * data to dump to the socket */ -- post_unlock_flush_circ_buf = 1; -+ if (ssock->handshake_status == PJ_ETIMEDOUT || -+ (ssock->last_err != SSL_ERROR_SYSCALL && -+ ssock->last_err != SSL_ERROR_SSL)) -+ { -+ int ret = SSL_shutdown(ossock->ossl_ssl); -+ if (ret == 0) { -+ /* SSL_shutdown will potentially trigger a bunch of -+ * data to dump to the socket */ -+ post_unlock_flush_circ_buf = 1; -+ } - } - } - - ssock->ssl_state = SSL_STATE_NULL; - - pj_lock_release(ssock->write_mutex); - - if (post_unlock_flush_circ_buf) { - /* Flush data to send close notify. */ - flush_circ_buf_output(ssock, &ssock->shutdown_op_key, 0, 0); --- -2.41.0 - diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index 5884108f68..41b2bfa0d4 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -75,9 +75,9 @@ #define PJ_ICE_MAX_CHECKS (PJ_ICE_MAX_CAND * PJ_ICE_MAX_CAND) /* Increase limits to allow more formats */ -#define PJMEDIA_MAX_SDP_FMT 64 +#define PJMEDIA_MAX_SDP_FMT 72 #define PJMEDIA_MAX_SDP_BANDW 4 -#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*2 + 4) +#define PJMEDIA_MAX_SDP_ATTR (PJMEDIA_MAX_SDP_FMT*6 + 4) #define PJMEDIA_MAX_SDP_MEDIA 16 /* @@ -87,3 +87,7 @@ */ #define PJSIP_TCP_KEEP_ALIVE_INTERVAL 0 #define PJSIP_TLS_KEEP_ALIVE_INTERVAL 0 + +#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0 +#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0 +#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1 diff --git a/third-party/pjproject/pjproject-2.10.tar.bz2.md5 b/third-party/pjproject/pjproject-2.10.tar.bz2.md5 deleted file mode 100644 index 57261b4df2..0000000000 --- a/third-party/pjproject/pjproject-2.10.tar.bz2.md5 +++ /dev/null @@ -1,2 +0,0 @@ -5d0202f79a7aeb14873c45b0e4c14a70 *pjproject-2.10.zip -4fffc49b461133f0a4143b05a22fb30e pjproject-2.10.tar.bz2 diff --git a/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 b/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 new file mode 100644 index 0000000000..9542ae1f2c --- /dev/null +++ b/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 @@ -0,0 +1 @@ +6b4b34c14d39224d3342d368f5abbad4 pjproject-2.15.1.tar.bz2 diff --git a/third-party/versions.mak b/third-party/versions.mak index 81b2050dbf..035dc04745 100644 --- a/third-party/versions.mak +++ b/third-party/versions.mak @@ -2,5 +2,5 @@ # configure script so it must follow 'shell' # syntax as well as 'make' syntax. JANSSON_VERSION=2.12 -PJPROJECT_VERSION=2.10 +PJPROJECT_VERSION=2.15.1 LIBJWT_VERSION=1.15.3