Merged revisions 74515 via svnmerge from
[asterisk/asterisk.git] / configure.ac
index e28aef4..081a5e3 100644 (file)
@@ -1,4 +1,10 @@
 # Process this file with autoconf to produce a configure script.
+#
+# Make sure we use autoconf 2.60 to generate the "configure" script,
+# in case we want to commit it. Other than that, version 2.59 is
+# perfectly fine for our purposes, so people who want to modify
+# this file just have to remember to set the AC_PREREQ argument
+# to something that suits their needs.
 
 AC_PREREQ(2.59)
 
@@ -11,10 +17,9 @@ AC_INIT(asterisk, PBX_VERSION, www.asterisk.org)
 # cross-compile macros
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
 
 # check existence of the package
-AC_CONFIG_SRCDIR([asterisk.c])
+AC_CONFIG_SRCDIR([main/asterisk.c])
 
 # specify output header file
 AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
@@ -22,10 +27,16 @@ AC_CONFIG_HEADER(include/asterisk/autoconfig.h)
 AC_COPYRIGHT("Asterisk")
 AC_REVISION($Revision$)
 
-case "${host}" in
-     *freebsd*)
+AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS       # note- does not work on FreeBSD
+
+case "${host_os}" in
+     freebsd*)
      ac_default_prefix=/usr/local
+     CPPFLAGS=-I/usr/local/include
+     LDFLAGS=-L/usr/local/lib
      ;;
+
      *)
      ac_default_prefix=/usr
      if test ${sysconfdir} = '${prefix}/etc'; then
@@ -41,25 +52,45 @@ if test ${localstatedir} = '${prefix}/var'; then
      localstatedir=/var
 fi
 
-### ** Platform.
-AC_DEFINE_UNQUOTED(PBX_PLATFORM, "${host}",
-[Define this to be the canonical name (cpu-vendor-os) of your system.])
-AC_DEFINE_UNQUOTED(PBX_CPU, "${host_cpu}",
-[Define this to be the name of the CPU of your system.])
-AC_DEFINE_UNQUOTED(PBX_VENDOR, "${host_vendor}",
-[Define this to be the name of the vendor of your system.])
-AC_DEFINE_UNQUOTED(PBX_OS, "${host_os}",
-[Define this to be the name of the OS of your system.])
-
-# export some useful defines
-PBX_PLATFORM=${host}
-PBX_CPU=${host_cpu}
-PBX_VENDOR=${host_vendor}
-PBX_OS=${host_os}
-AC_SUBST(PBX_PLATFORM)
-AC_SUBST(PBX_CPU)
-AC_SUBST(PBX_VENDOR)
-AC_SUBST(PBX_OS)
+BUILD_PLATFORM=${build}
+BUILD_CPU=${build_cpu}
+BUILD_VENDOR=${build_vendor}
+BUILD_OS=${build_os}
+
+AC_SUBST(BUILD_PLATFORM)
+AC_SUBST(BUILD_CPU)
+AC_SUBST(BUILD_VENDOR)
+AC_SUBST(BUILD_OS)
+
+HOST_PLATFORM=${host}
+HOST_CPU=${host_cpu}
+HOST_VENDOR=${host_vendor}
+HOST_OS=${host_os}
+
+AC_SUBST(HOST_PLATFORM)
+AC_SUBST(HOST_CPU)
+AC_SUBST(HOST_VENDOR)
+AC_SUBST(HOST_OS)
+
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     netbsd*)
+     OSARCH=NetBSD
+     ;;
+     openbsd*)
+     OSARCH=OpenBSD
+     ;;
+     solaris*)
+     OSARCH=SunOS
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+esac
+
+AC_SUBST(OSARCH)
 
 #  check for uname
 AC_PATH_TOOL([UNAME], [uname], No)
@@ -68,76 +99,12 @@ if test ! x"${UNAME}" = xNo; then
 fi
 AC_SUBST(PBX_OSREV)
 
-# guest OS type
-case "${host}" in
-  cygwin*|mingw*|windows*|winnt)
-    AC_DEFINE(Win32, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="CYGWIN"
-# this is ugly - KPF
-  OSISWIN32=1
-  AC_SUBST(OSISWIN32)
-    ;;
-  *linux*)
-    AC_DEFINE(Linux, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="Linux"
-    ;;
-  *netbsd*)
-    AC_DEFINE(NetBSD, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="NetBSD"
-    ;;
-  *freebsd*)
-    AC_DEFINE(FreeBSD, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="FreeBSD"
-    # XXX temporary hack to let FreeBSD use the default paths
-    # for local stuff. We need a better solution.
-    if test x"${CPPFLAGS}" = x; then
-        CPPFLAGS="-I /usr/local/include"
-    fi
-    if test x"${LDFLAGS}" = x; then
-        LDFLAGS="-L /usr/local/lib"
-    fi
-    ;;
-  *openbsd*)
-    AC_DEFINE(OpenBSD, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="OpenBSD"
-    ;;
-  *sun*)
-    AC_DEFINE(SunOS, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="SunOS"
-    ;;
-  *darwin*)
-    AC_DEFINE(Darwin, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="Darwin"
-    ;;
-  *)
-    AC_DEFINE(Unix, 1,
-              [Define according to your operating system type.])
-    PBX_OSTYPE="Unix"
-   ;;
-esac
-AC_SUBST(PBX_OSTYPE)
-
-# This needs to be before any macros that use the C compiler
-AC_GNU_SOURCE
-
 AH_TOP(
 #ifndef ASTERISK_AUTOCONFIG_H
 #define ASTERISK_AUTOCONFIG_H
 
-#ifndef MENUSELECT
 #include "asterisk/buildopts.h"
-#endif
 
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
 )
 
 AH_BOTTOM(
@@ -145,20 +112,12 @@ AH_BOTTOM(
 )
 
 # cross-compile checks
-if test x"${build}" != x"${host}"; 
+if test "${cross_compiling}" = "yes"; 
 then
    AC_CHECK_TOOL(CC, gcc, :)
    AC_CHECK_TOOL(CXX, g++, :)
+   AC_CHECK_TOOL(LD, ld, :)
    AC_CHECK_TOOL(RANLIB, ranlib, :)
-   AC_CHECK_TOOL(AR, ar, :)
-
-   if test x"${PBX_OSTYPE}" = xWin32;
-   then
-      AC_CHECK_TOOL(NM, nm, :)
-      AC_CHECK_TOOL(WINDRES, windres, :)
-      AC_CHECK_TOOL(DLLWRAP, dllwrap, :)
-   fi
-   crossCompile="Yes"
 fi
 
 # Checks for programs.
@@ -166,21 +125,44 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_CXXCPP
+# This macro is just copied into our local acinclude.m4 from libtool.m4 so that
+# the developers regenerating the configure script don't have to install libtool.
+AST_PROG_LD    # note, does not work on FreeBSD
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
 AST_CHECK_GNU_MAKE
 
+AC_PATH_TOOL([STRIP], [strip], :)
+AC_PATH_TOOL([AR], [ar], :)
+
+GNU_LD=0
+if test "x$with_gnu_ld" = "xyes" ; then
+   GNU_LD=1
+fi
+AC_SUBST(GNU_LD)
+
 AC_PATH_PROG([GREP], [grep], :)
-AC_PATH_PROG([AR], [ar], :)
 AC_PATH_PROG([FIND], [find], :)
 AC_PATH_PROG([COMPRESS], [compress], :)
 AC_PATH_PROG([BASENAME], [basename], :)
+AC_PATH_PROG([ID], [id], :)
 AC_PATH_PROG([DIRNAME], [dirname], :)
 AC_PATH_PROG([SHELL], [sh], :)
 AC_PATH_PROG([LN], [ln], :)
 AC_PATH_PROG([DOT], [dot], :)
+AC_PATH_PROG([WGET], [wget], :)
+AC_PATH_PROG([RUBBER], [rubber], :)
+if test "${WGET}" != ":" ; then
+  DOWNLOAD=${WGET}
+else
+  AC_PATH_PROG([FETCH], [fetch], [:])
+  DOWNLOAD=${FETCH}
+fi
+AC_SUBST(DOWNLOAD)
+
+ACX_PTHREAD
 
 AC_LANG(C)
 
@@ -193,341 +175,656 @@ AC_ARG_ENABLE(dev-mode,
        esac])
 AC_SUBST(AST_DEVMODE)
 
-AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
-AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
-AST_EXT_LIB([iksemel], [iks_start_sasl], [iksemel.h], [IKSEMEL], [Iksemel Jabber Library])
-AST_EXT_LIB([nbs], [nbs_connect], [nbs.h], [NBS], [Network Broadcast Sound])
-AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
-AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
-AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC])
-AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])
-AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [osp/osp.h], [OSPTK], [OSP Toolkit], [-lcrypto -lssl])
-AST_EXT_LIB([popt], [poptStrerror], [popt.h], [POPT], [popt])
-AST_EXT_LIB([pri], [pri_call], [libpri.h], [LIBPRI], [ISDN PRI])
-AST_EXT_LIB([radiusclient-ng], [rc_read_config], [radiusclient-ng.h], [RADIUSCLIENT], [Radius Client])
-AST_EXT_LIB([speex], [speex_encode], [speex/speex.h], [SPEEX], [Speex], [-lm])
-AST_EXT_LIB([sqlite], [sqlite_exec], [sqlite.h], [SQLITE], [SQLite])
-AST_EXT_LIB([ssl], [ssl2_connect], [openssl/ssl.h], [OPENSSL], [OpenSSL], [-lcrypto])
-AST_EXT_LIB([tds], [tds_version], [tds.h], [FREETDS], [FreeTDS])
-AST_EXT_LIB([termcap], [tgetent], [], [TERMCAP], [Termcap])
-AST_EXT_LIB([tinfo], [tgetent], [], [TINFO], [Term Info])
-AST_EXT_LIB([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis], [-lm -lvorbisenc])
-AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib])
-
-EDITLINE_LIBS=""
-if test "x$TERMCAP_LIB" != "x" ; then
-  EDITLINE_LIBS="$TERMCAP_LIB"
-elif test "x$TINFO_LIB" != "x" ; then
-  EDITLINE_LIBS="$TINFO_LIB"
-elif test "x$CURSES_LIB" != "x" ; then
-  EDITLINE_LIBS="$CURSES_LIB"
-elif test "x$NCURSES_LIB" != "x" ; then
-  EDITLINE_LIBS="$NCURSES_LIB"
-else
-  echo "*** termcap support not found"
-  exit 1
-fi
-AC_SUBST(EDITLINE_LIBS)
-
-PBX_LIBOSS=0
-AC_CHECK_HEADER([linux/soundcard.h],
-               [
-               PBX_LIBOSS=1
-                AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
-               ])
-if test "$PBX_LIBOSS" = "0"; then
-   AC_CHECK_HEADER([sys/soundcard.h],
-                   [
-                  PBX_LIBossaudio=1
-                  AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
-                  ])
-fi
-if test "$PBX_LIBOSS" = "0"; then
-   AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System])
-fi
+# package option names should be in alphabetical order
+# by the --with option name, to make things easier for the users :-)
+
+AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+
+# BKTR is used for backtrace support on platforms that do not
+# have it natively.
+AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
+AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
+AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
+AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
+AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto])
+AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls])
+AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal'])
+AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
+AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
+AST_EXT_LIB_SETUP([KDE], [KDE], [kde])
+AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
+AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
+AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
+AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
+AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp])
+AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
+AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [odbc])
+AST_EXT_LIB_SETUP([OGG], [OGG], [ogg])
+AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
+AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
+AST_EXT_LIB_SETUP([POPT], [popt], [popt])
+AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
+AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
+AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
+AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
+AST_EXT_LIB_SETUP([QT], [Qt], [qt])
+AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
+AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
+AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
+AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
+AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
+AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL Secure Sockets Layer support], [ssl])
+AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds])
+AST_EXT_LIB_SETUP([TERMCAP], [Termcap], [termcap])
+AST_EXT_LIB_SETUP([TINFO], [Term Info], [tinfo])
+AST_EXT_LIB_SETUP([TONEZONE], [tonezone], [tonezone])
+AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
+AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
+AST_EXT_LIB_SETUP([ZLIB], [zlib], [z])
+AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel])
+AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel_transcode], [zaptel_transcode])
+AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel_vldtmf], [zaptel_vldtmf])
+
+# check for basic system features and functionality before
+# checking for package libraries
+
+AC_FUNC_ALLOCA
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h])
+
+AC_SYS_LARGEFILE
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_C_VOLATILE
+AC_CHECK_TYPES([ptrdiff_t])
 
-AC_SUBST([PBX_LIBOSS])
+# Checks for library functions.
+AC_FUNC_CHOWN
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ERROR_AT_LINE
+AST_FUNC_FORK
+AC_FUNC_FSEEKO
+AC_PROG_GCC_TRADITIONAL
+# XXX: these are commented out until we determine whether it matters if our malloc()
+# acts exactly like glibc's or not
+# AC_FUNC_MALLOC
+# AC_FUNC_REALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_MKTIME
+AC_FUNC_MMAP
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_SETVBUF_REVERSED
+AC_TYPE_SIGNAL
+AC_FUNC_STAT
+AC_FUNC_STRCOLL
+AC_FUNC_STRFTIME
+AC_FUNC_STRNLEN
+AC_FUNC_STRTOD
+AC_FUNC_UTIME_NULL
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf])
+
+# https support (in main/http.c) uses funopen on BSD systems,
+# fopencookie on linux
+AC_CHECK_FUNCS([funopen fopencookie])
+
+# some systems already have gethostbyname_r so we don't need to build ours in main/utils.c
+AC_CHECK_FUNCS([gethostbyname_r])
 
