diff --git a/autoconf/ast_check_openh323.m4 b/autoconf/ast_check_openh323.m4
deleted file mode 100644
index 35f8a544be..0000000000
--- a/autoconf/ast_check_openh323.m4
+++ /dev/null
@@ -1,132 +0,0 @@
-AC_DEFUN([AST_CHECK_OPENH323], [
-OPENH323_INCDIR=
-OPENH323_LIBDIR=
-AC_LANG_PUSH([C++])
-if test "${OPENH323DIR:-unset}" != "unset" ; then
-  AC_CHECK_HEADER(${OPENH323DIR}/version.h, HAS_OPENH323=1, )
-fi
-if test "${HAS_OPENH323:-unset}" = "unset" ; then
-  AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
-  if test "${HAS_OPENH323:-unset}" != "unset" ; then
-    OPENH323DIR="${PWLIBDIR}/../openh323"
-    saved_cppflags="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}"
-    AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}", [#include <ptlib.h>])
-    CPPFLAGS="${saved_cppflags}"
-  else
-    saved_cppflags="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}"
-    AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])
-    CPPFLAGS="${saved_cppflags}"
-    if test "${HAS_OPENH323:-unset}" != "unset" ; then
-      OPENH323DIR="${HOME}/openh323"
-    else
-      saved_cppflags="${CPPFLAGS}"
-      CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}"
-      AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])
-      CPPFLAGS="${saved_cppflags}"
-      if test "${HAS_OPENH323:-unset}" != "unset" ; then
-        OPENH323DIR="/usr/local/share/openh323"
-        OPENH323_INCDIR="/usr/local/include/openh323"
-        if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then
-          OPENH323_LIBDIR="/usr/local/lib64"
-        else
-          OPENH323_LIBDIR="/usr/local/lib"
-        fi
-      else
-        saved_cppflags="${CPPFLAGS}"
-        CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}"
-        AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>])
-        CPPFLAGS="${saved_cppflags}"
-        if test "${HAS_OPENH323:-unset}" != "unset" ; then
-          OPENH323DIR="/usr/share/openh323"
-          OPENH323_INCDIR="/usr/include/openh323"
-          if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then
-            OPENH323_LIBDIR="/usr/lib64"
-          else
-            OPENH323_LIBDIR="/usr/lib"
-          fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-if test "${HAS_OPENH323:-unset}" != "unset" ; then
-  if test "${OPENH323_INCDIR:-unset}" = "unset"; then
-    OPENH323_INCDIR="${OPENH323DIR}/include"
-  fi
-  if test "${OPENH323_LIBDIR:-unset}" = "unset"; then
-    OPENH323_LIBDIR="${OPENH323DIR}/lib"
-  fi
-
-  OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`"
-  OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`"
-  OPENH323DIR="`cd ${OPENH323DIR}; pwd`"
-
-  AC_SUBST([OPENH323DIR])
-  AC_SUBST([OPENH323_INCDIR])
-  AC_SUBST([OPENH323_LIBDIR])
-fi
-  AC_LANG_POP([C++])
-])
-
-AC_DEFUN([AST_CHECK_OPENH323_BUILD], [
-	if test "${HAS_OPENH323:-unset}" != "unset"; then
-		AC_MSG_CHECKING(OpenH323 build option)
-		OPENH323_SUFFIX=
-		prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323"
-		for pfx in $prefixes; do
-			#files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`
-			files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`
-			if test -z "$files"; then
-				# check the default location
-				files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`
-			fi
-			libfile=
-			if test -n "$files"; then
-				for f in $files; do
-					if test -f $f -a ! -L $f; then
-						libfile=`basename $f`
-						break;
-					fi
-				done
-			fi
-			if test -n "$libfile"; then
-				OPENH323_PREFIX=$pfx
-				break;
-			fi
-		done
-		if test "${libfile:-unset}" != "unset"; then
-			OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\(@<:@^.@:>@*\)\..*/\1/'"`
-		fi
-		case "${OPENH323_SUFFIX}" in
-			n)
-				OPENH323_BUILD="notrace";;
-			r)
-				OPENH323_BUILD="opt";;
-			d)
-				OPENH323_BUILD="debug";;
-			*)
-				if test "${OPENH323_PREFIX:-undef}" = "openh323"; then
-					notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/@<:@A-Z0-9_@:>@*@<:@ 	@:>@*=@<:@ 	@:>@*//'"`
-					if test "x$notrace" = "x"; then
-						notrace="0"
-					fi
-					if test "$notrace" -ne 0; then
-						OPENH323_BUILD="notrace"
-					else
-						OPENH323_BUILD="opt"
-					fi
-					OPENH323_LIB="-l${OPENH323_PREFIX}"
-				else
-					OPENH323_BUILD="notrace"
-				fi
-				;;
-		esac
-		AC_MSG_RESULT(${OPENH323_BUILD})
-
-		AC_SUBST([OPENH323_SUFFIX])
-		AC_SUBST([OPENH323_BUILD])
-	fi
-])
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4
deleted file mode 100644
index beaf8db742..0000000000
--- a/autoconf/ast_check_pwlib.m4
+++ /dev/null
@@ -1,265 +0,0 @@
-AC_DEFUN([AST_CHECK_PWLIB_PLATFORM], [
-PWLIB_OSTYPE=
-case "$host_os" in
-  linux*)          PWLIB_OSTYPE=linux ;
-  		;;
-  freebsd* )       PWLIB_OSTYPE=FreeBSD ;
-  		;;
-  openbsd* )       PWLIB_OSTYPE=OpenBSD ;
-				   ENDLDLIBS="-lossaudio" ;
-		;;
-  netbsd* )        PWLIB_OSTYPE=NetBSD ;
-				   ENDLDLIBS="-lossaudio" ;
-		;;
-  solaris* | sunos* ) PWLIB_OSTYPE=solaris ;
-		;;
-  darwin* )	       PWLIB_OSTYPE=Darwin ;
-		;;
-  beos*)           PWLIB_OSTYPE=beos ;
-                   STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
-		;;
-  cygwin*)         PWLIB_OSTYPE=cygwin ;
-		;;
-  mingw*)	       PWLIB_OSTYPE=mingw ;
-		           STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
-		           ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
-		;;
-  * )		       PWLIB_OSTYPE="$host_os" ;
-		           AC_MSG_WARN("OS $PWLIB_OSTYPE not recognized - proceed with caution!") ;
-		;;
-esac
-
-PWLIB_MACHTYPE=
-case "$host_cpu" in
-   x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86
-                   ;;
-
-   x86_64)	   PWLIB_MACHTYPE=x86_64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;
-		   P_64BIT=1 ;
-		   ;;
-
-   sparc )         PWLIB_MACHTYPE=sparc ;
-		   ;;
-
-   powerpc )       PWLIB_MACHTYPE=ppc ;
-		   ;;
-
-   ppc )           PWLIB_MACHTYPE=ppc ;
-		   ;;
-
-   powerpc64 )     PWLIB_MACHTYPE=ppc64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   ppc64 )         PWLIB_MACHTYPE=ppc64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   ia64)	   PWLIB_MACHTYPE=ia64 ;
-		   P_64BIT=1 ;
-	  	   ;;
-
-   s390x)	   PWLIB_MACHTYPE=s390x ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   s390)	   PWLIB_MACHTYPE=s390 ;
-		   ;;
-
-   * )		   PWLIB_MACHTYPE="$host_cpu";
-		   AC_MSG_WARN("CPU $PWLIB_MACHTYPE not recognized - proceed with caution!") ;;
-esac
-
-PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
-
-AC_SUBST([PWLIB_PLATFORM])
-])
-
-AC_DEFUN([AST_CHECK_PWLIB], [
-PWLIB_INCDIR=
-PWLIB_LIBDIR=
-AC_LANG_PUSH([C++])
-if test "${PWLIBDIR:-unset}" != "unset" ; then
-  AC_CHECK_HEADER(${PWLIBDIR}/version.h, HAS_PWLIB=1, )
-fi
-if test "${HAS_PWLIB:-unset}" = "unset" ; then
-  if test "${OPENH323DIR:-unset}" != "unset"; then
-    AC_CHECK_HEADER(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )
-  fi
-  if test "${HAS_PWLIB:-unset}" != "unset" ; then
-    PWLIBDIR="${OPENH323DIR}/../pwlib"
-  else
-    AC_CHECK_HEADER(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )
-    if test "${HAS_PWLIB:-unset}" != "unset" ; then
-      PWLIBDIR="${HOME}/pwlib"
-    else
-      AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
-      if test "${HAS_PWLIB:-unset}" != "unset" ; then
-        AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make)
-        PWLIB_INCDIR="/usr/local/include"
-        PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
-        if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-          PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`
-        fi
-        if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-          if test "x$LIB64" != "x"; then
-            PWLIB_LIBDIR="/usr/local/lib64"
-          else
-            PWLIB_LIBDIR="/usr/local/lib"
-          fi
-        fi
-        PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
-        PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
-      else
-        AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, )
-        if test "${HAS_PWLIB:-unset}" != "unset" ; then
-          AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make)
-          PWLIB_INCDIR="/usr/include"
-          PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
-          if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-            PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`
-          fi
-          if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-            if test "x$LIB64" != "x"; then
-              PWLIB_LIBDIR="/usr/lib64"
-            else
-              PWLIB_LIBDIR="/usr/lib"
-            fi
-          fi
-          PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
-          PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
-        fi
-      fi
-    fi
-  fi
-fi
-
-#if test "${HAS_PWLIB:-unset}" = "unset" ; then
-#  echo "Cannot find pwlib - please install or set PWLIBDIR and try again"
-#  exit
-#fi
-
-if test "${HAS_PWLIB:-unset}" != "unset" ; then
-  if test "${PWLIBDIR:-unset}" = "unset" ; then
-    if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
-      PWLIBDIR=`$PTLIB_CONFIG --prefix`
-    else
-      echo "Cannot find ptlib-config - please install and try again"
-      exit
-    fi
-  fi
-
-  if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib"
-    PWLIB_INCDIR="/usr/include"
-    if test "x$LIB64" != "x"; then
-      PWLIB_LIBDIR="/usr/lib64"
-    else
-      PWLIB_LIBDIR="/usr/lib"
-    fi
-  fi
-  if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib"
-    PWLIB_INCDIR="/usr/local/include"
-    if test "x$LIB64" != "x"; then
-      PWLIB_LIBDIR="/usr/local/lib64"
-    else
-      PWLIB_LIBDIR="/usr/local/lib"
-    fi
-  fi
-
-  if test "${PWLIB_INCDIR:-unset}" = "unset"; then
-    PWLIB_INCDIR="${PWLIBDIR}/include"
-  fi
-  if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-    PWLIB_LIBDIR="${PWLIBDIR}/lib"
-  fi
-
-  AC_SUBST([PWLIBDIR])
-  AC_SUBST([PWLIB_INCDIR])
-  AC_SUBST([PWLIB_LIBDIR])
-fi
-  AC_LANG_POP([C++])
-])
-
-AC_DEFUN([AST_CHECK_PWLIB_VERSION], [
-	VNAME="m4_default([$7],[$2_VERSION])"
-
-	if test "${HAS_$2:-unset}" != "unset"; then
-		$2_VERSION=`grep "$VNAME \"" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
-		$2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.`
-		$2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.`
-		$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`
-		$2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))
-		$2_REQ=$(($4*10000+$5*100+$6))
-		$2_MAX=m4_ifval([$10], [$(($8*10000+$9*100+$10))], [9999999])
-
-		AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
-		if test ${$2_VER} -lt ${$2_REQ}; then
-			AC_MSG_RESULT(no)
-			unset HAS_$2
-		else
-			if test ${$2_VER} -gt ${$2_MAX}; then
-				AC_MSG_RESULT(no)
-				unset HAS_$2
-			else
-				AC_MSG_RESULT(yes)
-			fi
-		fi
-	fi
-])
-
-AC_DEFUN([AST_CHECK_PWLIB_BUILD], [
-	if test "${HAS_$2:-unset}" != "unset"; then
-	   AC_MSG_CHECKING($1 installation validity)
-
-	   saved_cppflags="${CPPFLAGS}"
-	   saved_libs="${LIBS}"
-	   if test "${$2_LIB:-unset}" != "unset"; then
-	      LIBS="${LIBS} ${$2_LIB} $7"
-	   else
-    	      LIBS="${LIBS} -L${$2_LIBDIR} -l${PLATFORM_$2} $7"
-	   fi
-	   CPPFLAGS="${CPPFLAGS} -I${$2_INCDIR} $6"
-
-	   AC_LANG_PUSH([C++])
-
-	   AC_LINK_IFELSE(
-		[AC_LANG_PROGRAM([$4],[$5])],
-		[	AC_MSG_RESULT(yes)
-			ac_cv_lib_$2="yes"
-		],
-		[	AC_MSG_RESULT(no)
-			ac_cv_lib_$2="no"
-		]
-		)
-
-	   AC_LANG_POP([C++])
-
-	   LIBS="${saved_libs}"
-	   CPPFLAGS="${saved_cppflags}"
-
-	   if test "${ac_cv_lib_$2}" = "yes"; then
-	      if test "${$2_LIB:-undef}" = "undef"; then
-	         if test "${$2_LIBDIR}" != "" -a "${$2_LIBDIR}" != "/usr/lib"; then
-	            $2_LIB="-L${$2_LIBDIR} -l${PLATFORM_$2}"
-	         else
-	            $2_LIB="-l${PLATFORM_$2}"
-	         fi
-	      fi
-	      if test "${$2_INCDIR}" != "" -a "${$2_INCDIR}" != "/usr/include"; then
-	         $2_INCLUDE="-I${$2_INCDIR}"
-	      fi
-	   	  PBX_$2=1
-	   	  AC_DEFINE([HAVE_$2], 1, [$3])
-	   fi
-	fi
-])
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 259a8358e1..afea01f596 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -44,7 +44,6 @@ NEWT=@PBX_NEWT@
 NEON=@PBX_NEON@
 NEON29=@PBX_NEON29@
 OGG=@PBX_OGG@
