Merged revisions 136541 via svnmerge from
[asterisk/asterisk.git] / configure.ac
index 172b3d3..1188619 100644 (file)
@@ -35,11 +35,13 @@ case "${host_os}" in
 
      *)
      ac_default_prefix=/usr
-     if test ${sysconfdir} = '${prefix}/etc'; then
-        sysconfdir=/etc
-     fi
-     if test ${mandir} = '${prefix}/man'; then
-        mandir=/usr/share/man
+     if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
+        if test ${sysconfdir} = '${prefix}/etc'; then
+           sysconfdir=/etc
+        fi
+        if test ${mandir} = '${prefix}/man'; then
+           mandir=/usr/share/man
+        fi
      fi
      ;;
 esac
@@ -207,9 +209,13 @@ 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([DAHDI], [DAHDI], [dahdi])
+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([HOARD], [Hoard Memory Allocator], [hoard])
 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])
@@ -231,10 +237,15 @@ 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([RESAMPLE], [LIBRESAMPLE], [resample])
+AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
 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([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([OPENAIS], [OpenAIS], [openais])
 AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
 AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
 AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
@@ -250,16 +261,6 @@ 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 Transcoder Support], [zaptel_transcode])
-AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel VLDTMF Support], [zaptel_vldtmf])
-AST_EXT_LIB_SETUP([ZAPTEL_HWGAIN], [Zaptel Hardware Gain Support], [zaptel_hwgain])
-AST_EXT_LIB_SETUP([ZAPTEL_ECHOCANPARAMS], [Zaptel Echo Canceler Parameter Support], [zaptel_echocanparams])
-AST_EXT_LIB_SETUP([ZAPTEL_CHANALARMS], [Zaptel Channel Alarm Support], [zaptel_chanalarms])
-
-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
@@ -268,7 +269,7 @@ 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_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 arpa/nameser.h])
 
 AC_CHECK_HEADERS([winsock.h winsock2.h])
 
@@ -301,7 +302,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
@@ -330,8 +330,18 @@ AC_CHECK_HEADER([sys/poll.h],
    [HAS_POLL=1]
    AC_DEFINE([HAVE_SYS_POLL_H], 1, [Define to 1 if your system has working sys/poll.h]),
    )
+
+AC_ARG_ENABLE(internal-poll,
+       [  --enable-internal-poll       Use Asterisk's poll implementation],
+       [case "${enableval}" in
+               y|ye|yes) HAS_POLL="";;
+               n|no) HAS_POLL="${HAS_POLL}" ;;
+               *) AC_MSG_ERROR(bad value ${enableval} for --enable-internal-poll) ;;
+       esac])
 AC_SUBST(HAS_POLL)
 
+
+
 # https support (in main/http.c) uses funopen on BSD systems,
 # fopencookie on linux
 AC_CHECK_FUNCS([funopen fopencookie])
@@ -414,20 +424,20 @@ 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
+#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(
@@ -443,6 +453,8 @@ AST_GCC_ATTRIBUTE(const)
 AST_GCC_ATTRIBUTE(unused)
 AST_GCC_ATTRIBUTE(always_inline)
 AST_GCC_ATTRIBUTE(deprecated)
+AST_GCC_ATTRIBUTE(sentinel)
+AST_GCC_ATTRIBUTE(warn_unused_result)
 
 AC_MSG_CHECKING(for -ffunction-sections support)
 saved_CFLAGS="${CFLAGS}"