-if test "${PBX_OSTYPE}" = "Linux" ; then
-  AST_EXT_LIB([tonezone], [tone_zone_find], [tonezone.h], [TONEZONE], [tonezone])
+AST_C_DEFINE_CHECK([PTHREAD_RWLOCK_INITIALIZER], [PTHREAD_RWLOCK_INITIALIZER], [pthread.h])
+AST_C_DEFINE_CHECK([PTHREAD_RWLOCK_PREFER_WRITER_NP], [PTHREAD_RWLOCK_PREFER_WRITER_NP], [pthread.h])
+
+AC_MSG_CHECKING(for compiler atomic operations)
+AC_LINK_IFELSE(
+AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);]),
+AC_MSG_RESULT(yes)
+AC_DEFINE([HAVE_GCC_ATOMICS], 1, [Define to 1 if your GCC C compiler provides atomic operations.]),
+AC_MSG_RESULT(no)
+)
+
+AST_GCC_ATTRIBUTE(pure)
+AST_GCC_ATTRIBUTE(malloc)
+AST_GCC_ATTRIBUTE(const)
+AST_GCC_ATTRIBUTE(unused)
+AST_GCC_ATTRIBUTE(always_inline)
+
+AC_MSG_CHECKING(for -ffunction-sections support)
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -ffunction-sections"
+AC_COMPILE_IFELSE(
+       AC_LANG_PROGRAM([], [int x = 1;]),
+       AC_MSG_RESULT(yes)
+       [saved_LDFLAGS="${LDFLAGS}"]
+       [LDFLAGS="${LDFLAGS} -Wl,--gc-sections"]
+       AC_MSG_CHECKING(for --gc-sections support)
+       AC_LINK_IFELSE(
+               AC_LANG_PROGRAM([], [int x = 1;]),
+               AC_MSG_RESULT(yes)
+               [GC_CFLAGS="-ffunction-sections"]
+               [[GC_LDFLAGS="-Wl,--gc-sections"]],
+               AC_MSG_RESULT(no)
+       )
+       [LDFLAGS="${saved_LDFLAGS}"],
+       AC_MSG_RESULT(no)
+)
+CFLAGS="${saved_CFLAGS}"
+AC_SUBST(GC_CFLAGS)
+AC_SUBST(GC_LDFLAGS)
+
+AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
+if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+       AC_MSG_RESULT(yes)
+       AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement
 else
-  AST_EXT_LIB([tonezone], [tone_zone_find], [tonezone.h], [TONEZONE], [tonezone], [-lm])
+       AC_MSG_RESULT(no)
+       AST_DECLARATION_AFTER_STATEMENT=
 fi
+AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
 
-AC_ARG_WITH([zaptel], AC_HELP_STRING([--with-zaptel=PATH], [use Zaptel files in PATH]), [
-case ${withval} in
-     n|no)
-     USE_ZAPTEL=no
-     ;;
-     y|ye|yes)
-     ZAPTEL_MANDATORY=yes
-     ;;
-     *)
-     ZAPTEL_DIR="${withval}"
-     ZAPTEL_MANDATORY=yes
-     ;;
-esac
-])
 