-OPENH323=@PBX_OPENH323@
 OPUS=@PBX_OPUS@
 OPUSFILE=@PBX_OPUSFILE@
 OSPTK=@PBX_OSPTK@
diff --git a/configure b/configure
index 0f97728ec8..c571b56e17 100755
--- a/configure
+++ b/configure
@@ -657,16 +657,6 @@ GMIME_LIBS
 GMIME_CFLAGS
 PBX_SSL_OP_NO_TLSV1_2
 PBX_SSL_OP_NO_TLSV1_1
-OPENH323_BUILD
-OPENH323_SUFFIX
-OPENH323_LIBDIR
-OPENH323_INCDIR
-OPENH323DIR
-PWLIB_PLATFORM
-PWLIB_LIBDIR
-PWLIB_INCDIR
-PWLIBDIR
-PTLIB_CONFIG
 PYTHONDEV_LIBS
 PYTHONDEV_CFLAGS
 PYTHONDEV_INCLUDE
@@ -850,10 +840,6 @@ PBX_RADIUS
 RADIUS_DIR
 RADIUS_INCLUDE
 RADIUS_LIB
-PBX_PWLIB
-PWLIB_DIR
-PWLIB_INCLUDE
-PWLIB_LIB
 PBX_PRI_REVERSE_CHARGE
 PRI_REVERSE_CHARGE_DIR
 PRI_REVERSE_CHARGE_INCLUDE
