Fix a typo
[asterisk/asterisk.git] / configure.ac
index d2bd34c..498bf69 100644 (file)
@@ -8,11 +8,7 @@
 
 AC_PREREQ(2.60)
 
-m4_define([PBX_VERSION],
-          m4_bpatsubst(m4_esyscmd([build_tools/make_version .]),
-                       [\([0-9.]*\)\(\w\|\W\)*],
-                       [\1]))
-AC_INIT(asterisk, PBX_VERSION, www.asterisk.org)
+AC_INIT(asterisk, 1.6, www.asterisk.org)
 
 # cross-compile macros
 AC_CANONICAL_BUILD
@@ -72,6 +68,8 @@ AC_SUBST(HOST_CPU)
 AC_SUBST(HOST_VENDOR)
 AC_SUBST(HOST_OS)
 
+WINARCH=0
+
 case "${host_os}" in
      freebsd*)
      OSARCH=FreeBSD
@@ -85,12 +83,21 @@ case "${host_os}" in
      solaris*)
      OSARCH=SunOS
      ;;
+     mingw32)
+     OSARCH=mingw32
+     WINARCH=1
+     ;;
+     cygwin)
+     OSARCH=cygwin
+     WINARCH=1
+     ;;
      *)
      OSARCH=${host_os}
      ;;
 esac
 
 AC_SUBST(OSARCH)
+AC_SUBST(WINARCH)
 
 #  check for uname
 AC_PATH_TOOL([UNAME], [uname], No)
@@ -154,6 +161,7 @@ AC_PATH_PROG([LN], [ln], :)
 AC_PATH_PROG([DOT], [dot], :)
 AC_PATH_PROG([WGET], [wget], :)
 AC_PATH_PROG([RUBBER], [rubber], :)
+AC_PATH_PROG([KPATHSEA], [kpsewhich], :)
 if test "${WGET}" != ":" ; then
   DOWNLOAD=${WGET}
 else
@@ -162,6 +170,11 @@ else
 fi
 AC_SUBST(DOWNLOAD)
 
+AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
+if test "${SOXMIX}" != ":" ; then
+       AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])
+fi
+
 ACX_PTHREAD
 
 AC_LANG(C)
@@ -175,8 +188,15 @@ AC_ARG_ENABLE(dev-mode,
        esac])
 AC_SUBST(AST_DEVMODE)
 
-# package option names should be in alphabetical order
-# by the --with option name, to make things easier for the users :-)
+# AST_EXT_LIB_SETUP is used to tell configure to handle variables for
+# various packages.
+# $1 is the prefix for the variables in makeopts and autoconfig.h
+# $2 is the short comment, $4 is the long comment
+# $3 is the name used in --with- or --without- flags for configure.
+#
+# Package option names should be in alphabetical order
+# by the --with option name (the third field),
+# to make things easier for the users.
 
 AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
 
@@ -187,11 +207,17 @@ 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([GSM], [GSM], [gsm], [, or 'internal'])
+AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
+AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise])
+AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
+AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
+AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
+AST_EXT_LIB_SETUP([ICONV], [Iconv Library], [iconv])
 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([JACK], [Jack Audio Connection Kit], [jack])
+AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -203,15 +229,18 @@ 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([POPT], [popt], [popt])
+AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
 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([SDL], [Sdl], [sdl])
+AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
 AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
+AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
 AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
 AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
 AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
@@ -223,14 +252,9 @@ AST_EXT_LIB_SETUP([TONEZONE], [tonezone], [tonezone])
 AST_EXT_LIB_SETUP([USB], [usb], [usb])
 AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
 AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
+AST_EXT_LIB_SETUP([X11], [X11 support], [x11])
 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])
-
-AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
-AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
-AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
 
 # check for basic system features and functionality before
 # checking for package libraries
@@ -272,7 +296,6 @@ AC_PROG_GCC_TRADITIONAL
 # AC_FUNC_MALLOC
 # AC_FUNC_REALLOC
 AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
 AC_FUNC_MMAP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED
@@ -287,6 +310,8 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf])
 
 AC_CHECK_FUNCS([glob])