-PBX_ZAPTEL=0
-if test "${USE_ZAPTEL}" != "no"; then
-   echo -n "checking for usability of zaptel.h... "
-   if test "${PBX_OSTYPE}" = "Linux" ; then
-      zapheader=linux/zaptel.h
-   else
-      zapheader=zaptel.h
-   fi
-   saved_cppflags="${CPPFLAGS}"
-   if test "x${ZAPTEL_DIR}" != "x"; then
-      CPPFLAGS="${CPPFLAGS} -I${ZAPTEL_DIR}/include"
-   fi
-   AC_COMPILE_IFELSE(
-       [
-       AC_LANG_PROGRAM(
-       [#include <${zapheader}>],
-       [struct zt_transcode_header test;])
-       ],
-       [       AC_MSG_RESULT(yes) 
-               ac_cv_zaptel_h="yes" 
-       ],
-       [       AC_MSG_RESULT(no) 
-               ac_cv_zaptel_h="no" 
-       ]
-       )
-   CPPFLAGS="${saved_cppflags}"
-   if test "${ac_cv_zaptel_h}" = "yes"; then
-       if test "${ZAPTEL_DIR}" != ""; then
-          ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
-          AC_SUBST([ZAPTEL_INCLUDE])
-       fi
-       PBX_ZAPTEL=1
-       AC_DEFINE([HAVE_ZAPTEL], 1, [Define if your system has the Zaptel headers.])
-   elif test ! -z "${ZAPTEL_MANDATORY}"; 
-   then
-      echo "***"
-      echo "*** The Zaptel installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-zaptel."
-      exit 1
-   fi
+AC_MSG_CHECKING(for sysinfo)
+AC_LINK_IFELSE(
+        AC_LANG_PROGRAM([#include <sys/sysinfo.h>],
+                        [struct sysinfo sys_info;]),
+        AC_MSG_RESULT(yes)
+        AC_DEFINE([HAVE_SYSINFO], 1, [Define to 1 if your system has sysinfo support]),
+        AC_MSG_RESULT(no)
+)
+
+AC_MSG_CHECKING(for res_ninit)
+AC_LINK_IFELSE(
+       AC_LANG_PROGRAM([#include <resolv.h>],
+                       [int foo = res_ninit(NULL);]),
+       AC_MSG_RESULT(yes)
+       AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
+       AC_MSG_CHECKING(for res_ndestroy)
+       AC_LINK_IFELSE(
+               AC_LANG_PROGRAM([#include <resolv.h>],
+                               [int foo = res_ndestroy(NULL);]),
+               AC_MSG_RESULT(yes)
+               AC_DEFINE([HAVE_RES_NDESTROY], 1, [Define to 1 if your system has the ndestroy resolver function.]),
+               AC_MSG_RESULT(no)
+       ),
+       AC_MSG_RESULT(no)
+)
+
+AST_C_DEFINE_CHECK([RTLD_NOLOAD], [RTLD_NOLOAD], [dlfcn.h])
+
+AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [IP_MTU_DISCOVER], [netinet/in.h])
+
+AC_CHECK_HEADER([libkern/OSAtomic.h],
+                [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
+
+AC_CHECK_SIZEOF(int)
+
+# do the package library checks now
+
+AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
+
+AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
+
+if test "x${host_os}" = "xlinux-gnu" ; then
+  AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
 fi
 
-AC_SUBST([PBX_ZAPTEL])
+# BSD might not have exp2, and/or log2
+AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
+AST_EXT_LIB_CHECK([LOG2L], [m], [log2l])
+AST_EXT_LIB_CHECK([EXP10L], [m], [exp10l])
+AST_EXT_LIB_CHECK([LOG10L], [m], [log10l])
+AST_EXT_LIB_CHECK([EXP2], [m], [exp2])
+AST_EXT_LIB_CHECK([LOG2], [m], [log2])
+AST_EXT_LIB_CHECK([EXP10], [m], [exp10])
+AST_EXT_LIB_CHECK([LOG10], [m], [log10])
 
 GSM_INTERNAL="yes"
+AC_SUBST(GSM_INTERNAL)
 GSM_SYSTEM="yes"
-AC_ARG_WITH([gsm], AC_HELP_STRING([--with-gsm=PATH], [use libgsm files in PATH, or 'internal']), [
-case ${withval} in
-     n|no)
-     USE_GSM=no
-     ;;
-     y|ye|yes)
-     ;;
-     internal)
-     GSM_SYSTEM="no"
-     ;;
-     *)
-     GSM_DIR="${withval}"
-     GSM_INTERNAL="no"
-     ;;
-esac
-])
-
-PBX_LIBgsm=0
-
 if test "${USE_GSM}" != "no"; then
+   if test "${GSM_DIR}" = "internal"; then
+      GSM_SYSTEM="no"
+   elif test "${GSM_DIR}" != ""; then
+      GSM_INTERNAL="no"
+   fi
    if test "${GSM_SYSTEM}" = "yes"; then
       gsmlibdir=""
       if test "x${GSM_DIR}" != "x"; then
-         gsmlibdir="-L${GSM_DIR}/lib"
+         if test -d ${GSM_DIR}/lib; then
+            gsmlibdir="-L${GSM_DIR}/lib"
+         else
+            gsmlibdir="-L${GSM_DIR}"
+         fi
       fi
       AC_CHECK_LIB([gsm], [gsm_create], AC_DEFINE_UNQUOTED([HAVE_GSM], 1,
       [Define to indicate the GSM library]), [], ${gsmlibdir})
       if test "${ac_cv_lib_gsm_gsm_create}" = "yes"; then
-        gsm_LIB="-lgsm"
-        if test "x${GSM_DIR}" != "x"; then
-           gsm_LIB="${gsmlibdir} ${gsm_LIB}"
-           gsm_INCLUDE="-I${GSM_DIR}/include"
-        fi
-        PBX_LIBgsm=1
-        GSM_INTERNAL="no"
+         if test "x${GSM_DIR}" != "x" ; then
+            AC_CHECK_HEADER([${GSM_DIR}/include/gsm.h], [GSM_HEADER_FOUND=1], [GSM_HEADER_FOUND=0])
+            AC_CHECK_HEADER([${GSM_DIR}/include/gsm/gsm.h], [GSM_GSM_HEADER_FOUND=1], [GSM_GSM_HEADER_FOUND=0])
+         else
+            AC_CHECK_HEADER([gsm.h], [GSM_HEADER_FOUND=1], [GSM_HEADER_FOUND=0])
+            AC_CHECK_HEADER([gsm/gsm.h], [GSM_GSM_HEADER_FOUND=1], [GSM_GSM_HEADER_FOUND=0])
+         fi
+         if test "${GSM_HEADER_FOUND}" = "0" ; then
+            if test "{GSM_GSM_HEADER_FOUND}" = "0" ; then
+               if test "x${GSM_MANDATORY}" = "xyes" ; then
+                  AC_MSG_NOTICE([***])
+                  AC_MSG_NOTICE([*** It appears that you do not have the gsm development package installed.])
+                  AC_MSG_NOTICE([*** Please install it to include ${GSM_DESCRIP} support, or re-run configure])
+                  AC_MSG_NOTICE([*** without explicitly specifying --with-${GSM_OPTION}])
+                  exit 1
+               fi
+            fi
+         fi
+         GSM_OK=0
+         if test "${GSM_HEADER_FOUND}" = "1" ; then
+            AC_DEFINE_UNQUOTED([HAVE_GSM_HEADER], 1, [Define to indicate that gsm.h has no prefix for its location])
+            GSM_OK=1
+         else
+            if test "${GSM_GSM_HEADER_FOUND}" = "1" ; then
+               AC_DEFINE_UNQUOTED([HAVE_GSM_GSM_HEADER], 1, [Define to indicate that gsm.h is in gsm/gsm.h])
+               GSM_OK=1
+            fi
+         fi
+         if test "${GSM_OK}" = "1" ; then
+            GSM_LIB="-lgsm"
+            if test "x${GSM_DIR}" != "x"; then
+               GSM_LIB="${gsmlibdir} ${GSM_LIB}"
+               GSM_INCLUDE="-I${GSM_DIR}/include"
+            fi
+            PBX_GSM=1
+            GSM_INTERNAL="no"
+         fi
       fi
    fi
    if test "${GSM_INTERNAL}" = "yes"; then
-      gsm_LIB="internal"
-      PBX_LIBgsm=1
-   fi
-   if test "x${PBX_LIBgsm}" = "x0"; then
-      echo "***"
-      echo "*** The GSM installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-gsm"
-      exit 1
+      PBX_GSM=1
+      AC_DEFINE_UNQUOTED([HAVE_GSM_HEADER], 1, [Define to indicate that gsm.h has no prefix for its location])
    fi
 fi
 
-AC_SUBST([gsm_LIB])
-AC_SUBST([gsm_INCLUDE])
-AC_SUBST([PBX_LIBgsm])
+AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
 
-AC_ARG_WITH([pq], AC_HELP_STRING([--with-pq=PATH],[use PostgreSQL files in PATH]),[
-case ${withval} in
-     n|no)
-     USE_PQ=no
-     ;;
-     y|ye|yes)
-     PQ_MANDATORY="yes"
-     ;;
-     *)
-     PQ_DIR="${withval}"
-     PQ_MANDATORY="yes"
-     ;;
-esac
-])
+if test "${PBX_IKSEMEL}" = 1; then
+   AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye], [gnutls/gnutls.h], [-lz -lgcrypt -lgpg-error])
+fi
 
-PBX_LIBpq=0
-PG_CONFIG=No
-if test "${USE_PQ}" != "no"; then      
-   if test "x${PQ_DIR}" != "x"; then
-      AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PQ_DIR}/bin])
-      if test x"${PG_CONFIG}" = xNo; then
-         echo "***"
-         echo "*** pg_config was not found in the path you specified:"
-         echo "*** ${PQ_DIR}/bin"
-         echo "*** Either correct the installation, or run configure"
-         echo "*** including --without-pq"
-         exit 1
+if test "${USE_IMAP_TK}" != "no"; then
+   if test "${IMAP_TK_DIR}" = "system" ; then
+      AC_MSG_NOTICE([Checking for system c-client library...])
+   elif test "${IMAP_TK_DIR}" = ""; then
+      IMAP_TK_DIR=`pwd`"/../imap-2004g"
+      if test  -n "${IMAP_TK_MANDATORY}"; then
+        AC_MSG_NOTICE([The --with-imap option does not search your system for installed])
+        AC_MSG_NOTICE([c-client library/header files. Since you did not provide a path])
+        AC_MSG_NOTICE([the configure script will assume you have placed built the c-client])
+        AC_MSG_NOTICE([files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file.])
       fi
-   else
-      AC_PATH_TOOL([PG_CONFIG], [pg_config], No)
    fi