@@ -1138,10 +1124,6 @@ PBX_HOARD
 HOARD_DIR
 HOARD_INCLUDE
 HOARD_LIB
-PBX_OPENH323
-OPENH323_DIR
-OPENH323_INCLUDE
-OPENH323_LIB
 PBX_GMIME
 GMIME_DIR
 GMIME_INCLUDE
@@ -1407,7 +1389,6 @@ with_gsm
 with_ilbc
 with_gtk2
 with_gmime
-with_h323
 with_hoard
 with_ical
 with_iconv
@@ -1447,7 +1428,6 @@ with_pjproject
 with_popt
 with_portaudio
 with_pri
-with_pwlib
 with_radius
 with_fftw3
 with_resample
@@ -2163,7 +2143,6 @@ Optional Packages:
                           otherwise
   --with-gtk2=PATH        use gtk2 files in PATH
   --with-gmime=PATH       use GMime files in PATH
-  --with-h323=PATH        use OpenH323 files in PATH
   --with-hoard=PATH       use Hoard Memory Allocator files in PATH
   --with-ical=PATH        use iCal files in PATH
   --with-iconv=PATH       use Iconv files in PATH
@@ -2204,7 +2183,6 @@ Optional Packages:
   --with-popt=PATH        use popt files in PATH
   --with-portaudio=PATH   use PortAudio files in PATH
   --with-pri=PATH         use ISDN PRI files in PATH
