<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8195">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: Remove chan_h323 leftovers.<br><br>ASTERISK-27670<br><br>Change-Id: I07a8ef8bbd6001e25711fa1bff152eb6c9efa729<br>---<br>D autoconf/ast_check_openh323.m4<br>D autoconf/ast_check_pwlib.m4<br>M configure<br>M configure.ac<br>M contrib/scripts/install_prereq<br>M include/asterisk/autoconfig.h.in<br>M makeopts.in<br>7 files changed, 3 insertions(+), 1,378 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/95/8195/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/autoconf/ast_check_openh323.m4 b/autoconf/ast_check_openh323.m4<br>deleted file mode 100644<br>index 35f8a54..0000000<br>--- a/autoconf/ast_check_openh323.m4<br>+++ /dev/null<br>@@ -1,132 +0,0 @@<br>-AC_DEFUN([AST_CHECK_OPENH323], [<br>-OPENH323_INCDIR=<br>-OPENH323_LIBDIR=<br>-AC_LANG_PUSH([C++])<br>-if test "${OPENH323DIR:-unset}" != "unset" ; then<br>- AC_CHECK_HEADER(${OPENH323DIR}/version.h, HAS_OPENH323=1, )<br>-fi<br>-if test "${HAS_OPENH323:-unset}" = "unset" ; then<br>- AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="${PWLIBDIR}/../openh323"<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}"<br>- AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}", [#include <ptlib.h>])<br>- CPPFLAGS="${saved_cppflags}"<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}"<br>- AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="${HOME}/openh323"<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}"<br>- AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="/usr/local/share/openh323"<br>- OPENH323_INCDIR="/usr/local/include/openh323"<br>- if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then<br>- OPENH323_LIBDIR="/usr/local/lib64"<br>- else<br>- OPENH323_LIBDIR="/usr/local/lib"<br>- fi<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}"<br>- AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="/usr/share/openh323"<br>- OPENH323_INCDIR="/usr/include/openh323"<br>- if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then<br>- OPENH323_LIBDIR="/usr/lib64"<br>- else<br>- OPENH323_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- fi<br>- fi<br>- fi<br>-fi<br>-<br>-if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- if test "${OPENH323_INCDIR:-unset}" = "unset"; then<br>- OPENH323_INCDIR="${OPENH323DIR}/include"<br>- fi<br>- if test "${OPENH323_LIBDIR:-unset}" = "unset"; then<br>- OPENH323_LIBDIR="${OPENH323DIR}/lib"<br>- fi<br>-<br>- OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`"<br>- OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`"<br>- OPENH323DIR="`cd ${OPENH323DIR}; pwd`"<br>-<br>- AC_SUBST([OPENH323DIR])<br>- AC_SUBST([OPENH323_INCDIR])<br>- AC_SUBST([OPENH323_LIBDIR])<br>-fi<br>- AC_LANG_POP([C++])<br>-])<br>-<br>-AC_DEFUN([AST_CHECK_OPENH323_BUILD], [<br>- if test "${HAS_OPENH323:-unset}" != "unset"; then<br>- AC_MSG_CHECKING(OpenH323 build option)<br>- OPENH323_SUFFIX=<br>- prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323"<br>- for pfx in $prefixes; do<br>- #files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`<br>- files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`<br>- if test -z "$files"; then<br>- # check the default location<br>- files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`<br>- fi<br>- libfile=<br>- if test -n "$files"; then<br>- for f in $files; do<br>- if test -f $f -a ! -L $f; then<br>- libfile=`basename $f`<br>- break;<br>- fi<br>- done<br>- fi<br>- if test -n "$libfile"; then<br>- OPENH323_PREFIX=$pfx<br>- break;<br>- fi<br>- done<br>- if test "${libfile:-unset}" != "unset"; then<br>- OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\(@<:@^.@:>@*\)\..*/\1/'"`<br>- fi<br>- case "${OPENH323_SUFFIX}" in<br>- n)<br>- OPENH323_BUILD="notrace";;<br>- r)<br>- OPENH323_BUILD="opt";;<br>- d)<br>- OPENH323_BUILD="debug";;<br>- *)<br>- if test "${OPENH323_PREFIX:-undef}" = "openh323"; then<br>- notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/@<:@A-Z0-9_@:>@*@<:@ @:>@*=@<:@ @:>@*//'"`<br>- if test "x$notrace" = "x"; then<br>- notrace="0"<br>- fi<br>- if test "$notrace" -ne 0; then<br>- OPENH323_BUILD="notrace"<br>- else<br>- OPENH323_BUILD="opt"<br>- fi<br>- OPENH323_LIB="-l${OPENH323_PREFIX}"<br>- else<br>- OPENH323_BUILD="notrace"<br>- fi<br>- ;;<br>- esac<br>- AC_MSG_RESULT(${OPENH323_BUILD})<br>-<br>- AC_SUBST([OPENH323_SUFFIX])<br>- AC_SUBST([OPENH323_BUILD])<br>- fi<br>-])<br>diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4<br>deleted file mode 100644<br>index beaf8db..0000000<br>--- a/autoconf/ast_check_pwlib.m4<br>+++ /dev/null<br>@@ -1,265 +0,0 @@<br>-AC_DEFUN([AST_CHECK_PWLIB_PLATFORM], [<br>-PWLIB_OSTYPE=<br>-case "$host_os" in<br>- linux*) PWLIB_OSTYPE=linux ;<br>- ;;<br>- freebsd* ) PWLIB_OSTYPE=FreeBSD ;<br>- ;;<br>- openbsd* ) PWLIB_OSTYPE=OpenBSD ;<br>- ENDLDLIBS="-lossaudio" ;<br>- ;;<br>- netbsd* ) PWLIB_OSTYPE=NetBSD ;<br>- ENDLDLIBS="-lossaudio" ;<br>- ;;<br>- solaris* | sunos* ) PWLIB_OSTYPE=solaris ;<br>- ;;<br>- darwin* ) PWLIB_OSTYPE=Darwin ;<br>- ;;<br>- beos*) PWLIB_OSTYPE=beos ;<br>- STDCCFLAGS="$STDCCFLAGS -D__BEOS__"<br>- ;;<br>- cygwin*) PWLIB_OSTYPE=cygwin ;<br>- ;;<br>- mingw*) PWLIB_OSTYPE=mingw ;<br>- STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;<br>- ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;<br>- ;;<br>- * ) PWLIB_OSTYPE="$host_os" ;<br>- AC_MSG_WARN("OS $PWLIB_OSTYPE not recognized - proceed with caution!") ;<br>- ;;<br>-esac<br>-<br>-PWLIB_MACHTYPE=<br>-case "$host_cpu" in<br>- x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86<br>- ;;<br>-<br>- x86_64) PWLIB_MACHTYPE=x86_64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;<br>- P_64BIT=1 ;<br>- ;;<br>-<br>- sparc ) PWLIB_MACHTYPE=sparc ;<br>- ;;<br>-<br>- powerpc ) PWLIB_MACHTYPE=ppc ;<br>- ;;<br>-<br>- ppc ) PWLIB_MACHTYPE=ppc ;<br>- ;;<br>-<br>- powerpc64 ) PWLIB_MACHTYPE=ppc64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- ppc64 ) PWLIB_MACHTYPE=ppc64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- ia64) PWLIB_MACHTYPE=ia64 ;<br>- P_64BIT=1 ;<br>- ;;<br>-<br>- s390x) PWLIB_MACHTYPE=s390x ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- s390) PWLIB_MACHTYPE=s390 ;<br>- ;;<br>-<br>- * ) PWLIB_MACHTYPE="$host_cpu";<br>- AC_MSG_WARN("CPU $PWLIB_MACHTYPE not recognized - proceed with caution!") ;;<br>-esac<br>-<br>-PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"<br>-<br>-AC_SUBST([PWLIB_PLATFORM])<br>-])<br>-<br>-AC_DEFUN([AST_CHECK_PWLIB], [<br>-PWLIB_INCDIR=<br>-PWLIB_LIBDIR=<br>-AC_LANG_PUSH([C++])<br>-if test "${PWLIBDIR:-unset}" != "unset" ; then<br>- AC_CHECK_HEADER(${PWLIBDIR}/version.h, HAS_PWLIB=1, )<br>-fi<br>-if test "${HAS_PWLIB:-unset}" = "unset" ; then<br>- if test "${OPENH323DIR:-unset}" != "unset"; then<br>- AC_CHECK_HEADER(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )<br>- fi<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- PWLIBDIR="${OPENH323DIR}/../pwlib"<br>- else<br>- AC_CHECK_HEADER(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- PWLIBDIR="${HOME}/pwlib"<br>- else<br>- AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, )<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make)<br>- PWLIB_INCDIR="/usr/local/include"<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/local/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/local/lib"<br>- fi<br>- fi<br>- PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`<br>- PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"<br>- else<br>- AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, )<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make)<br>- PWLIB_INCDIR="/usr/include"<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`<br>- PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"<br>- fi<br>- fi<br>- fi<br>- fi<br>-fi<br>-<br>-#if test "${HAS_PWLIB:-unset}" = "unset" ; then<br>-# echo "Cannot find pwlib - please install or set PWLIBDIR and try again"<br>-# exit<br>-#fi<br>-<br>-if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- if test "${PWLIBDIR:-unset}" = "unset" ; then<br>- if test "${PTLIB_CONFIG:-unset}" != "unset" ; then<br>- PWLIBDIR=`$PTLIB_CONFIG --prefix`<br>- else<br>- echo "Cannot find ptlib-config - please install and try again"<br>- exit<br>- fi<br>- fi<br>-<br>- if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then<br>- PWLIBDIR="/usr/share/pwlib"<br>- PWLIB_INCDIR="/usr/include"<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then<br>- PWLIBDIR="/usr/local/share/pwlib"<br>- PWLIB_INCDIR="/usr/local/include"<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/local/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/local/lib"<br>- fi<br>- fi<br>-<br>- if test "${PWLIB_INCDIR:-unset}" = "unset"; then<br>- PWLIB_INCDIR="${PWLIBDIR}/include"<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR="${PWLIBDIR}/lib"<br>- fi<br>-<br>- AC_SUBST([PWLIBDIR])<br>- AC_SUBST([PWLIB_INCDIR])<br>- AC_SUBST([PWLIB_LIBDIR])<br>-fi<br>- AC_LANG_POP([C++])<br>-])<br>-<br>-AC_DEFUN([AST_CHECK_PWLIB_VERSION], [<br>- VNAME="m4_default([$7],[$2_VERSION])"<br>-<br>- if test "${HAS_$2:-unset}" != "unset"; then<br>- $2_VERSION=`grep "$VNAME \"" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>- $2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.`<br>- $2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.`<br>- $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`<br>- $2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))<br>- $2_REQ=$(($4*10000+$5*100+$6))<br>- $2_MAX=m4_ifval([$10], [$(($8*10000+$9*100+$10))], [9999999])<br>-<br>- AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)<br>- if test ${$2_VER} -lt ${$2_REQ}; then<br>- AC_MSG_RESULT(no)<br>- unset HAS_$2<br>- else<br>- if test ${$2_VER} -gt ${$2_MAX}; then<br>- AC_MSG_RESULT(no)<br>- unset HAS_$2<br>- else<br>- AC_MSG_RESULT(yes)<br>- fi<br>- fi<br>- fi<br>-])<br>-<br>-AC_DEFUN([AST_CHECK_PWLIB_BUILD], [<br>- if test "${HAS_$2:-unset}" != "unset"; then<br>- AC_MSG_CHECKING($1 installation validity)<br>-<br>- saved_cppflags="${CPPFLAGS}"<br>- saved_libs="${LIBS}"<br>- if test "${$2_LIB:-unset}" != "unset"; then<br>- LIBS="${LIBS} ${$2_LIB} $7"<br>- else<br>- LIBS="${LIBS} -L${$2_LIBDIR} -l${PLATFORM_$2} $7"<br>- fi<br>- CPPFLAGS="${CPPFLAGS} -I${$2_INCDIR} $6"<br>-<br>- AC_LANG_PUSH([C++])<br>-<br>- AC_LINK_IFELSE(<br>- [AC_LANG_PROGRAM([$4],[$5])],<br>- [ AC_MSG_RESULT(yes)<br>- ac_cv_lib_$2="yes"<br>- ],<br>- [ AC_MSG_RESULT(no)<br>- ac_cv_lib_$2="no"<br>- ]<br>- )<br>-<br>- AC_LANG_POP([C++])<br>-<br>- LIBS="${saved_libs}"<br>- CPPFLAGS="${saved_cppflags}"<br>-<br>- if test "${ac_cv_lib_$2}" = "yes"; then<br>- if test "${$2_LIB:-undef}" = "undef"; then<br>- if test "${$2_LIBDIR}" != "" -a "${$2_LIBDIR}" != "/usr/lib"; then<br>- $2_LIB="-L${$2_LIBDIR} -l${PLATFORM_$2}"<br>- else<br>- $2_LIB="-l${PLATFORM_$2}"<br>- fi<br>- fi<br>- if test "${$2_INCDIR}" != "" -a "${$2_INCDIR}" != "/usr/include"; then<br>- $2_INCLUDE="-I${$2_INCDIR}"<br>- fi<br>- PBX_$2=1<br>- AC_DEFINE([HAVE_$2], 1, [$3])<br>- fi<br>- fi<br>-])<br>diff --git a/configure b/configure<br>index 63d4db0..3b1f668 100755<br>--- a/configure<br>+++ b/configure<br>@@ -657,16 +657,6 @@<br> GMIME_CFLAGS<br> PBX_SSL_OP_NO_TLSV1_2<br> PBX_SSL_OP_NO_TLSV1_1<br>-OPENH323_BUILD<br>-OPENH323_SUFFIX<br>-OPENH323_LIBDIR<br>-OPENH323_INCDIR<br>-OPENH323DIR<br>-PWLIB_PLATFORM<br>-PWLIB_LIBDIR<br>-PWLIB_INCDIR<br>-PWLIBDIR<br>-PTLIB_CONFIG<br> PYTHONDEV_LIBS<br> PYTHONDEV_CFLAGS<br> PYTHONDEV_INCLUDE<br>@@ -851,10 +841,6 @@<br> RADIUS_DIR<br> RADIUS_INCLUDE<br> RADIUS_LIB<br>-PBX_PWLIB<br>-PWLIB_DIR<br>-PWLIB_INCLUDE<br>-PWLIB_LIB<br> PBX_PRI_REVERSE_CHARGE<br> PRI_REVERSE_CHARGE_DIR<br> PRI_REVERSE_CHARGE_INCLUDE<br>@@ -1135,10 +1121,6 @@<br> HOARD_DIR<br> HOARD_INCLUDE<br> HOARD_LIB<br>-PBX_OPENH323<br>-OPENH323_DIR<br>-OPENH323_INCLUDE<br>-OPENH323_LIB<br> PBX_GMIME<br> GMIME_DIR<br> GMIME_INCLUDE<br>@@ -1404,7 +1386,6 @@<br> with_ilbc<br> with_gtk2<br> with_gmime<br>-with_h323<br> with_hoard<br> with_ical<br> with_iconv<br>@@ -1443,7 +1424,6 @@<br> with_popt<br> with_portaudio<br> with_pri<br>-with_pwlib<br> with_radius<br> with_fftw3<br> with_resample<br>@@ -2159,7 +2139,6 @@<br> otherwise<br> --with-gtk2=PATH use gtk2 files in PATH<br> --with-gmime=PATH use GMime files in PATH<br>- --with-h323=PATH use OpenH323 files in PATH<br> --with-hoard=PATH use Hoard Memory Allocator files in PATH<br> --with-ical=PATH use iCal files in PATH<br> --with-iconv=PATH use Iconv files in PATH<br>@@ -2200,7 +2179,6 @@<br> --with-popt=PATH use popt files in PATH<br> --with-portaudio=PATH use PortAudio files in PATH<br> --with-pri=PATH use ISDN PRI files in PATH<br>- --with-pwlib=PATH use PWlib files in PATH<br> --with-radius=PATH use Radius Client files in PATH<br> --with-fftw3=PATH use LIBFFTW3 files in PATH<br> --with-resample=PATH use LIBRESAMPLE files in PATH<br>@@ -3075,97 +3053,6 @@<br> <br> } # ac_fn_c_compute_int<br> <br>-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES<br>-# ---------------------------------------------------------<br>-# Tests whether HEADER exists, giving a warning if it cannot be compiled using<br>-# the include files in INCLUDES and setting the cache variable VAR<br>-# accordingly.<br>-ac_fn_cxx_check_header_mongrel ()<br>-{<br>- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack<br>- if eval \${$3+:} false; then :<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5<br>-$as_echo_n "checking for $2... " >&6; }<br>-if eval \${$3+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-fi<br>-eval ac_res=\$$3<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5<br>-$as_echo "$ac_res" >&6; }<br>-else<br>- # Is the header compilable?<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5<br>-$as_echo_n "checking $2 usability... " >&6; }<br>-cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-$4<br>-#include <$2><br>-_ACEOF<br>-if ac_fn_cxx_try_compile "$LINENO"; then :<br>- ac_header_compiler=yes<br>-else<br>- ac_header_compiler=no<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5<br>-$as_echo "$ac_header_compiler" >&6; }<br>-<br>-# Is the header present?<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5<br>-$as_echo_n "checking $2 presence... " >&6; }<br>-cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-#include <$2><br>-_ACEOF<br>-if ac_fn_cxx_try_cpp "$LINENO"; then :<br>- ac_header_preproc=yes<br>-else<br>- ac_header_preproc=no<br>-fi<br>-rm -f conftest.err conftest.i conftest.$ac_ext<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5<br>-$as_echo "$ac_header_preproc" >&6; }<br>-<br>-# So? What about this header?<br>-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((<br>- yes:no: )<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5<br>-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5<br>-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}<br>- ;;<br>- no:yes:* )<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5<br>-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5<br>-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5<br>-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5<br>-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5<br>-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}<br>-( $as_echo "## ------------------------------------------ ##<br>-## Report this to https://issues.asterisk.org ##<br>-## ------------------------------------------ ##"<br>- ) | sed "s/^/$as_me: WARNING: /" >&2<br>- ;;<br>-esac<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5<br>-$as_echo_n "checking for $2... " >&6; }<br>-if eval \${$3+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- eval "$3=\$ac_header_compiler"<br>-fi<br>-eval ac_res=\$$3<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5<br>-$as_echo "$ac_res" >&6; }<br>-fi<br>- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno<br>-<br>-} # ac_fn_cxx_check_header_mongrel<br>-<br> # ac_fn_cxx_try_link LINENO<br> # -------------------------<br> # Try to link conftest.$ac_ext, and return whether this succeeded.<br>@@ -3211,37 +3098,6 @@<br> as_fn_set_status $ac_retval<br> <br> } # ac_fn_cxx_try_link<br>-<br>-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES<br>-# ---------------------------------------------------------<br>-# Tests whether HEADER exists and can be compiled using the include files in<br>-# INCLUDES, setting the cache variable VAR accordingly.<br>-ac_fn_cxx_check_header_compile ()<br>-{<br>- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5<br>-$as_echo_n "checking for $2... " >&6; }<br>-if eval \${$3+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-$4<br>-#include <$2><br>-_ACEOF<br>-if ac_fn_cxx_try_compile "$LINENO"; then :<br>- eval "$3=yes"<br>-else<br>- eval "$3=no"<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext<br>-fi<br>-eval ac_res=\$$3<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5<br>-$as_echo "$ac_res" >&6; }<br>- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno<br>-<br>-} # ac_fn_cxx_check_header_compile<br> cat >config.log <<_ACEOF<br> This file contains any messages produced by compilers while<br> running configure, to aid debugging if configure makes a mistake.<br>@@ -10006,38 +9862,6 @@<br> <br> <br> <br>- OPENH323_DESCRIP="OpenH323"<br>- OPENH323_OPTION="h323"<br>- PBX_OPENH323=0<br>-<br>-# Check whether --with-h323 was given.<br>-if test "${with_h323+set}" = set; then :<br>- withval=$with_h323;<br>- case ${withval} in<br>- n|no)<br>- USE_OPENH323=no<br>- # -1 is a magic value used by menuselect to know that the package<br>- # was disabled, other than 'not found'<br>- PBX_OPENH323=-1<br>- ;;<br>- y|ye|yes)<br>- ac_mandatory_list="${ac_mandatory_list} OPENH323"<br>- ;;<br>- *)<br>- OPENH323_DIR="${withval}"<br>- ac_mandatory_list="${ac_mandatory_list} OPENH323"<br>- ;;<br>- esac<br>-<br>-fi<br>-<br>-<br>-<br>-<br>-<br>-<br>-<br>-<br> HOARD_DESCRIP="Hoard Memory Allocator"<br> HOARD_OPTION="hoard"<br> PBX_HOARD=0<br>@@ -12012,38 +11836,6 @@<br> <br> <br> # ------------------------------------^<br>-<br>- PWLIB_DESCRIP="PWlib"<br>- PWLIB_OPTION="pwlib"<br>- PBX_PWLIB=0<br>-<br>-# Check whether --with-pwlib was given.<br>-if test "${with_pwlib+set}" = set; then :<br>- withval=$with_pwlib;<br>- case ${withval} in<br>- n|no)<br>- USE_PWLIB=no<br>- # -1 is a magic value used by menuselect to know that the package<br>- # was disabled, other than 'not found'<br>- PBX_PWLIB=-1<br>- ;;<br>- y|ye|yes)<br>- ac_mandatory_list="${ac_mandatory_list} PWLIB"<br>- ;;<br>- *)<br>- PWLIB_DIR="${withval}"<br>- ac_mandatory_list="${ac_mandatory_list} PWLIB"<br>- ;;<br>- esac<br>-<br>-fi<br>-<br>-<br>-<br>-<br>-<br>-<br>-<br> <br> RADIUS_DESCRIP="Radius Client"<br> RADIUS_OPTION="radius"<br>@@ -29364,730 +29156,6 @@<br> <br> <br> <br>-if test "${USE_PWLIB}" != "no"; then<br>- if test -n "${PWLIB_DIR}"; then<br>- PWLIBDIR="${PWLIB_DIR}"<br>- fi<br>-<br>-<br>-<br>-PWLIB_INCDIR=<br>-PWLIB_LIBDIR=<br>-ac_ext=cpp<br>-ac_cpp='$CXXCPP $CPPFLAGS'<br>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu<br>-<br>-if test "${PWLIBDIR:-unset}" != "unset" ; then<br>- as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/version.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/version.h" "$as_ac_Header" "$ac_includes_default"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- HAS_PWLIB=1<br>-fi<br>-<br>-<br>-fi<br>-if test "${HAS_PWLIB:-unset}" = "unset" ; then<br>- if test "${OPENH323DIR:-unset}" != "unset"; then<br>- as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/../pwlib/version.h" "$as_ac_Header" "$ac_includes_default"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- HAS_PWLIB=1<br>-fi<br>-<br>-<br>- fi<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- PWLIBDIR="${OPENH323DIR}/../pwlib"<br>- else<br>- as_ac_Header=`$as_echo "ac_cv_header_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_mongrel "$LINENO" "${HOME}/pwlib/include/ptlib.h" "$as_ac_Header" "$ac_includes_default"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- HAS_PWLIB=1<br>-fi<br>-<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- PWLIBDIR="${HOME}/pwlib"<br>- else<br>- ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/local/include/ptlib.h" "ac_cv_header__usr_local_include_ptlib_h" "$ac_includes_default"<br>-if test "x$ac_cv_header__usr_local_include_ptlib_h" = xyes; then :<br>- HAS_PWLIB=1<br>-fi<br>-<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- # Extract the first word of "ptlib-config", so it can be a program name with args.<br>-set dummy ptlib-config; ac_word=$2<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5<br>-$as_echo_n "checking for $ac_word... " >&6; }<br>-if ${ac_cv_path_PTLIB_CONFIG+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- case $PTLIB_CONFIG in<br>- [\\/]* | ?:[\\/]*)<br>- ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.<br>- ;;<br>- *)<br>- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR<br>-for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make<br>-do<br>- IFS=$as_save_IFS<br>- test -z "$as_dir" && as_dir=.<br>- for ac_exec_ext in '' $ac_executable_extensions; do<br>- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then<br>- ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"<br>- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5<br>- break 2<br>- fi<br>-done<br>- done<br>-IFS=$as_save_IFS<br>-<br>- ;;<br>-esac<br>-fi<br>-PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG<br>-if test -n "$PTLIB_CONFIG"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5<br>-$as_echo "$PTLIB_CONFIG" >&6; }<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-fi<br>-<br>-<br>- PWLIB_INCDIR="/usr/local/include"<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/local/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/local/lib"<br>- fi<br>- fi<br>- PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`<br>- PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"<br>- else<br>- ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/include/ptlib.h" "ac_cv_header__usr_include_ptlib_h" "$ac_includes_default"<br>-if test "x$ac_cv_header__usr_include_ptlib_h" = xyes; then :<br>- HAS_PWLIB=1<br>-fi<br>-<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- # Extract the first word of "ptlib-config", so it can be a program name with args.<br>-set dummy ptlib-config; ac_word=$2<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5<br>-$as_echo_n "checking for $ac_word... " >&6; }<br>-if ${ac_cv_path_PTLIB_CONFIG+:} false; then :<br>- $as_echo_n "(cached) " >&6<br>-else<br>- case $PTLIB_CONFIG in<br>- [\\/]* | ?:[\\/]*)<br>- ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.<br>- ;;<br>- *)<br>- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR<br>-for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make<br>-do<br>- IFS=$as_save_IFS<br>- test -z "$as_dir" && as_dir=.<br>- for ac_exec_ext in '' $ac_executable_extensions; do<br>- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then<br>- ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"<br>- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5<br>- break 2<br>- fi<br>-done<br>- done<br>-IFS=$as_save_IFS<br>-<br>- ;;<br>-esac<br>-fi<br>-PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG<br>-if test -n "$PTLIB_CONFIG"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5<br>-$as_echo "$PTLIB_CONFIG" >&6; }<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-fi<br>-<br>-<br>- PWLIB_INCDIR="/usr/include"<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`<br>- PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"<br>- fi<br>- fi<br>- fi<br>- fi<br>-fi<br>-<br>-#if test "${HAS_PWLIB:-unset}" = "unset" ; then<br>-# echo "Cannot find pwlib - please install or set PWLIBDIR and try again"<br>-# exit<br>-#fi<br>-<br>-if test "${HAS_PWLIB:-unset}" != "unset" ; then<br>- if test "${PWLIBDIR:-unset}" = "unset" ; then<br>- if test "${PTLIB_CONFIG:-unset}" != "unset" ; then<br>- PWLIBDIR=`$PTLIB_CONFIG --prefix`<br>- else<br>- echo "Cannot find ptlib-config - please install and try again"<br>- exit<br>- fi<br>- fi<br>-<br>- if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then<br>- PWLIBDIR="/usr/share/pwlib"<br>- PWLIB_INCDIR="/usr/include"<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then<br>- PWLIBDIR="/usr/local/share/pwlib"<br>- PWLIB_INCDIR="/usr/local/include"<br>- if test "x$LIB64" != "x"; then<br>- PWLIB_LIBDIR="/usr/local/lib64"<br>- else<br>- PWLIB_LIBDIR="/usr/local/lib"<br>- fi<br>- fi<br>-<br>- if test "${PWLIB_INCDIR:-unset}" = "unset"; then<br>- PWLIB_INCDIR="${PWLIBDIR}/include"<br>- fi<br>- if test "${PWLIB_LIBDIR:-unset}" = "unset"; then<br>- PWLIB_LIBDIR="${PWLIBDIR}/lib"<br>- fi<br>-<br>-<br>-<br>-<br>-fi<br>- ac_ext=c<br>-ac_cpp='$CPP $CPPFLAGS'<br>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_c_compiler_gnu<br>-<br>-<br>-<br>- VNAME="P[WT]LIB_VERSION"<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset"; then<br>- PWLIB_VERSION=`grep "$VNAME \"" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>- PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.`<br>- PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.`<br>- PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.`<br>- PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}))<br>- PWLIB_REQ=$((1*10000+9*100+2))<br>- PWLIB_MAX=9999999<br>-<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5<br>-$as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; }<br>- if test ${PWLIB_VER} -lt ${PWLIB_REQ}; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- unset HAS_PWLIB<br>- else<br>- if test ${PWLIB_VER} -gt ${PWLIB_MAX}; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- unset HAS_PWLIB<br>- else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- fi<br>- fi<br>- fi<br>-<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset"; then<br>-<br>-PWLIB_OSTYPE=<br>-case "$host_os" in<br>- linux*) PWLIB_OSTYPE=linux ;<br>- ;;<br>- freebsd* ) PWLIB_OSTYPE=FreeBSD ;<br>- ;;<br>- openbsd* ) PWLIB_OSTYPE=OpenBSD ;<br>- ENDLDLIBS="-lossaudio" ;<br>- ;;<br>- netbsd* ) PWLIB_OSTYPE=NetBSD ;<br>- ENDLDLIBS="-lossaudio" ;<br>- ;;<br>- solaris* | sunos* ) PWLIB_OSTYPE=solaris ;<br>- ;;<br>- darwin* ) PWLIB_OSTYPE=Darwin ;<br>- ;;<br>- beos*) PWLIB_OSTYPE=beos ;<br>- STDCCFLAGS="$STDCCFLAGS -D__BEOS__"<br>- ;;<br>- cygwin*) PWLIB_OSTYPE=cygwin ;<br>- ;;<br>- mingw*) PWLIB_OSTYPE=mingw ;<br>- STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;<br>- ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;<br>- ;;<br>- * ) PWLIB_OSTYPE="$host_os" ;<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&5<br>-$as_echo "$as_me: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&2;} ;<br>- ;;<br>-esac<br>-<br>-PWLIB_MACHTYPE=<br>-case "$host_cpu" in<br>- x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86<br>- ;;<br>-<br>- x86_64) PWLIB_MACHTYPE=x86_64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;<br>- P_64BIT=1 ;<br>- ;;<br>-<br>- sparc ) PWLIB_MACHTYPE=sparc ;<br>- ;;<br>-<br>- powerpc ) PWLIB_MACHTYPE=ppc ;<br>- ;;<br>-<br>- ppc ) PWLIB_MACHTYPE=ppc ;<br>- ;;<br>-<br>- powerpc64 ) PWLIB_MACHTYPE=ppc64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- ppc64 ) PWLIB_MACHTYPE=ppc64 ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- ia64) PWLIB_MACHTYPE=ia64 ;<br>- P_64BIT=1 ;<br>- ;;<br>-<br>- s390x) PWLIB_MACHTYPE=s390x ;<br>- P_64BIT=1 ;<br>- LIB64=1 ;<br>- ;;<br>-<br>- s390) PWLIB_MACHTYPE=s390 ;<br>- ;;<br>-<br>- * ) PWLIB_MACHTYPE="$host_cpu";<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&5<br>-$as_echo "$as_me: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&2;} ;;<br>-esac<br>-<br>-PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"<br>-<br>-<br>-<br>-<br>- PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"<br>-<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking PWLib installation validity" >&5<br>-$as_echo_n "checking PWLib installation validity... " >&6; }<br>-<br>- saved_cppflags="${CPPFLAGS}"<br>- saved_libs="${LIBS}"<br>- if test "${PWLIB_LIB:-unset}" != "unset"; then<br>- LIBS="${LIBS} ${PWLIB_LIB} "<br>- else<br>- LIBS="${LIBS} -L${PWLIB_LIBDIR} -l${PLATFORM_PWLIB} "<br>- fi<br>- CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR} "<br>-<br>- ac_ext=cpp<br>-ac_cpp='$CXXCPP $CPPFLAGS'<br>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu<br>-<br>-<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-#include "ptlib.h"<br>-int<br>-main ()<br>-{<br>-int q = (int) PTime::IsDaylightSavings();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_cxx_try_link "$LINENO"; then :<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- ac_cv_lib_PWLIB="yes"<br>-<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- ac_cv_lib_PWLIB="no"<br>-<br>-<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext \<br>- conftest$ac_exeext conftest.$ac_ext<br>-<br>- ac_ext=c<br>-ac_cpp='$CPP $CPPFLAGS'<br>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_c_compiler_gnu<br>-<br>-<br>- LIBS="${saved_libs}"<br>- CPPFLAGS="${saved_cppflags}"<br>-<br>- if test "${ac_cv_lib_PWLIB}" = "yes"; then<br>- if test "${PWLIB_LIB:-undef}" = "undef"; then<br>- if test "${PWLIB_LIBDIR}" != "" -a "${PWLIB_LIBDIR}" != "/usr/lib"; then<br>- PWLIB_LIB="-L${PWLIB_LIBDIR} -l${PLATFORM_PWLIB}"<br>- else<br>- PWLIB_LIB="-l${PLATFORM_PWLIB}"<br>- fi<br>- fi<br>- if test "${PWLIB_INCDIR}" != "" -a "${PWLIB_INCDIR}" != "/usr/include"; then<br>- PWLIB_INCLUDE="-I${PWLIB_INCDIR}"<br>- fi<br>- PBX_PWLIB=1<br>-<br>-$as_echo "#define HAVE_PWLIB 1" >>confdefs.h<br>-<br>- fi<br>- fi<br>-<br>- fi<br>-fi<br>-<br>-if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then<br>- if test -n "${OPENH323_DIR}"; then<br>- OPENH323DIR="${OPENH323_DIR}"<br>- fi<br>-<br>-OPENH323_INCDIR=<br>-OPENH323_LIBDIR=<br>-ac_ext=cpp<br>-ac_cpp='$CXXCPP $CPPFLAGS'<br>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu<br>-<br>-if test "${OPENH323DIR:-unset}" != "unset" ; then<br>- as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/version.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/version.h" "$as_ac_Header" "$ac_includes_default"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- HAS_OPENH323=1<br>-fi<br>-<br>-<br>-fi<br>-if test "${HAS_OPENH323:-unset}" = "unset" ; then<br>- as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/../openh323/version.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/../openh323/version.h" "$as_ac_Header" "$ac_includes_default"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1<br>-fi<br>-<br>-<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="${PWLIBDIR}/../openh323"<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}"<br>- as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/include/h323.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_compile "$LINENO" "${OPENH323DIR}/include/h323.h" "$as_ac_Header" "#include <ptlib.h><br>-"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>-<br>-else<br>- OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}"<br>-fi<br>-<br>-<br>- CPPFLAGS="${saved_cppflags}"<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}"<br>- as_ac_Header=`$as_echo "ac_cv_header_${HOME}/openh323/include/h323.h" | $as_tr_sh`<br>-ac_fn_cxx_check_header_compile "$LINENO" "${HOME}/openh323/include/h323.h" "$as_ac_Header" "#include <ptlib.h><br>-"<br>-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :<br>- HAS_OPENH323=1<br>-fi<br>-<br>-<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="${HOME}/openh323"<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}"<br>- ac_fn_cxx_check_header_compile "$LINENO" "/usr/local/include/openh323/h323.h" "ac_cv_header__usr_local_include_openh323_h323_h" "#include <ptlib.h><br>-"<br>-if test "x$ac_cv_header__usr_local_include_openh323_h323_h" = xyes; then :<br>- HAS_OPENH323=1<br>-fi<br>-<br>-<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="/usr/local/share/openh323"<br>- OPENH323_INCDIR="/usr/local/include/openh323"<br>- if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then<br>- OPENH323_LIBDIR="/usr/local/lib64"<br>- else<br>- OPENH323_LIBDIR="/usr/local/lib"<br>- fi<br>- else<br>- saved_cppflags="${CPPFLAGS}"<br>- CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}"<br>- ac_fn_cxx_check_header_compile "$LINENO" "/usr/include/openh323/h323.h" "ac_cv_header__usr_include_openh323_h323_h" "#include <ptlib.h><br>-"<br>-if test "x$ac_cv_header__usr_include_openh323_h323_h" = xyes; then :<br>- HAS_OPENH323=1<br>-fi<br>-<br>-<br>- CPPFLAGS="${saved_cppflags}"<br>- if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- OPENH323DIR="/usr/share/openh323"<br>- OPENH323_INCDIR="/usr/include/openh323"<br>- if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then<br>- OPENH323_LIBDIR="/usr/lib64"<br>- else<br>- OPENH323_LIBDIR="/usr/lib"<br>- fi<br>- fi<br>- fi<br>- fi<br>- fi<br>-fi<br>-<br>-if test "${HAS_OPENH323:-unset}" != "unset" ; then<br>- if test "${OPENH323_INCDIR:-unset}" = "unset"; then<br>- OPENH323_INCDIR="${OPENH323DIR}/include"<br>- fi<br>- if test "${OPENH323_LIBDIR:-unset}" = "unset"; then<br>- OPENH323_LIBDIR="${OPENH323DIR}/lib"<br>- fi<br>-<br>- OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`"<br>- OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`"<br>- OPENH323DIR="`cd ${OPENH323DIR}; pwd`"<br>-<br>-<br>-<br>-<br>-fi<br>- ac_ext=c<br>-ac_cpp='$CPP $CPPFLAGS'<br>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_c_compiler_gnu<br>-<br>-<br>-<br>- VNAME="OPENH323_VERSION"<br>-<br>- if test "${HAS_OPENH323:-unset}" != "unset"; then<br>- OPENH323_VERSION=`grep "$VNAME \"" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`<br>- OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.`<br>- OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.`<br>- OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.`<br>- OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}))<br>- OPENH323_REQ=$((1*10000+17*100+3))<br>- OPENH323_MAX=$((1*10000+19*100+0))<br>-<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5<br>-$as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; }<br>- if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- unset HAS_OPENH323<br>- else<br>- if test ${OPENH323_VER} -gt ${OPENH323_MAX}; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- unset HAS_OPENH323<br>- else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- fi<br>- fi<br>- fi<br>-<br>-<br>- if test "${HAS_OPENH323:-unset}" != "unset"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 build option" >&5<br>-$as_echo_n "checking OpenH323 build option... " >&6; }<br>- OPENH323_SUFFIX=<br>- prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323"<br>- for pfx in $prefixes; do<br>- #files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`<br>- files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`<br>- if test -z "$files"; then<br>- # check the default location<br>- files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`<br>- fi<br>- libfile=<br>- if test -n "$files"; then<br>- for f in $files; do<br>- if test -f $f -a ! -L $f; then<br>- libfile=`basename $f`<br>- break;<br>- fi<br>- done<br>- fi<br>- if test -n "$libfile"; then<br>- OPENH323_PREFIX=$pfx<br>- break;<br>- fi<br>- done<br>- if test "${libfile:-unset}" != "unset"; then<br>- OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\([^.]*\)\..*/\1/'"`<br>- fi<br>- case "${OPENH323_SUFFIX}" in<br>- n)<br>- OPENH323_BUILD="notrace";;<br>- r)<br>- OPENH323_BUILD="opt";;<br>- d)<br>- OPENH323_BUILD="debug";;<br>- *)<br>- if test "${OPENH323_PREFIX:-undef}" = "openh323"; then<br>- notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"`<br>- if test "x$notrace" = "x"; then<br>- notrace="0"<br>- fi<br>- if test "$notrace" -ne 0; then<br>- OPENH323_BUILD="notrace"<br>- else<br>- OPENH323_BUILD="opt"<br>- fi<br>- OPENH323_LIB="-l${OPENH323_PREFIX}"<br>- else<br>- OPENH323_BUILD="notrace"<br>- fi<br>- ;;<br>- esac<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${OPENH323_BUILD}" >&5<br>-$as_echo "${OPENH323_BUILD}" >&6; }<br>-<br>-<br>-<br>- fi<br>-<br>- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"<br>-<br>- if test "${HAS_OPENH323:-unset}" != "unset"; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5<br>-$as_echo_n "checking OpenH323 installation validity... " >&6; }<br>-<br>- saved_cppflags="${CPPFLAGS}"<br>- saved_libs="${LIBS}"<br>- if test "${OPENH323_LIB:-unset}" != "unset"; then<br>- LIBS="${LIBS} ${OPENH323_LIB} ${PWLIB_LIB}"<br>- else<br>- LIBS="${LIBS} -L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323} ${PWLIB_LIB}"<br>- fi<br>- CPPFLAGS="${CPPFLAGS} -I${OPENH323_INCDIR} ${PWLIB_INCLUDE}"<br>-<br>- ac_ext=cpp<br>-ac_cpp='$CXXCPP $CPPFLAGS'<br>-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu<br>-<br>-<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>-/* end confdefs.h. */<br>-#include "ptlib.h"<br>- #include "h323.h"<br>- #include "h323ep.h"<br>-int<br>-main ()<br>-{<br>-H323EndPoint ep = H323EndPoint();<br>- ;<br>- return 0;<br>-}<br>-_ACEOF<br>-if ac_fn_cxx_try_link "$LINENO"; then :<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>- ac_cv_lib_OPENH323="yes"<br>-<br>-else<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>- ac_cv_lib_OPENH323="no"<br>-<br>-<br>-fi<br>-rm -f core conftest.err conftest.$ac_objext \<br>- conftest$ac_exeext conftest.$ac_ext<br>-<br>- ac_ext=c<br>-ac_cpp='$CPP $CPPFLAGS'<br>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'<br>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'<br>-ac_compiler_gnu=$ac_cv_c_compiler_gnu<br>-<br>-<br>- LIBS="${saved_libs}"<br>- CPPFLAGS="${saved_cppflags}"<br>-<br>- if test "${ac_cv_lib_OPENH323}" = "yes"; then<br>- if test "${OPENH323_LIB:-undef}" = "undef"; then<br>- if test "${OPENH323_LIBDIR}" != "" -a "${OPENH323_LIBDIR}" != "/usr/lib"; then<br>- OPENH323_LIB="-L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323}"<br>- else<br>- OPENH323_LIB="-l${PLATFORM_OPENH323}"<br>- fi<br>- fi<br>- if test "${OPENH323_INCDIR}" != "" -a "${OPENH323_INCDIR}" != "/usr/include"; then<br>- OPENH323_INCLUDE="-I${OPENH323_INCDIR}"<br>- fi<br>- PBX_OPENH323=1<br>-<br>-$as_echo "#define HAVE_OPENH323 1" >>confdefs.h<br>-<br>- fi<br>- fi<br>-<br>-fi<br>-<br> <br> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then<br> pbxlibdir=""<br>@@ -34140,7 +33208,8 @@<br> fi<br> LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"<br> CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"<br>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br>+<br>+cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h. */<br> <br> #include <vpbapi.h><br>diff --git a/configure.ac b/configure.ac<br>index b7d0158..080fb3c 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -460,7 +460,6 @@<br> AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])<br> AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])<br> AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])<br>-AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])<br> AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])<br> AST_EXT_LIB_SETUP([ICAL], [iCal], [ical])<br> AST_EXT_LIB_SETUP([ICONV], [Iconv], [iconv])<br>@@ -540,7 +539,6 @@<br> AST_EXT_LIB_SETUP_OPTIONAL([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])<br> AST_EXT_LIB_SETUP_OPTIONAL([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])<br> # ------------------------------------^<br>-AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])<br> AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])<br> AST_EXT_LIB_SETUP([FFTW3], [LIBFFTW3], [fftw3])<br> AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])<br>@@ -2359,42 +2357,6 @@<br> __opus_include=-I/usr/include/opus<br> fi<br> AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])<br>-<br>-if test "${USE_PWLIB}" != "no"; then<br>- if test -n "${PWLIB_DIR}"; then<br>- PWLIBDIR="${PWLIB_DIR}"<br>- fi<br>- AST_CHECK_PWLIB()<br>- AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2], [P[[WT]]LIB_VERSION])<br>-<br>- if test "${HAS_PWLIB:-unset}" != "unset"; then<br>- AST_CHECK_PWLIB_PLATFORM()<br>-<br>- PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"<br>-<br>- AST_CHECK_PWLIB_BUILD([PWLib], [PWLIB],<br>- [Define if your system has the PWLib libraries.],<br>- [#include "ptlib.h"],<br>- [int q = (int) PTime::IsDaylightSavings();])<br>- fi<br>-fi<br>-<br>-if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then<br>- if test -n "${OPENH323_DIR}"; then<br>- OPENH323DIR="${OPENH323_DIR}"<br>- fi<br>- AST_CHECK_OPENH323()<br>- AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3], [], [1], [19], [0])<br>- AST_CHECK_OPENH323_BUILD()<br>- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"<br>- AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],<br>- [Define if your system has the OpenH323 libraries.],<br>- [#include "ptlib.h"<br>- #include "h323.h"<br>- #include "h323ep.h"],<br>- [H323EndPoint ep = H323EndPoint();],<br>- [${PWLIB_INCLUDE}], [${PWLIB_LIB}])<br>-fi<br> <br> AST_EXT_LIB_CHECK([LUA], [lua5.3], [luaL_newstate], [lua5.3/lua.h], [-lm])<br> if test "x${PBX_LUA}" = "x1" ; then<br>diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq<br>index 19da358..415ee55 100755<br>--- a/contrib/scripts/install_prereq<br>+++ b/contrib/scripts/install_prereq<br>@@ -25,7 +25,7 @@<br> # Asterisk: for addons:<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libltdl-dev libneon27-dev libgmime-2.6-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"<br>-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libh323plus-dev libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash"<br>+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcodec2-dev libfftw3-dev libsndfile1-dev libunbound-dev"<br>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in<br>index 2f7da87..e2113e9 100644<br>--- a/include/asterisk/autoconfig.h.in<br>+++ b/include/asterisk/autoconfig.h.in<br>@@ -570,9 +570,6 @@<br> /* Define to 1 if you have the OGG library. */<br> #undef HAVE_OGG<br> <br>-/* Define if your system has the OpenH323 libraries. */<br>-#undef HAVE_OPENH323<br>-<br> /* Define to 1 if you have the MFR2 library. */<br> #undef HAVE_OPENR2<br> <br>@@ -785,9 +782,6 @@<br> <br> /* Define to 1 if you have the <pwd.h> header file. */<br> #undef HAVE_PWD_H<br>-<br>-/* Define if your system has the PWLib libraries. */<br>-#undef HAVE_PWLIB<br> <br> /* Define if your system has the PYTHONDEV libraries. */<br> #undef HAVE_PYTHONDEV<br>diff --git a/makeopts.in b/makeopts.in<br>index 227ce07..8168ee9 100644<br>--- a/makeopts.in<br>+++ b/makeopts.in<br>@@ -281,9 +281,6 @@<br> OPENR2_INCLUDE=@OPENR2_INCLUDE@<br> OPENR2_LIB=@OPENR2_LIB@<br> <br>-PWLIB_INCLUDE=@PWLIB_INCLUDE@<br>-PWLIB_LIB=@PWLIB_LIB@<br>-<br> COROSYNC_INCLUDE=@COROSYNC_INCLUDE@<br> COROSYNC_LIB=@COROSYNC_LIB@<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8195">change 8195</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8195"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I07a8ef8bbd6001e25711fa1bff152eb6c9efa729 </div>
<div style="display:none"> Gerrit-Change-Number: 8195 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>