-fi
-
-if test x"${PG_CONFIG}" != xNo; then
-   PQ_libdir=`pg_config --libdir`
-   PQ_includedir=`pg_config --includedir`
-   
-   AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PQ], 1,
-   [Define to indicate the PostgreSQL library]), [], -L${PQ_libdir} -lz)
-
-   if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
-      pq_LIB="-L${PQ_libdir} -lpq -lz"
-      pq_INCLUDE="-I${PQ_includedir}"
-      PBX_LIBpq=1
-   elif test ! -z "${PQ_MANDATORY}";
-   then
-      echo "***"
-      echo "*** The PostgreSQL installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-pq"
-      exit 1
+   if test "${IMAP_TK_DIR}" != "system" ; then
+      AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
+   fi
+   saved_cppflags="${CPPFLAGS}"
+   saved_libs="${LIBS}"
+   if test "${IMAP_TK_DIR}" = "system" ; then
+      imap_ldflags=""
+      imap_libs="-lc-client"
+      imap_include="-DUSE_SYSTEM_IMAP"
+   elif test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
+      imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
+      imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
+      imap_include="-I${IMAP_TK_DIR}/c-client"
+   fi
+   CPPFLAGS="${CPPFLAGS} ${imap_include}"
+   LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
+   AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+               [#ifdef USE_SYSTEM_IMAP
+               #include <imap/c-client.h>
+               #else
+               #include "c-client.h"
+               #endif
+               void mm_searched (MAILSTREAM *stream,unsigned long number)
+               {
+               }
+               void mm_exists (MAILSTREAM *stream,unsigned long number)
+               {
+               }
+               void mm_expunged (MAILSTREAM *stream,unsigned long number)
+               {
+               }
+               void mm_flags (MAILSTREAM *stream,unsigned long number)
+               {
+               }
+               void mm_notify (MAILSTREAM *stream,char *string,long errflg)
+               {
+               }
+               void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+               {
+               }
+               void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+               {
+               }
+               void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
+               {
+               }
+               void mm_log (char *string,long errflg)
+               {
+               }
+               void mm_dlog (char *string)
+               {
+               }
+               void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
+               {
+               }
+               void mm_critical (MAILSTREAM *stream)
+               {
+               }
+               void mm_nocritical (MAILSTREAM *stream)
+               {
+               }
+               long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
+               {
+               }
+               void mm_fatal (char *string)
+               {
+               }],
+               [
+               MAILSTREAM *foo = mail_open(NULL, "", 0);
+               ]
+       ),
+       [ac_cv_imap_tk="yes"],
+       [ac_cv_imap_tk="no"]
+   )
+   if test "${ac_cv_imap_tk}" = "yes"; then
+   AC_LINK_IFELSE(
+      AC_LANG_PROGRAM(
+         [#ifdef USE_SYSTEM_IMAP
+        #include <imap/c-client.h>
+        #else
+        #include "c-client.h"
+        #endif
+         void mm_searched (MAILSTREAM *stream,unsigned long number)
+         {
+         }
+         void mm_exists (MAILSTREAM *stream,unsigned long number)
+         {
+         }
+         void mm_expunged (MAILSTREAM *stream,unsigned long number)
+         {
+         }
+         void mm_flags (MAILSTREAM *stream,unsigned long number)
+         {
+         }
+         void mm_notify (MAILSTREAM *stream,char *string,long errflg)
+         {
+         }
+         void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+         {
+         }
+         void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+         {
+         }
+         void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
+         {
+         }
+         void mm_log (char *string,long errflg)
+         {
+         }
+         void mm_dlog (char *string)
+         {
+         }
+         void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
+         {
+         }
+         void mm_critical (MAILSTREAM *stream)
+         {
+         }
+         void mm_nocritical (MAILSTREAM *stream)
+         {
+         }
+         long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
+         {
+         }
+         void mm_fatal (char *string)
+         {
+         }],
+         [
+         long check = mail_expunge_full(NULL, "", 0);
+         ]
+      ),
+      [ac_cv_imap_tk2006="yes"],
+      [ac_cv_imap_tk2006="no"]
+  )
+  fi
+   CPPFLAGS="${saved_cppflags}"
+   LIBS="${saved_libs}"
+   if test "${ac_cv_imap_tk}" = "yes"; then
+      AC_MSG_RESULT(yes) 
+      IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
+      IMAP_TK_INCLUDE="${imap_include}"
+      PBX_IMAP_TK=1
+      AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
+      if test "${ac_cv_imap_tk2006}" = "yes"; then
+         AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
+      fi
+   else
+      AC_MSG_RESULT(no) 
    fi
 fi
-AC_SUBST([pq_INCLUDE])
-AC_SUBST([pq_LIB])
-AC_SUBST([PBX_LIBpq])
-
-NETSNMP_LIBS=
-PBX_NETSNMP=0
-AC_PATH_TOOL([NET_SNMP_CONFIG], [net-snmp-config], No)
-if test "x${NET_SNMP_CONFIG}" != "xNo" ; then
-   NETSNMP_LIBS=`${NET_SNMP_CONFIG} --agent-libs`
-   PBX_NETSNMP=1
-fi
-AC_SUBST([NETSNMP_LIBS])
-AC_SUBST([PBX_NETSNMP])
 
-AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
-AC_SUBST(PBX_H323)
-
-AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [
-                                  #include <linux/version.h>
-                                  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-                                  #include <linux/compiler.h>
-                                  #endif
-                                  ])
-AC_SUBST(PBX_IXJUSER)
+# Needed by unixodbc
+AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
 
 AC_LANG_PUSH(C++)
 
-AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[
-case ${withval} in
-     n|no)
-     USE_VPB=no
-     ;;
-     y|ye|yes)
-     VPB_MANDATORY="yes"
-     ;;
-     *)
-     VPB_DIR="${withval}"
-     VPB_MANDATORY="yes"
-     ;;
-esac
-])
-if test "${USE_VPB}" != "no"; then
-   echo -n "checking for vpb_open in -lvpb... "
+if test "${USE_KDE}" != "no"; then
+   AC_MSG_CHECKING(for crashHandler in -lkdecore)
    saved_libs="${LIBS}"
    saved_cppflags="${CPPFLAGS}"
-   if test "x${VPB_DIR}" != "x"; then
-      LIBS="${LIBS} -L${VPB_DIR}/lib"
-      CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
+   CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
+   if test -d ${KDE_DIR}/lib; then
+      kdelibdir="${KDE_DIR}/lib"
+   else
+      kdelibdir="${KDE_DIR}"
    fi
-   LIBS="${LIBS} -lvpb -lpthread"
+   LIBS="${LIBS} -L${kdelibdir} -lkdecore"
+
    AC_LINK_IFELSE(
-       [
-       AC_LANG_PROGRAM(
-       [#include <vpbapi.h>],
-       [int q = vpb_open(0,0);])
-       ],
-       [       AC_MSG_RESULT(yes) 
-               ac_cv_lib_vpb_vpb_open="yes" 
+       [AC_LANG_PROGRAM(
+                       [#include "kcrash.h"],
+                       [KCrash::defaultCrashHandler(1);])
        ],
-       [       AC_MSG_RESULT(no) 
-               ac_cv_lib_vpb_vpb_open="no" 
-       ]
-       )
+       [ac_cv_lib_kde_crash="yes"],
+       [ac_cv_lib_kde_crash="no"])
+               
    LIBS="${saved_libs}"
    CPPFLAGS="${saved_cppflags}"
-   PBX_LIBvpb=0
-   if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
-       VPB_LIB="-lvpb"
-       if test "${VPB_DIR}" != ""; then
-          VPB_LIB="-L${VPB_DIR}/lib ${VPB_LIB}"
-          VPB_INCLUDE="-I${VPB_DIR}/include"
-          AC_SUBST([VPB_INCLUDE])
-       fi
-       AC_SUBST([VPB_LIB])
-       PBX_LIBvpb=1
-       AC_DEFINE([HAVE_LIBVPB], 1, [Define if your system has the VoiceTronix (vpb) libraries.])
-   elif test ! -z "${VPB_MANDATORY}"; 
-   then
-      echo "***"
-      echo "*** The VoiceTronix (vpb) installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-vpb."
-      exit 1
+       
+   if test "${ac_cv_lib_kde_crash}" = "yes"; then
+      AC_MSG_RESULT(yes) 
+      KDE_LIB="-lkdecore -lkdeui"
+      if test "${KDE_DIR}" != ""; then
+        KDE_LIB="-L${kdelibdir} ${KDE_LIB}"
+        KDE_INCLUDE="-I${KDE_DIR}/include"
+      fi
+      PBX_KDE=1
+      AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE libraries.])
+   else
+      AC_MSG_RESULT(no) 
+   fi
+fi
+if test "${PBX_KDE}" = 1; then
+   AC_PATH_TOOL(KDEINIT, kdeinit, No)
+   if test ! x"${KDEINIT}" = xNo; then
+      KDEDIR=$(${DIRNAME} ${KDEINIT})
+      KDEDIR=$(${DIRNAME} ${KDEDIR})
    fi