-  --with-pwlib=PATH       use PWlib files in PATH
   --with-radius=PATH      use Radius Client files in PATH
   --with-fftw3=PATH       use LIBFFTW3 files in PATH
   --with-resample=PATH    use LIBRESAMPLE files in PATH
@@ -3079,97 +3057,6 @@ rm -f conftest.val
 
 } # ac_fn_c_compute_int
 
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_cxx_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------ ##
-## Report this to https://issues.asterisk.org ##
-## ------------------------------------------ ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_mongrel
-
 # ac_fn_cxx_try_link LINENO
 # -------------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -3215,37 +3102,6 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
-
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_header_compile
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -10010,38 +9866,6 @@ fi
 
 
 
-    OPENH323_DESCRIP="OpenH323"
-    OPENH323_OPTION="h323"
-    PBX_OPENH323=0
-
-# Check whether --with-h323 was given.
-if test "${with_h323+set}" = set; then :
-  withval=$with_h323;
-	case ${withval} in
-	n|no)
-	USE_OPENH323=no
-	# -1 is a magic value used by menuselect to know that the package
-	# was disabled, other than 'not found'
-	PBX_OPENH323=-1
-	;;
-	y|ye|yes)
-	ac_mandatory_list="${ac_mandatory_list} OPENH323"
-	;;
-	*)
-	OPENH323_DIR="${withval}"
-	ac_mandatory_list="${ac_mandatory_list} OPENH323"
-	;;
-	esac
-
-fi
-
-
-
-
-
-
-
-
     HOARD_DESCRIP="Hoard Memory Allocator"
     HOARD_OPTION="hoard"
     PBX_HOARD=0
@@ -12049,38 +11873,6 @@ PBX_PRI_REVERSE_CHARGE=0
 
 # ------------------------------------^
 
-    PWLIB_DESCRIP="PWlib"
-    PWLIB_OPTION="pwlib"
-    PBX_PWLIB=0
-
-# Check whether --with-pwlib was given.
-if test "${with_pwlib+set}" = set; then :
-  withval=$with_pwlib;
-	case ${withval} in
-	n|no)
-	USE_PWLIB=no
-	# -1 is a magic value used by menuselect to know that the package
-	# was disabled, other than 'not found'
-	PBX_PWLIB=-1
-	;;
-	y|ye|yes)
-	ac_mandatory_list="${ac_mandatory_list} PWLIB"
-	;;
-	*)
-	PWLIB_DIR="${withval}"
-	ac_mandatory_list="${ac_mandatory_list} PWLIB"
-	;;
-	esac
-
-fi
-
-
-
-
-
-
-
-
     RADIUS_DESCRIP="Radius Client"
     RADIUS_OPTION="radius"
     PBX_RADIUS=0
@@ -29504,730 +29296,6 @@ fi
 
 
 