+
+AC_MSG_CHECKING(for timersub in time.h)
 AC_LINK_IFELSE(
        AC_LANG_PROGRAM([#include <sys/time.h>],
                [struct timeval *a; timersub(a, a, a);]),
@@ -305,7 +330,10 @@ AC_SUBST(HAS_POLL)
 # fopencookie on linux
 AC_CHECK_FUNCS([funopen fopencookie])
 
+AC_CHECK_FUNCS([inet_aton])
+
 # check if we have IP_PKTINFO constant defined
+AC_MSG_CHECKING(for IP_PKTINFO)
 AC_LINK_IFELSE(
                AC_LANG_PROGRAM([#include <netinet/in.h>],
                                                [int pi = IP_PKTINFO;]),
@@ -361,22 +389,39 @@ then
 fi
 
 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])
 
-if test "${cross_compiling}" = "no";
-then
-AC_MSG_CHECKING(for working epoll support)
+AC_MSG_CHECKING(for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h)
 AC_LINK_IFELSE(
-AC_LANG_PROGRAM([#include <sys/epoll.h>], [int res = epoll_create(10);
-                                         if (res < 0)
-                                            return 1;
-                                         close (res);
-                                         return 0;]),
+AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;]),
 AC_MSG_RESULT(yes)
-AC_DEFINE([HAVE_EPOLL], 1, [Define to 1 if your system has working epoll support.]),
+AC_DEFINE([HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP], 1, [Define to 1 if your system defines PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h]),
 AC_MSG_RESULT(no)
 )