+   AC_SUBST([KDEDIR])
 fi
-AC_SUBST([PBX_LIBvpb])
 
-AC_ARG_WITH([qt], AC_HELP_STRING([--with-qt=PATH],[use Qt files in PATH]),[
-case ${withval} in
-     n|no)
-     USE_QT=no
-     ;;
-     y|ye|yes)
-     QT_MANDATORY="yes"
-     ;;
-     *)
-     QT_DIR="${withval}"
-     QT_MANDATORY="yes"
-     ;;
-esac
-])
+AC_LANG_POP
+
+AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
+
+if test "${PBX_MISDN}" = 1; then
+   AST_EXT_LIB_CHECK([ISDNNET], [isdnnet], [init_manager], [mISDNuser/isdn_net.h], [-lmISDN -lpthread])
+   AST_EXT_LIB_CHECK([SUPPSERV], [suppserv], [encodeFac], [mISDNuser/suppserv.h])
+   AC_CHECK_HEADER([linux/mISDNdsp.h], [AC_DEFINE_UNQUOTED([MISDN_1_2], 1, [Build chan_misdn for mISDN 1.2 or later.])])
+fi
+
+AST_EXT_LIB_CHECK([NBS], [nbs], [nbs_connect], [nbs.h])
+
+AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
+
+NETSNMP_CONFIG=No
+if test "${USE_NETSNMP}" != "no"; then 
+   if test "x${NETSNMP_DIR}" != "x"; then
+      AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], No, [${NETSNMP_DIR}/bin])
+      if test x"${NETSNMP_CONFIG}" = xNo; then
+         AC_MSG_NOTICE([***])
+         AC_MSG_NOTICE([*** net-snmp-config was not found in the path you specified:])
+         AC_MSG_NOTICE([*** ${NETSNMP_DIR}/bin])
+         AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+         AC_MSG_NOTICE([*** including --without-netsnmp])
+         exit 1
+      fi
+   else
+      AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], No)
+   fi
+fi
+if test x"${NETSNMP_CONFIG}" != xNo; then
+   NETSNMP_libs=`${NETSNMP_CONFIG} --agent-libs`
+   
+   AC_CHECK_LIB([netsnmp], [snmp_register_callback], AC_DEFINE_UNQUOTED([HAVE_NETSNMP], 1,
+   [Define to indicate the Net-SNMP library]), [], ${NETSNMP_libs})
+
+   if test "${ac_cv_lib_netsnmp_snmp_register_callback}" = "yes"; then
+      NETSNMP_LIB="${NETSNMP_libs}"
+      PBX_NETSNMP=1
+   fi
+fi
+
+AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
+
+AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [])
+
+AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
+
+AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h], [-lexecinfo])
+
+# possible places for oss definitions
+AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
+AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [sys/soundcard.h])
+AST_EXT_LIB_CHECK([OSS], [ossaudio], [oss_ioctl_mixer], [soundcard.h])
+
+PG_CONFIG=No
+if test "${USE_PGSQL}" != "no"; then   
+   if test "x${PGSQL_DIR}" != "x"; then
+      AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PGSQL_DIR}/bin])
+      if test x"${PG_CONFIG}" = xNo; then
+         AC_MSG_NOTICE([***])
+         AC_MSG_NOTICE([*** pg_config was not found in the path you specified:])
+         AC_MSG_NOTICE([*** ${PGSQL_DIR}/bin])
+         AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+         AC_MSG_NOTICE([*** including --without-postgres])
+         exit 1
+      fi
+   else
+      AC_PATH_TOOL([PG_CONFIG], [pg_config], No)
+   fi
+fi
+if test "${PG_CONFIG}" != No; then
+   PGSQL_libdir=`${PG_CONFIG} --libdir`
+   PGSQL_includedir=`${PG_CONFIG} --includedir`
+   if test "x$?" != "x0" ; then
+      if test -n "${PGSQL_MANDATORY}" ; then
+         AC_MSG_NOTICE([***])
+         AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
+         AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+         AC_MSG_NOTICE([*** including --without-postgres])
+         exit 1
+         fi
+   else 
+      AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
+      [Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
+
+      if test "${ac_cv_lib_pq_PQexec}" = "yes"; then
+         PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
+         PGSQL_INCLUDE="-I${PGSQL_includedir}"
+         PBX_PGSQL=1
+      elif test -n "${PGSQL_MANDATORY}";
+      then
+         AC_MSG_NOTICE([***])
+         AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
+         AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+         AC_MSG_NOTICE([*** including --without-postgres])
+         exit 1
+      fi
+   fi
+fi
+
+AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])
+
+AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h])
+
+AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_new], [libss7.h])
+
+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])
+               
+       if test "${HAS_PWLIB:-unset}" != "unset"; then
+               AST_CHECK_OPENH323_PLATFORM()
+
+               PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"
+
+               AST_CHECK_PWLIB_BUILD([PWLib], [PWLIB],
+                       [Define if your system has the PWLib libraries.],
+                       [#include "ptlib.h"],
+                       [BOOL q = 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])
+       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
+
+AC_LANG_PUSH(C++)
 
-PBX_QT=0
 if test "${USE_QT}" != "no"; then
-   echo -n "checking for QDate in -lqt... "
+   AC_MSG_CHECKING(for QDate in -lqt)
    saved_libs="${LIBS}"
    saved_cppflags="${CPPFLAGS}"
    if test "x${QT_DIR}" != "x"; then
@@ -579,231 +876,228 @@ if test "${USE_QT}" != "no"; then
       if test "${QT_DIR}" != ""; then
         QT_LIB="-L${QT_DIR}/lib ${QT_LIB}"
         QT_INCLUDE="-I${QT_DIR}/include"
-        AC_SUBST([QT_INCLUDE])
       fi
-      AC_SUBST([QT_LIB])
       PBX_QT=1
-      AC_DEFINE([HAVE_LIBQT], 1, [Define if your system has the Qt library])
+      AC_DEFINE([HAVE_QT], 1, [Define if your system has the Qt library])
       AC_PATH_TOOL(QTMOC, moc, No)
-   elif test ! -z "${QT_MANDATORY}"; 
-   then
-      echo "***"
-      echo "*** The Qt installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-qt."
-      exit 1
    fi
 fi
-AC_SUBST([PBX_QT])
 
-AC_ARG_WITH([kde], AC_HELP_STRING([--with-kde=PATH],[use KDE files in PATH]),[
-case ${withval} in
-     n|no)
-     USE_KDE=no
-     ;;
-     y|ye|yes)
-     KDE_MANDATORY="yes"
-     ;;
-     *)
-     KDE_DIR="${withval}"
-     KDE_MANDATORY="yes"
-     ;;
-esac
-])
+AC_LANG_POP
 