-if test "${USE_PWLIB}" != "no"; then
-	if test -n "${PWLIB_DIR}"; then
-		PWLIBDIR="${PWLIB_DIR}"
-	fi
-
-
-
-PWLIB_INCDIR=
-PWLIB_LIBDIR=
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-if test "${PWLIBDIR:-unset}" != "unset" ; then
-  as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/version.h" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/version.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  HAS_PWLIB=1
-fi
-
-
-fi
-if test "${HAS_PWLIB:-unset}" = "unset" ; then
-  if test "${OPENH323DIR:-unset}" != "unset"; then
-    as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/../pwlib/version.h" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/../pwlib/version.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  HAS_PWLIB=1
-fi
-
-
-  fi
-  if test "${HAS_PWLIB:-unset}" != "unset" ; then
-    PWLIBDIR="${OPENH323DIR}/../pwlib"
-  else
-    as_ac_Header=`$as_echo "ac_cv_header_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "${HOME}/pwlib/include/ptlib.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  HAS_PWLIB=1
-fi
-
-
-    if test "${HAS_PWLIB:-unset}" != "unset" ; then
-      PWLIBDIR="${HOME}/pwlib"
-    else
-      ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/local/include/ptlib.h" "ac_cv_header__usr_local_include_ptlib_h" "$ac_includes_default"
-if test "x$ac_cv_header__usr_local_include_ptlib_h" = xyes; then :
-  HAS_PWLIB=1
-fi
-
-
-      if test "${HAS_PWLIB:-unset}" != "unset" ; then
-        # Extract the first word of "ptlib-config", so it can be a program name with args.
-set dummy ptlib-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PTLIB_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PTLIB_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG
-if test -n "$PTLIB_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5
-$as_echo "$PTLIB_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        PWLIB_INCDIR="/usr/local/include"
-        PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
-        if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-          PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`
-        fi
-        if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-          if test "x$LIB64" != "x"; then
-            PWLIB_LIBDIR="/usr/local/lib64"
-          else
-            PWLIB_LIBDIR="/usr/local/lib"
-          fi
-        fi
-        PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
-        PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
-      else
-        ac_fn_cxx_check_header_mongrel "$LINENO" "/usr/include/ptlib.h" "ac_cv_header__usr_include_ptlib_h" "$ac_includes_default"
-if test "x$ac_cv_header__usr_include_ptlib_h" = xyes; then :
-  HAS_PWLIB=1
-fi
-
-
-        if test "${HAS_PWLIB:-unset}" != "unset" ; then
-          # Extract the first word of "ptlib-config", so it can be a program name with args.
-set dummy ptlib-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PTLIB_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PTLIB_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PTLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG
-if test -n "$PTLIB_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTLIB_CONFIG" >&5
-$as_echo "$PTLIB_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-          PWLIB_INCDIR="/usr/include"
-          PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null`
-          if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-            PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null`
-          fi
-          if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-            if test "x$LIB64" != "x"; then
-              PWLIB_LIBDIR="/usr/lib64"
-            else
-              PWLIB_LIBDIR="/usr/lib"
-            fi
-          fi
-          PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
-          PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
-        fi
-      fi
-    fi
-  fi
-fi
-
-#if test "${HAS_PWLIB:-unset}" = "unset" ; then
-#  echo "Cannot find pwlib - please install or set PWLIBDIR and try again"
-#  exit
-#fi
-
-if test "${HAS_PWLIB:-unset}" != "unset" ; then
-  if test "${PWLIBDIR:-unset}" = "unset" ; then
-    if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
-      PWLIBDIR=`$PTLIB_CONFIG --prefix`
-    else
-      echo "Cannot find ptlib-config - please install and try again"
-      exit
-    fi
-  fi
-
-  if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/share/pwlib"
-    PWLIB_INCDIR="/usr/include"
-    if test "x$LIB64" != "x"; then
-      PWLIB_LIBDIR="/usr/lib64"
-    else
-      PWLIB_LIBDIR="/usr/lib"
-    fi
-  fi
-  if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-    PWLIBDIR="/usr/local/share/pwlib"
-    PWLIB_INCDIR="/usr/local/include"
-    if test "x$LIB64" != "x"; then
-      PWLIB_LIBDIR="/usr/local/lib64"
-    else
-      PWLIB_LIBDIR="/usr/local/lib"
-    fi
-  fi
-
-  if test "${PWLIB_INCDIR:-unset}" = "unset"; then
-    PWLIB_INCDIR="${PWLIBDIR}/include"
-  fi
-  if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
-    PWLIB_LIBDIR="${PWLIBDIR}/lib"
-  fi
-
-
-
-
-fi
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-	VNAME="P[WT]LIB_VERSION"
-
-	if test "${HAS_PWLIB:-unset}" != "unset"; then
-		PWLIB_VERSION=`grep "$VNAME \"" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
-		PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.`
-		PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.`
-		PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.`
-		PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}))
-		PWLIB_REQ=$((1*10000+9*100+2))
-		PWLIB_MAX=9999999
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5
-$as_echo_n "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... " >&6; }
-		if test ${PWLIB_VER} -lt ${PWLIB_REQ}; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			unset HAS_PWLIB
-		else
-			if test ${PWLIB_VER} -gt ${PWLIB_MAX}; then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-				unset HAS_PWLIB
-			else
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			fi
-		fi
-	fi
-
-
-	if test "${HAS_PWLIB:-unset}" != "unset"; then
-
-PWLIB_OSTYPE=
-case "$host_os" in
-  linux*)          PWLIB_OSTYPE=linux ;
-  		;;
-  freebsd* )       PWLIB_OSTYPE=FreeBSD ;
-  		;;
-  openbsd* )       PWLIB_OSTYPE=OpenBSD ;
-				   ENDLDLIBS="-lossaudio" ;
-		;;
-  netbsd* )        PWLIB_OSTYPE=NetBSD ;
-				   ENDLDLIBS="-lossaudio" ;
-		;;
-  solaris* | sunos* ) PWLIB_OSTYPE=solaris ;
-		;;
-  darwin* )	       PWLIB_OSTYPE=Darwin ;
-		;;
-  beos*)           PWLIB_OSTYPE=beos ;
-                   STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
-		;;
-  cygwin*)         PWLIB_OSTYPE=cygwin ;
-		;;
-  mingw*)	       PWLIB_OSTYPE=mingw ;
-		           STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
-		           ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
-		;;
-  * )		       PWLIB_OSTYPE="$host_os" ;
-		           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&5
-$as_echo "$as_me: WARNING: \"OS $PWLIB_OSTYPE not recognized - proceed with caution!\"" >&2;} ;
-		;;
-esac
-
-PWLIB_MACHTYPE=
-case "$host_cpu" in
-   x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86
-                   ;;
-
-   x86_64)	   PWLIB_MACHTYPE=x86_64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;
-		   P_64BIT=1 ;
-		   ;;
-
-   sparc )         PWLIB_MACHTYPE=sparc ;
-		   ;;
-
-   powerpc )       PWLIB_MACHTYPE=ppc ;
-		   ;;
-
-   ppc )           PWLIB_MACHTYPE=ppc ;
-		   ;;
-
-   powerpc64 )     PWLIB_MACHTYPE=ppc64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   ppc64 )         PWLIB_MACHTYPE=ppc64 ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   ia64)	   PWLIB_MACHTYPE=ia64 ;
-		   P_64BIT=1 ;
-	  	   ;;
-
-   s390x)	   PWLIB_MACHTYPE=s390x ;
-		   P_64BIT=1 ;
-                   LIB64=1 ;
-		   ;;
-
-   s390)	   PWLIB_MACHTYPE=s390 ;
-		   ;;
-
-   * )		   PWLIB_MACHTYPE="$host_cpu";
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&5
-$as_echo "$as_me: WARNING: \"CPU $PWLIB_MACHTYPE not recognized - proceed with caution!\"" >&2;} ;;
-esac
-
-PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
-
-
-
-
-		PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"
-
-
-	if test "${HAS_PWLIB:-unset}" != "unset"; then
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking PWLib installation validity" >&5
-$as_echo_n "checking PWLib installation validity... " >&6; }
-
-	   saved_cppflags="${CPPFLAGS}"
-	   saved_libs="${LIBS}"
-	   if test "${PWLIB_LIB:-unset}" != "unset"; then
-	      LIBS="${LIBS} ${PWLIB_LIB} "
-	   else
-    	      LIBS="${LIBS} -L${PWLIB_LIBDIR} -l${PLATFORM_PWLIB} "
-	   fi
-	   CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR} "
-
-	   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "ptlib.h"
-int
-main ()
-{
-int q = (int) PTime::IsDaylightSavings();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			ac_cv_lib_PWLIB="yes"
-
-else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			ac_cv_lib_PWLIB="no"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-	   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-	   LIBS="${saved_libs}"
-	   CPPFLAGS="${saved_cppflags}"
-
-	   if test "${ac_cv_lib_PWLIB}" = "yes"; then
-	      if test "${PWLIB_LIB:-undef}" = "undef"; then
-	         if test "${PWLIB_LIBDIR}" != "" -a "${PWLIB_LIBDIR}" != "/usr/lib"; then
-	            PWLIB_LIB="-L${PWLIB_LIBDIR} -l${PLATFORM_PWLIB}"
-	         else
-	            PWLIB_LIB="-l${PLATFORM_PWLIB}"
-	         fi
-	      fi
-	      if test "${PWLIB_INCDIR}" != "" -a "${PWLIB_INCDIR}" != "/usr/include"; then
-	         PWLIB_INCLUDE="-I${PWLIB_INCDIR}"
-	      fi
-	   	  PBX_PWLIB=1
-
-$as_echo "#define HAVE_PWLIB 1" >>confdefs.h
-
-	   fi
-	fi
-
-	fi
-fi
-
-if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
-	if test -n "${OPENH323_DIR}"; then
-		OPENH323DIR="${OPENH323_DIR}"
-	fi
-
-OPENH323_INCDIR=
-OPENH323_LIBDIR=
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-if test "${OPENH323DIR:-unset}" != "unset" ; then
-  as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/version.h" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "${OPENH323DIR}/version.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  HAS_OPENH323=1
-fi
-
-
-fi
-if test "${HAS_OPENH323:-unset}" = "unset" ; then
-  as_ac_Header=`$as_echo "ac_cv_header_${PWLIBDIR}/../openh323/version.h" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "${PWLIBDIR}/../openh323/version.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1
-fi
-
-
-  if test "${HAS_OPENH323:-unset}" != "unset" ; then
-    OPENH323DIR="${PWLIBDIR}/../openh323"
-    saved_cppflags="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}"
-    as_ac_Header=`$as_echo "ac_cv_header_${OPENH323DIR}/include/h323.h" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "${OPENH323DIR}/include/h323.h" "$as_ac_Header" "#include <ptlib.h>
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-
-else
-  OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}"
-fi
-
-
-    CPPFLAGS="${saved_cppflags}"
-  else
-    saved_cppflags="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}"
-    as_ac_Header=`$as_echo "ac_cv_header_${HOME}/openh323/include/h323.h" | $as_tr_sh`
-ac_fn_cxx_check_header_compile "$LINENO" "${HOME}/openh323/include/h323.h" "$as_ac_Header" "#include <ptlib.h>
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  HAS_OPENH323=1
-fi
-
-
-    CPPFLAGS="${saved_cppflags}"
-    if test "${HAS_OPENH323:-unset}" != "unset" ; then
-      OPENH323DIR="${HOME}/openh323"
-    else
-      saved_cppflags="${CPPFLAGS}"
-      CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}"
-      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>
-"
-if test "x$ac_cv_header__usr_local_include_openh323_h323_h" = xyes; then :
-  HAS_OPENH323=1
-fi
-
-
-      CPPFLAGS="${saved_cppflags}"
-      if test "${HAS_OPENH323:-unset}" != "unset" ; then
-        OPENH323DIR="/usr/local/share/openh323"
-        OPENH323_INCDIR="/usr/local/include/openh323"
-        if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then
-          OPENH323_LIBDIR="/usr/local/lib64"
-        else
-          OPENH323_LIBDIR="/usr/local/lib"
-        fi
-      else
-        saved_cppflags="${CPPFLAGS}"
-        CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}"
-        ac_fn_cxx_check_header_compile "$LINENO" "/usr/include/openh323/h323.h" "ac_cv_header__usr_include_openh323_h323_h" "#include <ptlib.h>
-"
-if test "x$ac_cv_header__usr_include_openh323_h323_h" = xyes; then :
-  HAS_OPENH323=1
-fi
-
-
-        CPPFLAGS="${saved_cppflags}"
-        if test "${HAS_OPENH323:-unset}" != "unset" ; then
-          OPENH323DIR="/usr/share/openh323"
-          OPENH323_INCDIR="/usr/include/openh323"
-          if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then
-            OPENH323_LIBDIR="/usr/lib64"
-          else
-            OPENH323_LIBDIR="/usr/lib"
-          fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-if test "${HAS_OPENH323:-unset}" != "unset" ; then
-  if test "${OPENH323_INCDIR:-unset}" = "unset"; then
-    OPENH323_INCDIR="${OPENH323DIR}/include"
-  fi
-  if test "${OPENH323_LIBDIR:-unset}" = "unset"; then
-    OPENH323_LIBDIR="${OPENH323DIR}/lib"
-  fi
-
-  OPENH323_LIBDIR="`cd ${OPENH323_LIBDIR}; pwd`"
-  OPENH323_INCDIR="`cd ${OPENH323_INCDIR}; pwd`"
-  OPENH323DIR="`cd ${OPENH323DIR}; pwd`"
-
-
-
-
-fi
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-	VNAME="OPENH323_VERSION"
-
-	if test "${HAS_OPENH323:-unset}" != "unset"; then
-		OPENH323_VERSION=`grep "$VNAME \"" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
-		OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.`
-		OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.`
-		OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.`
-		OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}))
-		OPENH323_REQ=$((1*10000+17*100+3))
-		OPENH323_MAX=$((1*10000+19*100+0))
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5
-$as_echo_n "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... " >&6; }
-		if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			unset HAS_OPENH323
-		else
-			if test ${OPENH323_VER} -gt ${OPENH323_MAX}; then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-				unset HAS_OPENH323
-			else
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			fi
-		fi
-	fi
-
-
-	if test "${HAS_OPENH323:-unset}" != "unset"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 build option" >&5
-$as_echo_n "checking OpenH323 build option... " >&6; }
-		OPENH323_SUFFIX=
-		prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323"
-		for pfx in $prefixes; do
-			#files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`
-			files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`
-			if test -z "$files"; then
-				# check the default location
-				files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null`
-			fi
-			libfile=
-			if test -n "$files"; then
-				for f in $files; do
-					if test -f $f -a ! -L $f; then
-						libfile=`basename $f`
-						break;
-					fi
-				done
-			fi
-			if test -n "$libfile"; then
-				OPENH323_PREFIX=$pfx
-				break;
-			fi
-		done
-		if test "${libfile:-unset}" != "unset"; then
-			OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/lib${OPENH323_PREFIX}\([^.]*\)\..*/\1/'"`
-		fi
-		case "${OPENH323_SUFFIX}" in
-			n)
-				OPENH323_BUILD="notrace";;
-			r)
-				OPENH323_BUILD="opt";;
-			d)
-				OPENH323_BUILD="debug";;
-			*)
-				if test "${OPENH323_PREFIX:-undef}" = "openh323"; then
-					notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ 	]*=[ 	]*//'"`
-					if test "x$notrace" = "x"; then
-						notrace="0"
-					fi
-					if test "$notrace" -ne 0; then
-						OPENH323_BUILD="notrace"
-					else
-						OPENH323_BUILD="opt"
-					fi
-					OPENH323_LIB="-l${OPENH323_PREFIX}"
-				else
-					OPENH323_BUILD="notrace"
-				fi
-				;;
-		esac
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${OPENH323_BUILD}" >&5
-$as_echo "${OPENH323_BUILD}" >&6; }
-
-
-
-	fi
-
-	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-
-	if test "${HAS_OPENH323:-unset}" != "unset"; then
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-$as_echo_n "checking OpenH323 installation validity... " >&6; }
-
-	   saved_cppflags="${CPPFLAGS}"
-	   saved_libs="${LIBS}"
-	   if test "${OPENH323_LIB:-unset}" != "unset"; then
-	      LIBS="${LIBS} ${OPENH323_LIB} ${PWLIB_LIB}"
-	   else
-    	      LIBS="${LIBS} -L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323} ${PWLIB_LIB}"
-	   fi
-	   CPPFLAGS="${CPPFLAGS} -I${OPENH323_INCDIR} ${PWLIB_INCLUDE}"
-
-	   ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "ptlib.h"
-		#include "h323.h"
-		#include "h323ep.h"
-int
-main ()
-{
-H323EndPoint ep = H323EndPoint();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			ac_cv_lib_OPENH323="yes"
-
-else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			ac_cv_lib_OPENH323="no"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-	   ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-	   LIBS="${saved_libs}"
-	   CPPFLAGS="${saved_cppflags}"
-
-	   if test "${ac_cv_lib_OPENH323}" = "yes"; then
-	      if test "${OPENH323_LIB:-undef}" = "undef"; then
-	         if test "${OPENH323_LIBDIR}" != "" -a "${OPENH323_LIBDIR}" != "/usr/lib"; then
-	            OPENH323_LIB="-L${OPENH323_LIBDIR} -l${PLATFORM_OPENH323}"
-	         else
-	            OPENH323_LIB="-l${PLATFORM_OPENH323}"
-	         fi
-	      fi
-	      if test "${OPENH323_INCDIR}" != "" -a "${OPENH323_INCDIR}" != "/usr/include"; then
-	         OPENH323_INCLUDE="-I${OPENH323_INCDIR}"
-	      fi
-	   	  PBX_OPENH323=1
-
-$as_echo "#define HAVE_OPENH323 1" >>confdefs.h
-
-	   fi
-	fi
-
-fi
-
 
 if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
    pbxlibdir=""
@@ -34280,7 +33348,8 @@ $as_echo_n "checking for vpb_open in -lvpb... " >&6; }
    fi
    LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
    CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <vpbapi.h>