-fi
+
+AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h)
+AC_LINK_IFELSE(
+AC_LANG_PROGRAM([#include <pthread.h>], [int a = PTHREAD_MUTEX_RECURSIVE_NP;]),
+AC_MSG_RESULT(yes)
+AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], 1, [Define to 1 if your system defines PTHREAD_MUTEX_RECURSIVE_NP in pthread.h]),
+AC_MSG_RESULT(no)
+)
+
+AST_C_DEFINE_CHECK([PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [pthread.h])
+
+#if test "${cross_compiling}" = "no";
+#then
+#AC_MSG_CHECKING(for working epoll support)
+#AC_LINK_IFELSE(
+#AC_LANG_PROGRAM([#include <sys/epoll.h>], [int res = epoll_create(10);
+#                                        if (res < 0)
+#                                           return 1;
+#                                        close (res);
+#                                        return 0;]),
+#AC_MSG_RESULT(yes)
+#AC_DEFINE([HAVE_EPOLL], 1, [Define to 1 if your system has working epoll support.]),
+#AC_MSG_RESULT(no)
+#)
+#fi
 
 AC_MSG_CHECKING(for compiler atomic operations)
 AC_LINK_IFELSE(
@@ -426,6 +471,15 @@ else
 fi
 AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
 
+AC_MSG_CHECKING(for -fno-strict-overflow)
+if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+   AC_MSG_RESULT(yes)
+   AST_NO_STRICT_OVERFLOW=-fno-strict-overflow
+else
+       AC_MSG_RESULT(no)
+       AST_NO_STRICT_OVERFLOW=
+fi
+AC_SUBST(AST_NO_STRICT_OVERFLOW)
 
 AC_MSG_CHECKING(for sysinfo)
 AC_LINK_IFELSE(
@@ -520,6 +574,8 @@ AST_EXT_LIB_CHECK([STRTOD], [c], [strtod], [stdlib.h])
 AST_EXT_LIB_CHECK([FLOOR], [m], [floor])
 AST_EXT_LIB_CHECK([CEIL], [m], [ceil])
 
+AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h])
+
 GSM_INTERNAL="yes"
 AC_SUBST(GSM_INTERNAL)
 GSM_SYSTEM="yes"
@@ -586,223 +642,542 @@ if test "${USE_GSM}" != "no"; then
    fi
 fi
 
+if test "${host_os}" != "linux-gnu" ; then
+  AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
+else
+  PBX_ICONV=1
+fi
+
 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
 
 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
-   fi
-   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
+       saved_cppflags="${CPPFLAGS}"
+       saved_libs="${LIBS}"
+       switch_to_system_on_failure="no"
+       if test "${IMAP_TK_DIR}" = ""; then
+               IMAP_TK_DIR=`pwd`"/../imap-2004g"
+               switch_to_system_on_failure="yes"
+       fi
+       if test "${IMAP_TK_DIR}" != "system"; then
+               AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
+               if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
+               imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
+               fi
+               imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
+               imap_include="-I${IMAP_TK_DIR}/c-client"
+       CPPFLAGS="${CPPFLAGS} ${imap_include}"
+               LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
+               AC_LINK_IFELSE(
+               AC_LANG_PROGRAM(
+                               [#include "c-client.h"
+                               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(
+                                       [#include "c-client.h"
+                                       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}" = "no"; then
+                       AC_MSG_RESULT(no)
+                       if test "${switch_to_system_on_failure}" = "yes"; then
+                               IMAP_TK_DIR="system"
+                       else #This means they specified a directory. Search for a package installation there too
+                               AC_MSG_CHECKING([for system c-client library...])
+                               CPPFLAGS="${saved_cppflags}"
+                               LIBS="${saved_libs}"
+                               imap_include="-I${IMAP_TK_DIR}/include"
+                               imap_ldflags="-L${IMAP_TK_DIR}/lib"
+                               imap_libs="-lc-client"
+                               CPPFLAGS="${CPPFLAGS} ${imap_include}"
+                               LIBS="${LIBS} ${imap_libs} ${imap_ldflags}"
+                               AC_LINK_IFELSE(
+                               AC_LANG_PROGRAM(
+                                               [#include "c-client.h"
+                                               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(
+                                                       [#include "c-client.h"
+                                                       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
+                       fi
+               fi
+       fi 
+       if test "${IMAP_TK_DIR}" = "system"; then
+               #We will enter here if user specified "system" or if any of above checks failed
+               AC_MSG_CHECKING([for system c-client library...])
+               CPPFLAGS="${saved_cppflags}"
+               LIBS="${saved_libs}"
+               imap_ldflags=""
+               imap_libs="-lc-client"
+               imap_include="-DUSE_SYSTEM_IMAP" #Try the imap directory first
+               CPPFLAGS="${CPPFLAGS} ${imap_include}"
+               LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
+               AC_LINK_IFELSE(
+               AC_LANG_PROGRAM(
+                               [#include <stdio.h>
+                               #include <imap/c-client.h>
+                               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(
+                                       [#include <stdio.h>
+                                       #include <imap/c-client.h>
+                                       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"]
+                       )
+               else #looking in imap directory didn't work, try c-client
+                       imap_ldflags=""
+                       imap_libs="-lc-client"
+                       imap_include="-DUSE_SYSTEM_CCLIENT"
+                       CPPFLAGS="${saved_cppflags}"
+                       LIBS="${saved_libs}"
+                       CPPFLAGS="${CPPFLAGS} ${imap_include}"
+                       LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
+                       AC_LINK_IFELSE(
+                       AC_LANG_PROGRAM(
+                                       [#include <stdio.h>
+                                       #include <c-client/c-client.h>
+                                       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(
+                                               [#include <stdio.h>
+                                               #include <c-client/c-client.h>
+                                               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
+               fi
+       fi
+       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
+       CPPFLAGS="${saved_cppflags}"
+       LIBS="${saved_libs}"
 fi
 
+AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h])
+
 # Needed by unixodbc
 AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
 
-AC_LANG_PUSH(C++)
-
-if test "${USE_KDE}" != "no"; then
-   AC_MSG_CHECKING(for crashHandler in -lkdecore)
-   saved_libs="${LIBS}"
-   saved_cppflags="${CPPFLAGS}"
-   CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
-   if test -d ${KDE_DIR}/lib; then
-      kdelibdir="${KDE_DIR}/lib"
-   else
-      kdelibdir="${KDE_DIR}"
-   fi
-   LIBS="${LIBS} -L${kdelibdir} -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"])
-               
-   LIBS="${saved_libs}"
-   CPPFLAGS="${saved_cppflags}"
-       
-   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_LANG_POP
+AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_initialize], [ldap.h])
 
 AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
 
@@ -818,33 +1193,11 @@ 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_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-libs],
+[#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>],
+[int callback = snmp_register_callback(0, 0, NULL, NULL)])
 
 AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 
@@ -852,7 +1205,10 @@ 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])
+# Non-glibc platforms require libexecinfo for backtrace support
+AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h])
+# Linux, however, has backtrace directly in glibc
+AST_EXT_LIB_CHECK([BKTR], [c], [backtrace], [execinfo.h])
 
 # possible places for oss definitions
 AST_EXT_LIB_CHECK([OSS], [ossaudio], [], [linux/soundcard.h])
@@ -887,10 +1243,10 @@ if test "${PG_CONFIG}" != No; then
          exit 1
          fi
    else 
-      AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
+      AC_CHECK_LIB([pq], [PQescapeStringConn], 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
+      if test "${ac_cv_lib_pq_PQescapeStringConn}" = "yes"; then
          PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
          PGSQL_INCLUDE="-I${PGSQL_includedir}"
          PBX_PGSQL=1
@@ -907,7 +1263,9 @@ 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([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
+
+AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
 
 AST_EXT_LIB_CHECK([SS7], [ss7], [isup_cqr], [libss7.h])
 
@@ -947,70 +1305,6 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
                [${PWLIB_INCLUDE}], [${PWLIB_LIB}])
 fi
 
-AC_LANG_PUSH(C++)
-
-if test "${USE_QT}" != "no"; then
-   AC_MSG_CHECKING(for QDate in -lqt)
-   saved_libs="${LIBS}"
-   saved_cppflags="${CPPFLAGS}"
-   if test "x${QT_DIR}" != "x"; then
-      LIBS="${LIBS} -L${QT_DIR}/lib"
-      CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
-   fi
-   LIBS="${LIBS} -lqt"
-   qtlib="qt"
-   AC_LINK_IFELSE(
-       [
-               AC_LANG_PROGRAM(
-               [#include <qt3/qdatetime.h>],
-               [QDate date();])
-       ],
-       [ac_cv_lib_qt_qt_date="yes"],
-       [ac_cv_lib_qt_qt_date="no"])
-   LIBS="${saved_libs}"
-   CPPFLAGS="${saved_cppflags}"
-       
-   if test "${ac_cv_lib_qt_qt_date}" = "no"; then
-      saved_libs="${LIBS}"
-      saved_cppflags="${CPPFLAGS}"
-      if test "x${QT_DIR}" != "x"; then
-        LIBS="${LIBS} -L${QT_DIR}/lib"
-        CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
-      fi
-      LIBS="${LIBS} -lqt-mt"
-      qtlib="qt-mt"    
-      AC_LINK_IFELSE(
-               [
-                       AC_LANG_PROGRAM(
-                       [#include <qt3/qdatetime.h>],
-                       [QDate date();])
-               ],
-               [ac_cv_lib_qt_qt_date="yes"],
-               [ac_cv_lib_qt_qt_date="no"])
-      LIBS="${saved_libs}"
-      CPPFLAGS="${saved_cppflags}"
-   fi  
-
-   if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
-      AC_MSG_RESULT(yes) 
-   else
-      AC_MSG_RESULT(no) 
-   fi
-       
-   if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
-      QT_LIB="-l${qtlib}"
-      if test "${QT_DIR}" != ""; then
-        QT_LIB="-L${QT_DIR}/lib ${QT_LIB}"
-        QT_INCLUDE="-I${QT_DIR}/include"
-      fi
-      PBX_QT=1
-      AC_DEFINE([HAVE_QT], 1, [Define if your system has the Qt library])
-      AC_PATH_TOOL(QTMOC, moc, No)
-   fi
-fi
-
-AC_LANG_POP
-
 LUA_INCLUDE="-I/usr/include/lua5.1"
 LUA_LIB="-llua5.1"
 AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) 
@@ -1019,6 +1313,8 @@ AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-n
 
 AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
 
+AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm])
+
 AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
 
 AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h])
@@ -1035,6 +1331,8 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
+AST_EXT_TOOL_CHECK([GMIME], [gmime])
+
 AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
 if test "${PBX_FREETDS}" != "0";
 then
@@ -1063,9 +1361,9 @@ if test "${host_os}" != "linux-gnu" ; then
 fi
 
 # new tonezone, version 1.4.0
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/tonezone.h], [${tonezone_extra}], [140])
+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])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/zaptel.h], [${tonezone_extra}], [], [80])
 
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
 
@@ -1128,18 +1426,30 @@ AST_C_DEFINE_CHECK([ZAPTEL], [ZT_DIAL_OP_CANCEL], [zaptel/zaptel.h], [90])
 # Check for VLDTMF support
 AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h])
 