@@ -477,6 +489,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(
@@ -487,16 +508,38 @@ AC_LINK_IFELSE(
         AC_MSG_RESULT(no)
 )
 
+AC_SEARCH_LIBS(res_9_ninit, resolv)
 AC_MSG_CHECKING(for res_ninit)
 AC_LINK_IFELSE(
-       AC_LANG_PROGRAM([#include <resolv.h>],
+       AC_LANG_PROGRAM([
+                       #ifdef HAVE_SYS_SOCKET_H
+                       #include <sys/socket.h>
+                       #endif
+                       #ifdef HAVE_NETINET_IN_H
+                       #include <netinet/in.h>
+                       #endif
+                       #ifdef HAVE_ARPA_NAMESER_H
+                       #include <arpa/nameser.h>
+                       #endif
+                       #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_SEARCH_LIBS(res_9_ndestroy, resolv)
        AC_MSG_CHECKING(for res_ndestroy)
        AC_LINK_IFELSE(
-               AC_LANG_PROGRAM([#include <resolv.h>],
-                               [int foo = res_ndestroy(NULL);]),
+               AC_LANG_PROGRAM([
+                               #ifdef HAVE_SYS_SOCKET_H
+                               #include <sys/socket.h>
+                               #endif
+                               #ifdef HAVE_NETINET_IN_H
+                               #include <netinet/in.h>
+                               #endif
+                               #ifdef HAVE_ARPA_NAMESER_H
+                               #include <arpa/nameser.h>
+                               #endif
+                               #include <resolv.h>],
+                               [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)
@@ -523,6 +566,8 @@ if test "x${host_os}" = "xlinux-gnu" ; then
   AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
 fi
 
+AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
+
 # BSD might not have exp2, and/or log2
 AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
 AST_EXT_LIB_CHECK([LOG2L], [m], [log2l])
@@ -571,7 +616,7 @@ 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])
+AST_C_COMPILE_CHECK([GETIFADDRS], [struct ifaddrs *p; getifaddrs(&p)], [ifaddrs.h], , [getifaddrs() support])
 
 GSM_INTERNAL="yes"
 AC_SUBST(GSM_INTERNAL)
@@ -648,167 +693,525 @@ 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])
@@ -904,9 +1307,26 @@ AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.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([PRI], [pri], [pri_get_version], [libpri.h])
+
+AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])
+
+AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])
+
+AST_C_COMPILE_CHECK([SPANDSP], [
+               #if SPANDSP_RELEASE_DATE < 20080516
+               #error "spandsp 0.0.5 or greater is required"
+               #endif
+       ], [spandsp/version.h], , [minimum version of SpanDSP])
+
+if test "x${PBX_SPANDSP}" = "x1" ; then
+       # We found the correct version in the header, now let's make sure it links
+       # properly, and that libtiff is available
+       PBX_SPANDSP=0
+       AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
+fi
 
-AST_EXT_LIB_CHECK([SS7], [ss7], [isup_cqr], [libss7.h])
+AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
 
 if test "${USE_PWLIB}" != "no"; then
        if test -n "${PWLIB_DIR}"; then
@@ -944,15 +1364,50 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
                [${PWLIB_INCLUDE}], [${PWLIB_LIB}])
 fi
 
-LUA_INCLUDE="-I/usr/include/lua5.1"
-LUA_LIB="-llua5.1"
 AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h]) 
 
 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
 
+# This is a bit complex... in reality, Asterisk's AIS support is dependent on finding
+# *any* implementation of AIS, not just OpenAIS. However, the configure script needs
+# to know the specifics of each possible implementation, and then represent the one
+# that was found as 'AIS'.
+
+PBX_AIS=0
+
+# OpenAIS installs its libraries into /usr/lib/openais by default, so check there
+
+AST_EXT_LIB_CHECK([OPENAIS], [SaClm], [saClmInitialize], [openais/saClm.h], [-L/usr/lib/openais])
+
+if test "${PBX_OPENAIS}" = 1; then
+   PBX_AIS=1
+   if test -n "${OPENAIS_DIR}"; then
+      AIS_INCLUDE="${OPENAIS_INCLUDE}/openais"
+      AIS_LIB="-lSaEvt ${OPENAIS_LIB}"
+   else
+      AIS_INCLUDE="-I/usr/include/openais"
+      AIS_LIB="-lSaClm -lSaEvt -L/usr/lib/openais"
+   fi
+fi
+
+AC_SUBST(PBX_AIS)
+AC_SUBST(AIS_INCLUDE)
+AC_SUBST(AIS_LIB)
+
 AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
 
+# See if the main speex library contains the preprocess functions
+AST_EXT_LIB_CHECK([SPEEX_PREPROCESS], [speex], [speex_preprocess_ctl], [speex/speex.h], [-lm])
+if test "${PBX_SPEEX_PREPROCESS}" = 1; then
+   PBX_SPEEX_PREPROCESS=1
+fi
+
 AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm])
+if test "${PBX_SPEEXDSP}" = 1; then
+   PBX_SPEEX_PREPROCESS=1
+fi
+
+AC_SUBST(PBX_SPEEX_PREPROCESS)
 
 AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
 
@@ -970,24 +1425,11 @@ then
     AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
 fi
 
-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
+AST_EXT_TOOL_CHECK([GMIME], [gmime])
+
+AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
+
+AST_EXT_LIB_CHECK([FREETDS], [sybdb], [dbinit], [sybdb.h])
 
 AST_EXT_LIB_CHECK([TERMCAP], [termcap], [tgetent], [])
 
@@ -997,10 +1439,7 @@ if test "${host_os}" != "linux-gnu" ; then
   tonezone_extra="-lm"
 fi
 
-# 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])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])
 
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
 
@@ -1052,41 +1491,6 @@ AC_LANG_POP
 
 AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
 
-# 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.
-
-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])
-
-# Check for VLDTMF support
-AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h])
-
-# 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 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])
-
-       # 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"
@@ -1127,7 +1531,10 @@ AC_CHECK_HEADER([linux/videodev.h],
 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])
 
-AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.]))
+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
 
 PBX_GTK=0
 AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])