diff --git a/configure.ac b/configure.ac
index cef28f5b0a..2029917f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,7 +460,6 @@ AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise]
 AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
 AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
 AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
-AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
 AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])
 AST_EXT_LIB_SETUP([ICAL], [iCal], [ical])
 AST_EXT_LIB_SETUP([ICONV], [Iconv], [iconv])
@@ -541,7 +540,6 @@ AST_EXT_LIB_SETUP_OPTIONAL([PRI_PROG_W_CAUSE], [ISDN progress with cause], [PRI]
 AST_EXT_LIB_SETUP_OPTIONAL([PRI_SERVICE_MESSAGES], [ISDN service messages], [PRI], [pri])
 AST_EXT_LIB_SETUP_OPTIONAL([PRI_REVERSE_CHARGE], [ISDN reverse charge], [PRI], [pri])
 # ------------------------------------^
-AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
 AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
 AST_EXT_LIB_SETUP([FFTW3], [LIBFFTW3], [fftw3])
 AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
@@ -2359,42 +2357,6 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
 fi
 AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
 
-if test "${USE_PWLIB}" != "no"; then
-	if test -n "${PWLIB_DIR}"; then
-		PWLIBDIR="${PWLIB_DIR}"
-	fi
-	AST_CHECK_PWLIB()
-	AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2], [P[[WT]]LIB_VERSION])
-
-	if test "${HAS_PWLIB:-unset}" != "unset"; then
-		AST_CHECK_PWLIB_PLATFORM()
-
-		PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"
-
-		AST_CHECK_PWLIB_BUILD([PWLib], [PWLIB],
-			[Define if your system has the PWLib libraries.],
-			[#include "ptlib.h"],
-			[int q = (int) PTime::IsDaylightSavings();])
-	fi
-fi
-
-if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
-	if test -n "${OPENH323_DIR}"; then
-		OPENH323DIR="${OPENH323_DIR}"
-	fi
-	AST_CHECK_OPENH323()
-	AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3], [], [1], [19], [0])
-	AST_CHECK_OPENH323_BUILD()
-	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-	AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
-		[Define if your system has the OpenH323 libraries.],
-		[#include "ptlib.h"
-		#include "h323.h"
-		#include "h323ep.h"],
-		[H323EndPoint ep = H323EndPoint();],
-		[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
-fi
-
 AST_EXT_LIB_CHECK([LUA], [lua5.3], [luaL_newstate], [lua5.3/lua.h], [-lm])
 if test "x${PBX_LUA}" = "x1" ; then
 	if test x"${LUA_DIR}" = x; then
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index ff792f1354..1a4d5c5418 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -25,7 +25,7 @@ PACKAGES_DEBIAN="$PACKAGES_DEBIAN libedit-dev libjansson-dev libsqlite3-dev uuid
 # Asterisk: for addons:
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"
 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"
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libh323plus-dev libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash"
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libvpb-dev libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcodec2-dev libfftw3-dev libsndfile1-dev libunbound-dev"
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index b95d52693f..4a9a273b79 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -576,9 +576,6 @@
 /* Define to 1 if you have the OGG library. */
 #undef HAVE_OGG
 
-/* Define if your system has the OpenH323 libraries. */
-#undef HAVE_OPENH323
-
 /* Define to 1 if you have the MFR2 library. */
 #undef HAVE_OPENR2
 
@@ -789,9 +786,6 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
-/* Define if your system has the PWLib libraries. */
-#undef HAVE_PWLIB
-
 /* Define if your system has the PYTHONDEV libraries. */
 #undef HAVE_PYTHONDEV
 
diff --git a/makeopts.in b/makeopts.in
index daf5d8e5e1..4d3cc5db63 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -280,9 +280,6 @@ SYSTEMD_LIB=@SYSTEMD_LIB@
 OPENR2_INCLUDE=@OPENR2_INCLUDE@
 OPENR2_LIB=@OPENR2_LIB@
 
-PWLIB_INCLUDE=@PWLIB_INCLUDE@
-PWLIB_LIB=@PWLIB_LIB@
-
 COROSYNC_INCLUDE=@COROSYNC_INCLUDE@
 COROSYNC_LIB=@COROSYNC_LIB@