-PBX_KDE=0
-if test "${USE_KDE}" != "no"; then
-   echo -n "checking for crashHandler in -lkdecore... "
-   saved_ldflags="${LDFLAGS}"
-   LDFLAGS="-I${KDE_DIR}/include ${LDFLAGS} -L${KDE_DIR}/lib -lkdecore"
-       AC_LINK_IFELSE(
-       [
-               AC_LANG_PROGRAM(
-               [#include "kcrash.h"],
-               [KCrash::defaultCrashHandler(1);])
-       ],
-       [ac_cv_lib_kde_crash="yes"],
-       [ac_cv_lib_kde_crash="no"])
-               
-       LDFLAGS="${saved_ldflags}"
-       
-       if test "${ac_cv_lib_kde_crash}" = "yes"; then
-               AC_MSG_RESULT(yes) 
-       else
-               AC_MSG_RESULT(no) 
-       fi
-       
-       if test "${ac_cv_lib_kde_crash}" = "yes"; then
-               KDE_LIBS="-lkdecore -lkdeui"
-               if test "${KDE_DIR}" != ""; then
-                       KDE_LIBS="-L${KDE_DIR}/lib ${KDE_LIBS}"
-                       KDE_INCLUDE="-I${KDE_DIR}/include"
-                       AC_SUBST([KDE_INCLUDE])
-               fi
-               AC_SUBST([KDE_LIBS])
-               PBX_KDE=1
-               AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE library])
-   elif test ! -z "${KDE_MANDATORY}"; 
-   then
-      echo "***"
-      echo "*** The KDE installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-kde."
-      exit 1
-   fi
+AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
+
+AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
+
+AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
+
+AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h])
+
+AST_EXT_LIB_CHECK([CRYPTO], [crypto], [AES_encrypt], [openssl/aes.h])
+
+if test "$PBX_CRYPTO" = "1";
+then
+    AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto])
 fi
-AC_SUBST([PBX_KDE])
 
-if test x"${PBX_KDE}" = x1; then
-       AC_PATH_TOOL(KDEINIT, kdeinit, No)
-       if test ! x"${KDEINIT}" = xNo; then
-       KDEDIR=$(${DIRNAME} ${KDEINIT})
-       KDEDIR=$(${DIRNAME} ${KDEDIR})
-       fi
-       AC_SUBST([KDEDIR])
+if test "$PBX_OPENSSL" = "1";
+then
+    AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-AC_LANG_POP
+AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
+if test "${PBX_FREETDS}" != "0";
+then
+    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in
+       *0.64*)
+               FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
+       ;;
+    *0.63*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
+       ;;
+    *0.62*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62"
+       ;;
+    *)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62"
+       ;;
+    esac
+fi
 
-PBX_GTK=0
-AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
-if test ! "x${GTKCONFIG}" = xNo; then
-   GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
-   GTK_LIBS=$(${GTKCONFIG} --libs gthread)
-   PBX_GTK=1
-   AC_DEFINE([HAVE_GTK], 1, [Define if your system has the GTK libraries.])
+AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
+
+AST_EXT_LIB_CHECK([TINFO], [tinfo], [tgetent], [])
+
+if test "${host_os}" != "linux-gnu" ; then
+  tonezone_extra="-lm"
 fi
-AC_SUBST(PBX_GTK)
-AC_SUBST(GTK_INCLUDE)
-AC_SUBST(GTK_LIBS)
 
-PLATFORM_PTLIB="ptlib_${OSTYPE}_${MACHTYPE}_r"
+# new tonezone, version 1.4.0
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/tonezone.h], [${tonezone_extra}], [140])
+# other case, old tonezone (0.80)
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/zaptel.h], [${tonezone_extra}], [80])
 
-AC_ARG_WITH([pwlib], AC_HELP_STRING([--with-pwlib=PATH],[use PWLib files in PATH]),[
-case ${withval} in
-     n|no)
-     USE_PWLIB=no
-     ;;
-     y|ye|yes)
-     ;;
-     *)
-     PWLIB_DIR="${withval}"
-     ;;
-esac
-])
-if test "${USE_PWLIB}" != "no"; then
-       echo -n "checking for existence of pwlib... "
-       
-       saved_ldflags="${LDFLAGS}"
-       LDFLAGS="${LDFLAGS} -L${PWLIB_DIR} -l${PLATFORM_PTLIB}"
-       
-       AC_LINK_IFELSE(
+AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc])
+
+AC_LANG_PUSH(C++)
+
+if test "${USE_VPB}" != "no"; then
+   AC_MSG_CHECKING(for vpb_open in -lvpb)
+   saved_libs="${LIBS}"
+   saved_cppflags="${CPPFLAGS}"
+   if test "x${VPB_DIR}" != "x"; then
+      if test -d ${VPB_DIR}/lib; then
+         vpblibdir=${VPB_DIR}/lib
+      else
+         vpblibdir=${VPB_DIR}
+      fi
+      LIBS="${LIBS} -L${vpblibdir}"
+      CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
+   fi
+   LIBS="${LIBS} -lvpb -lpthread"
+   AC_LINK_IFELSE(
        [
        AC_LANG_PROGRAM(
-       [#include "${PWDIR_DIR}ptime.h"],
-       [int q = PTime::IsDaylightSaving();])
+       [#include <vpbapi.h>],
+       [int q = vpb_open(0,0);])
        ],
        [       AC_MSG_RESULT(yes) 
-               ac_cv_lib_pwlib="yes" 
+               ac_cv_lib_vpb_vpb_open="yes" 
        ],
        [       AC_MSG_RESULT(no) 
-               ac_cv_lib_pwlib="no" 
+               ac_cv_lib_vpb_vpb_open="no" 
        ]
        )
-       LDFLAGS="${saved_ldflags}"
-
-       PBX_LIBPWLIB=0
-   
-   if test "${ac_cv_lib_pwlib}" = "yes"; then
-      PWLIB_LIB="-l{PLATFORM_PWLIB}"
-      if test "${PWLIB_DIR}" != ""; then
-         PWLIB_LIB="-L${PWLIB_DIR}/lib ${PWLIB_LIB}"
-                       PWLIB_INCLUDE="-I${PWLIB_DIR}/include"
-                       AC_SUBST([PWLIB_INCLUDE])
-      fi
-       AC_SUBST([PWLIB_LIB])
-       PBX_LIBPWLIB=1
-       AC_DEFINE([HAVE_LIBPWLIB], 1, [Define if your system has the pwlib libraries.])
-   elif test ! -z "${PWLIB_DIR}"; 
-   then
-      echo "***"
-      echo "*** The PWLIB installation on this system appears to be broken."
-      echo "*** Either correct the installation, or run configure"
-      echo "*** including --without-pwlib"
-      exit 1
+   LIBS="${saved_libs}"
+   CPPFLAGS="${saved_cppflags}"
+   if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
+       VPB_LIB="-lvpb"
+       if test "${VPB_DIR}" != ""; then
+          VPB_LIB="-L${vpblibdir}  ${VPB_LIB}"
+          VPB_INCLUDE="-I${VPB_DIR}/include"
+       fi
+       PBX_VPB=1
+       AC_DEFINE([HAVE_VPB], 1, [Define if your system has the VoiceTronix API libraries.])
    fi
 fi
-AC_SUBST([PBX_LIBPWLIB])
-
-PBX_CURL=0
-AC_PATH_TOOL([CURL], [curl-config], No)
-if test ! x"${CURL}" = xNo; then
-# check for version
-   CURLLIBS=$(${CURL} --libs)
-   PBX_CURL=1
-   AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
-fi
-AC_SUBST(PBX_CURL)
-AC_SUBST(CURLLIBS)
 
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h])
+AC_LANG_POP
 