-# Check for transcode support
+# Check for echo canceler parameters support
+AST_C_DEFINE_CHECK([ZAPTEL_ECHOCANPARAMS], [ZT_ECHOCANCEL_PARAMS], [zaptel/zaptel.h])
+
+# Check for transcoder support
 AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h])
 
+# Check for hwgain support
+AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [ZT_SET_HWGAIN], [zaptel/zaptel.h])
+
+# Check for neon mwi support
+AST_C_DEFINE_CHECK([ZAPTEL_NEONMWI], [ZT_EVENT_NEONMWI_ACTIVE], [zaptel/zaptel.h])
+
+# Check for channel alarm support
+AST_C_COMPILE_CHECK([ZAPTEL_CHANALARMS], [size_t foo = sizeof(struct zt_params_v1)], [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])
+       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])
+       AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel.h], [${tonezone_extra}],, [80])
        ;;
 esac
 
@@ -1172,20 +1482,24 @@ AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [
 AC_SUBST(PBX_IXJUSER)
 
 AST_EXT_TOOL_CHECK([SDL], [sdl])
-AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL/SDL_image.h], [${SDL_LIB}])
+AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
 AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
 
-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.])
+# possible places for video4linux version 1
+AC_CHECK_HEADER([linux/videodev.h],
+       [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
+
+# possible places for X11
+AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path])
+AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6])
+
+if test "${cross_compiling}" = "no";
+then
+  AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.]))
 fi
-AC_SUBST(PBX_GTK)
-AC_SUBST(GTK_INCLUDE)
-AC_SUBST(GTK_LIB)
+
+PBX_GTK=0
+AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])
 
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)