-AC_SYS_LARGEFILE
+AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_CHECK_MEMBERS([struct stat.st_blksize])
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_C_VOLATILE
-AC_CHECK_TYPES([ptrdiff_t])
+# Check for various zaptel features and locations.
+# The version number, which goes into HAVE_ZAPTEL_VERSION,
+# will be used in the system headers to determine the location
+# of the zaptel.h header.
 
-# Checks for library functions.
-AC_FUNC_CHOWN
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-AC_FUNC_FSEEKO
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
-AC_FUNC_MMAP
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_SETVBUF_REVERSED
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_FUNC_STRCOLL
-AC_FUNC_STRFTIME
-AC_FUNC_STRNLEN
-AC_FUNC_STRTOD
-AC_FUNC_UTIME_NULL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strndup strnlen strrchr strsep strspn strstr strtol unsetenv utime strtoq strcasestr asprintf vasprintf])
+AST_C_DEFINE_CHECK([ZAPTEL], [ZT_TONE_DTMF_BASE], [zaptel/zaptel.h], [140])
+AST_C_DEFINE_CHECK([ZAPTEL], [ZT_DIAL_OP_CANCEL], [zaptel/zaptel.h], [90])
 
-echo -n "checking for compiler atomic operations... "
-AC_LINK_IFELSE(
-AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);]),
-AC_MSG_RESULT(yes)
-AC_DEFINE([HAVE_GCC_ATOMICS], 1, [Define to 1 if your GCC C compiler provides atomic operations.]),
-AC_MSG_RESULT(no)
-)
+# Check for VLDTMF support
+AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h])
+
+# Check for transcode support
+AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h])
+
+# On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf
+case "${host_os}" in
+    freebsd*)
+       AST_EXT_LIB_CHECK([ZAPTEL], [zaptel],, [zaptel.h],, [80])
+       AST_EXT_LIB_CHECK([ZAPTEL_VLDTMF], [zaptel],, [zaptel/zaptel.h],, [90])
+       AST_EXT_LIB_CHECK([ZAPTEL_VLDTMF], [zaptel],, [zaptel.h],, [80])
+
+       # other case, old tonezone (0.80)
+       AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel.h], [${tonezone_extra}], [80])
+       ;;
+esac
+
+EDITLINE_LIB=""
+if test "x$TERMCAP_LIB" != "x" ; then
+  EDITLINE_LIB="$TERMCAP_LIB"
+elif test "x$TINFO_LIB" != "x" ; then
+  EDITLINE_LIB="$TINFO_LIB"
+elif test "x$CURSES_LIB" != "x" ; then
+  EDITLINE_LIB="$CURSES_LIB"
+elif test "x$NCURSES_LIB" != "x" ; then
+  EDITLINE_LIB="$NCURSES_LIB"
+else
+  AC_MSG_ERROR(*** termcap support not found)
+fi
+AC_SUBST(EDITLINE_LIB)
+
+AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
+AC_SUBST(PBX_H323)
+
+AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [
+                                  #include <linux/version.h>
+                                  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+                                  #include <linux/compiler.h>
+                                  #endif
+                                  ])
+AC_SUBST(PBX_IXJUSER)
+
+PBX_GTK=0
+AC_CHECK_TOOL(GTKCONFIG, gtk-config, No)
+if test ! "x${GTKCONFIG}" = xNo; then
+   GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
+   GTK_LIB=$(${GTKCONFIG} --libs gthread)
+   PBX_GTK=1
+   AC_DEFINE([HAVE_GTK], 1, [Define if your system has the GTK libraries.])
+fi
+AC_SUBST(PBX_GTK)
+AC_SUBST(GTK_INCLUDE)
+AC_SUBST(GTK_LIB)
+
+PBX_GTK2=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+if test ! "x${PKGCONFIG}" = xNo; then
+   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
+   GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
+   PBX_GTK2=1
+   AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.])
+fi
+AC_SUBST(PBX_GTK2)
+AC_SUBST(GTK2_INCLUDE)
+AC_SUBST(GTK2_LIB)
+
+if test "${USE_CURL}" != "no"; then
+   AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
+   if test ! x"${CURL_CONFIG}" = xNo; then
+   # check for version
+      if test $(printf "%d" 0x$(${CURL_CONFIG} --vernum)) -ge $(printf "%d" 0x070907); then
+         CURL_INCLUDE=$(${CURL_CONFIG} --cflags)
+         CURL_LIB=$(${CURL_CONFIG} --libs)
+
+         AC_MSG_CHECKING(for curl_version() in curl/curl.h)
+         saved_cppflags="${CPPFLAGS}"
+         CPPFLAGS="${CPPFLAGS} ${CURL_INCLUDE}"
+         AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM(
+                [#include <curl/curl.h>],
+                    [curl_version();])
+            ],[
+                AC_MSG_RESULT(yes)
+                ac_cv_curl_h="yes"
+            ],[
+                AC_MSG_RESULT(no)
+                ac_cv_curl_h="no"
+            ]
+        )
+        CPPFLAGS="${saved_cppflags}"
+         if test "${ac_cv_curl_h}" = "yes"; then
+             PBX_CURL=1
+             AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
+         fi
+      fi
+   fi
+fi
+
+AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
+AST_CHECK_MANDATORY
 
-AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
 AC_OUTPUT
 
+if test "x${silent}" != "xyes" ; then
 echo
 echo "               .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=..      "
 echo "            .\$7\$7..          .7\$\$7:.    "
@@ -827,12 +1121,11 @@ echo "   \$\$\$\$\$\$\$.           .7\$\$\$\$\$\$  \$\$      "
 echo "     \$\$\$\$\$\$\$\$\$\$\$\$7\$\$\$\$\$\$\$\$\$.\$\$\$\$\$\$      "
 echo "       \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$.                "
 echo
+fi
 
-echo "Package configured for: "
-echo " OS type  : $PBX_OSTYPE"
-echo " Host CPU : $host_cpu"
-if test "x${crossCompile}" = xYes; then
-   echo ""
-   echo " Cross Compilation = YES"
-   echo " Target            = ${host}"
+AC_MSG_NOTICE(Package configured for: )
+AC_MSG_NOTICE( OS type  : $host_os)
+AC_MSG_NOTICE( Host CPU : $host_cpu)
+if test "${cross_compiling}" = "yes"; then
+   AC_MSG_NOTICE( Cross Compilation = YES)
 fi