diff --git a/acinclude.m4 b/acinclude.m4
index 6fc394a7e..bb389eaeb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,3 +1,7 @@
+# Various support functions for configure.ac in asterisk
+#
+
+# Helper function to check for gcc attributes.
 # AST_GCC_ATTRIBUTE([attribute name])
 
 AC_DEFUN([AST_GCC_ATTRIBUTE],
@@ -11,35 +15,43 @@ AC_COMPILE_IFELSE(
 	AC_MSG_RESULT(no))
 ])
 
-# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
+# Helper function to setup variables for a package.
+# $1 -> the package name. Used in configure.ac and also as a prefix
+#	for the variables ($1_DIR, $1_INCLUDE, $1_LIB) in makeopts
+# $3 ->	option name, used in --with-$3 or --without-$3 when calling configure.
+# $2 and $4 are just text describing the package (short and long form)
+
+# AST_EXT_LIB_SETUP([package], [short description], [configure option name], [long description])
 
 AC_DEFUN([AST_EXT_LIB_SETUP],
 [
-$1_DESCRIP="$2"
-$1_OPTION="$3"
-AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
-case ${withval} in
-     n|no)
-     USE_$1=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} $1"
-     ;;
-     *)
-     $1_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} $1"
-     ;;
-esac
-])
-PBX_$1=0
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([$1_DIR])
-AC_SUBST([PBX_$1])
+    $1_DESCRIP="$2"
+    $1_OPTION="$3"
+    AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),
+    [
+	case ${withval} in
+	n|no)
+	USE_$1=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} $1"
+	;;
+	*)
+	$1_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} $1"
+	;;
+	esac
+    ])
+    PBX_$1=0
+    AC_SUBST([$1_LIB])
+    AC_SUBST([$1_INCLUDE])
+    AC_SUBST([$1_DIR])
+    AC_SUBST([PBX_$1])
 ])
 
 # Check whether any of the mandatory modules are not present, and
-# print error messages in case.
+# print error messages in case. The mandatory list is built using
+# --with-* arguments when invoking configure.
 
 AC_DEFUN([AST_CHECK_MANDATORY],
 [
@@ -61,16 +73,22 @@ AC_DEFUN([AST_CHECK_MANDATORY],
 	AC_MSG_RESULT(ok)
 ])
 
-#-- The following two tests are only performed if PBX_$1 != 1,
-#   so you can use multiple tests and stop at the first matching one.
-#   On success, set PBX_$1 = 1, and also #define HAVE_$1 1
-#   and #define HAVE_$1_VERSION ${last_argument} so you can tell which
-#   test succeeded.
-#   They should be called after AST_EXT_LIB_SETUP($1, ...)
+# The next three functions check for the availability of a given package.
+# AST_C_DEFINE_CHECK looks for the presence of a #define in a header file,
+# AST_EXT_LIB_CHECK looks for a symbol in a given library, or at least
+#	for the presence of a header file.
+# AST_EXT_TOOL_CHECK looks for a symbol in using $1-config to determine CFLAGS and LIBS
+#
+# They are only run if PBX_$1 != 1 (where $1 is the package),
+# so you can call them multiple times and stop at the first matching one.
+# On success, they both set PBX_$1 = 1, set $1_INCLUDE and $1_LIB as applicable,
+# and also #define HAVE_$1 1 and #define HAVE_$1_VERSION ${last_argument}
+# in autoconfig.h so you can tell which test succeeded.
+# They should be called after AST_EXT_LIB_SETUP($1, ...)
 
 # Check if a given macro is defined in a certain header.
 
-# AST_C_DEFINE_CHECK([package symbol name], [macro name], [header file], [version])
+# AST_C_DEFINE_CHECK([package], [macro name], [header file], [version])
 AC_DEFUN([AST_C_DEFINE_CHECK],
 [
     if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
@@ -99,7 +117,7 @@ AC_DEFUN([AST_C_DEFINE_CHECK],
 # in a library, or, if no function is supplied, only check for the
 # existence of the header files.
 
-# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [version])
+# AST_EXT_LIB_CHECK([package], [library], [function], [header], [additional LIB data], [version])
 AC_DEFUN([AST_EXT_LIB_CHECK],
 [
 if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
@@ -152,21 +170,22 @@ fi
 ])
 
 
-# check for a tool using xxx-config
-# AST_EXT_TOOL_CHECK([package symbol name], [package library name], [symbol], [version])
+# Check for a package using $2-config. Similar to AST_EXT_LIB_CHECK,
+# but use $2-config to determine cflags and libraries to use.
+
+# AST_EXT_TOOL_CHECK([package], [tool name], [symbol], [version])
 AC_DEFUN([AST_EXT_TOOL_CHECK],
 [
-PBX_$1=0
-AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
-if test ! "x${CONFIG_$1}" = xNo; then
-   $1_INCLUDE=$(${CONFIG_$1} --cflags $3)
-   $1_LIB=$(${CONFIG_$1} --libs $3)
-   PBX_$1=1
-   AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
-fi
-AC_SUBST(PBX_$1)
-AC_SUBST($1_INCLUDE)
-AC_SUBST($1_LIB)
+    if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
+	PBX_$1=0
+	AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
+	if test ! "x${CONFIG_$1}" = xNo; then
+	    $1_INCLUDE=$(${CONFIG_$1} --cflags $3)
+	    $1_LIB=$(${CONFIG_$1} --libs $3)
+	    PBX_$1=1
+	    AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
+	fi
+    fi
 ])
 
 AC_DEFUN(
@@ -830,7 +849,8 @@ dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
 dnl @version 2006-05-29
 dnl @license GPLWithACException
 
-AC_DEFUN([ACX_PTHREAD], [
+AC_DEFUN([ACX_PTHREAD],
+[
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_LANG_SAVE
 AC_LANG_C
diff --git a/configure b/configure
index 461be1264..84921d834 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 89394 .
+# From configure.ac Revision: 89395 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -7674,28 +7674,28 @@ fi
 # by the --with option name, to make things easier for the users :-)
 
 
-ALSA_DESCRIP="Advanced Linux Sound Architecture"
-ALSA_OPTION="asound"
+    ALSA_DESCRIP="Advanced Linux Sound Architecture"
+    ALSA_OPTION="asound"
 
 # Check whether --with-asound was given.
 if test "${with_asound+set}" = set; then
   withval=$with_asound;
-case ${withval} in
-     n|no)
-     USE_ALSA=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ALSA"
-     ;;
-     *)
-     ALSA_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ALSA"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ALSA=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ALSA"
+	;;
+	*)
+	ALSA_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ALSA"
+	;;
+	esac
 
 fi
 
-PBX_ALSA=0
+    PBX_ALSA=0
 
 
 
@@ -7705,1260 +7705,1260 @@ PBX_ALSA=0
 # BKTR is used for backtrace support on platforms that do not
 # have it natively.
 
-BKTR_DESCRIP="Stack Backtrace support"
-BKTR_OPTION="execinfo"
+    BKTR_DESCRIP="Stack Backtrace support"
+    BKTR_OPTION="execinfo"
 
 # Check whether --with-execinfo was given.
 if test "${with_execinfo+set}" = set; then
   withval=$with_execinfo;
-case ${withval} in
-     n|no)
-     USE_BKTR=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} BKTR"
-     ;;
-     *)
-     BKTR_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} BKTR"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_BKTR=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} BKTR"
+	;;
+	*)
+	BKTR_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} BKTR"
+	;;
+	esac
 
 fi
 
-PBX_BKTR=0
+    PBX_BKTR=0
 
 
 
 
 
 
-CAP_DESCRIP="POSIX 1.e capabilities"
-CAP_OPTION="cap"
+    CAP_DESCRIP="POSIX 1.e capabilities"
+    CAP_OPTION="cap"
 
 # Check whether --with-cap was given.
 if test "${with_cap+set}" = set; then
   withval=$with_cap;
-case ${withval} in
-     n|no)
-     USE_CAP=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} CAP"
-     ;;
-     *)
-     CAP_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} CAP"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_CAP=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} CAP"
+	;;
+	*)
+	CAP_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} CAP"
+	;;
+	esac
 
 fi
 
-PBX_CAP=0
+    PBX_CAP=0
 
 
 
 
 
 
-CURL_DESCRIP="cURL"
-CURL_OPTION="curl"
+    CURL_DESCRIP="cURL"
+    CURL_OPTION="curl"
 
 # Check whether --with-curl was given.
 if test "${with_curl+set}" = set; then
   withval=$with_curl;
-case ${withval} in
-     n|no)
-     USE_CURL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} CURL"
-     ;;
-     *)
-     CURL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} CURL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_CURL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} CURL"
+	;;
+	*)
+	CURL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} CURL"
+	;;
+	esac
 
 fi
 
-PBX_CURL=0
+    PBX_CURL=0
 
 
 
 
 
 
-CURSES_DESCRIP="curses"
-CURSES_OPTION="curses"
+    CURSES_DESCRIP="curses"
+    CURSES_OPTION="curses"
 
 # Check whether --with-curses was given.
 if test "${with_curses+set}" = set; then
   withval=$with_curses;
-case ${withval} in
-     n|no)
-     USE_CURSES=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} CURSES"
-     ;;
-     *)
-     CURSES_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} CURSES"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_CURSES=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} CURSES"
+	;;
+	*)
+	CURSES_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} CURSES"
+	;;
+	esac
 
 fi
 
-PBX_CURSES=0
+    PBX_CURSES=0
 
 
 
 
 
 
-CRYPTO_DESCRIP="OpenSSL Cryptography support"
-CRYPTO_OPTION="crypto"
+    CRYPTO_DESCRIP="OpenSSL Cryptography support"
+    CRYPTO_OPTION="crypto"
 
 # Check whether --with-crypto was given.
 if test "${with_crypto+set}" = set; then
   withval=$with_crypto;
-case ${withval} in
-     n|no)
-     USE_CRYPTO=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} CRYPTO"
-     ;;
-     *)
-     CRYPTO_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} CRYPTO"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_CRYPTO=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} CRYPTO"
+	;;
+	*)
+	CRYPTO_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} CRYPTO"
+	;;
+	esac
 
 fi
 
-PBX_CRYPTO=0
+    PBX_CRYPTO=0
 
 
 
 
 
 
-GSM_DESCRIP="GSM"
-GSM_OPTION="gsm"
+    GSM_DESCRIP="GSM"
+    GSM_OPTION="gsm"
 
 # Check whether --with-gsm was given.
 if test "${with_gsm+set}" = set; then
   withval=$with_gsm;
-case ${withval} in
-     n|no)
-     USE_GSM=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} GSM"
-     ;;
-     *)
-     GSM_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} GSM"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_GSM=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} GSM"
+	;;
+	*)
+	GSM_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} GSM"
+	;;
+	esac
 
 fi
 
-PBX_GSM=0
+    PBX_GSM=0
 
 
 
 
 
 
-IKSEMEL_DESCRIP="Iksemel Jabber Library"
-IKSEMEL_OPTION="iksemel"
+    IKSEMEL_DESCRIP="Iksemel Jabber Library"
+    IKSEMEL_OPTION="iksemel"
 
 # Check whether --with-iksemel was given.
 if test "${with_iksemel+set}" = set; then
   withval=$with_iksemel;
-case ${withval} in
-     n|no)
-     USE_IKSEMEL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
-     ;;
-     *)
-     IKSEMEL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_IKSEMEL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
+	;;
+	*)
+	IKSEMEL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
+	;;
+	esac
 
 fi
 
-PBX_IKSEMEL=0
+    PBX_IKSEMEL=0
 
 
 
 
 
 
-IMAP_TK_DESCRIP="UW IMAP Toolkit"
-IMAP_TK_OPTION="imap"
+    IMAP_TK_DESCRIP="UW IMAP Toolkit"
+    IMAP_TK_OPTION="imap"
 
 # Check whether --with-imap was given.
 if test "${with_imap+set}" = set; then
   withval=$with_imap;
-case ${withval} in
-     n|no)
-     USE_IMAP_TK=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
-     ;;
-     *)
-     IMAP_TK_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_IMAP_TK=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
+	;;
+	*)
+	IMAP_TK_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
+	;;
+	esac
 
 fi
 
-PBX_IMAP_TK=0
+    PBX_IMAP_TK=0
 
 
 
 
 
 
-ISDNNET_DESCRIP="ISDN4Linux Library"
-ISDNNET_OPTION="isdnnet"
+    ISDNNET_DESCRIP="ISDN4Linux Library"
+    ISDNNET_OPTION="isdnnet"
 
 # Check whether --with-isdnnet was given.
 if test "${with_isdnnet+set}" = set; then
   withval=$with_isdnnet;
-case ${withval} in
-     n|no)
-     USE_ISDNNET=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ISDNNET"
-     ;;
-     *)
-     ISDNNET_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ISDNNET"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ISDNNET=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ISDNNET"
+	;;
+	*)
+	ISDNNET_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ISDNNET"
+	;;
+	esac
 
 fi
 
-PBX_ISDNNET=0
+    PBX_ISDNNET=0
 
 
 
 
 
 
-KDE_DESCRIP="KDE"
-KDE_OPTION="kde"
+    KDE_DESCRIP="KDE"
+    KDE_OPTION="kde"
 
 # Check whether --with-kde was given.
 if test "${with_kde+set}" = set; then
   withval=$with_kde;
-case ${withval} in
-     n|no)
-     USE_KDE=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} KDE"
-     ;;
-     *)
-     KDE_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} KDE"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_KDE=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} KDE"
+	;;
+	*)
+	KDE_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} KDE"
+	;;
+	esac
 
 fi
 
-PBX_KDE=0
+    PBX_KDE=0
 
 
 
 
 
 
-LTDL_DESCRIP="libtool"
-LTDL_OPTION="ltdl"
+    LTDL_DESCRIP="libtool"
+    LTDL_OPTION="ltdl"
 
 # Check whether --with-ltdl was given.
 if test "${with_ltdl+set}" = set; then
   withval=$with_ltdl;
-case ${withval} in
-     n|no)
-     USE_LTDL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} LTDL"
-     ;;
-     *)
-     LTDL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} LTDL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_LTDL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} LTDL"
+	;;
+	*)
+	LTDL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} LTDL"
+	;;
+	esac
 
 fi
 
-PBX_LTDL=0
+    PBX_LTDL=0
 
 
 
 
 
 
-LUA_DESCRIP="Lua"
-LUA_OPTION="lua"
+    LUA_DESCRIP="Lua"
+    LUA_OPTION="lua"
 
 # Check whether --with-lua was given.
 if test "${with_lua+set}" = set; then
   withval=$with_lua;
-case ${withval} in
-     n|no)
-     USE_LUA=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} LUA"
-     ;;
-     *)
-     LUA_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} LUA"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_LUA=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} LUA"
+	;;
+	*)
+	LUA_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} LUA"
+	;;
+	esac
 
 fi
 
-PBX_LUA=0
+    PBX_LUA=0
 
 
 
 
 
 
-MISDN_DESCRIP="mISDN User Library"
-MISDN_OPTION="misdn"
+    MISDN_DESCRIP="mISDN User Library"
+    MISDN_OPTION="misdn"
 
 # Check whether --with-misdn was given.
 if test "${with_misdn+set}" = set; then
   withval=$with_misdn;
-case ${withval} in
-     n|no)
-     USE_MISDN=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} MISDN"
-     ;;
-     *)
-     MISDN_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} MISDN"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_MISDN=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} MISDN"
+	;;
+	*)
+	MISDN_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} MISDN"
+	;;
+	esac
 
 fi
 
-PBX_MISDN=0
+    PBX_MISDN=0
 
 
 
 
 
 
-NBS_DESCRIP="Network Broadcast Sound"
-NBS_OPTION="nbs"
+    NBS_DESCRIP="Network Broadcast Sound"
+    NBS_OPTION="nbs"
 
 # Check whether --with-nbs was given.
 if test "${with_nbs+set}" = set; then
   withval=$with_nbs;
-case ${withval} in
-     n|no)
-     USE_NBS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} NBS"
-     ;;
-     *)
-     NBS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} NBS"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_NBS=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} NBS"
+	;;
+	*)
+	NBS_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} NBS"
+	;;
+	esac
 
 fi
 
-PBX_NBS=0
+    PBX_NBS=0
 
 
 
 
 
 
-NCURSES_DESCRIP="ncurses"
-NCURSES_OPTION="ncurses"
+    NCURSES_DESCRIP="ncurses"
+    NCURSES_OPTION="ncurses"
 
 # Check whether --with-ncurses was given.
 if test "${with_ncurses+set}" = set; then
   withval=$with_ncurses;
-case ${withval} in
-     n|no)
-     USE_NCURSES=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} NCURSES"
-     ;;
-     *)
-     NCURSES_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} NCURSES"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_NCURSES=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} NCURSES"
+	;;
+	*)
+	NCURSES_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} NCURSES"
+	;;
+	esac
 
 fi
 
-PBX_NCURSES=0
+    PBX_NCURSES=0
 
 
 
 
 
 
-NETSNMP_DESCRIP="Net-SNMP"
-NETSNMP_OPTION="netsnmp"
+    NETSNMP_DESCRIP="Net-SNMP"
+    NETSNMP_OPTION="netsnmp"
 
 # Check whether --with-netsnmp was given.
 if test "${with_netsnmp+set}" = set; then
   withval=$with_netsnmp;
-case ${withval} in
-     n|no)
-     USE_NETSNMP=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} NETSNMP"
-     ;;
-     *)
-     NETSNMP_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} NETSNMP"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_NETSNMP=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} NETSNMP"
+	;;
+	*)
+	NETSNMP_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} NETSNMP"
+	;;
+	esac
 
 fi
 
-PBX_NETSNMP=0
+    PBX_NETSNMP=0
 
 
 
 
 
 
-NEWT_DESCRIP="newt"
-NEWT_OPTION="newt"
+    NEWT_DESCRIP="newt"
+    NEWT_OPTION="newt"
 
 # Check whether --with-newt was given.
 if test "${with_newt+set}" = set; then
   withval=$with_newt;
-case ${withval} in
-     n|no)
-     USE_NEWT=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} NEWT"
-     ;;
-     *)
-     NEWT_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} NEWT"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_NEWT=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} NEWT"
+	;;
+	*)
+	NEWT_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} NEWT"
+	;;
+	esac
 
 fi
 
-PBX_NEWT=0
+    PBX_NEWT=0
 
 
 
 
 
 
-UNIXODBC_DESCRIP="unixODBC"
-UNIXODBC_OPTION="odbc"
+    UNIXODBC_DESCRIP="unixODBC"
+    UNIXODBC_OPTION="odbc"
 
 # Check whether --with-odbc was given.
 if test "${with_odbc+set}" = set; then
   withval=$with_odbc;
-case ${withval} in
-     n|no)
-     USE_UNIXODBC=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
-     ;;
-     *)
-     UNIXODBC_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_UNIXODBC=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
+	;;
+	*)
+	UNIXODBC_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
+	;;
+	esac
 
 fi
 
-PBX_UNIXODBC=0
+    PBX_UNIXODBC=0
 
 
 
 
 
 
-OGG_DESCRIP="OGG"
-OGG_OPTION="ogg"
+    OGG_DESCRIP="OGG"
+    OGG_OPTION="ogg"
 
 # Check whether --with-ogg was given.
 if test "${with_ogg+set}" = set; then
   withval=$with_ogg;
-case ${withval} in
-     n|no)
-     USE_OGG=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} OGG"
-     ;;
-     *)
-     OGG_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} OGG"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_OGG=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} OGG"
+	;;
+	*)
+	OGG_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} OGG"
+	;;
+	esac
 
 fi
 
-PBX_OGG=0
+    PBX_OGG=0
 
 
 
 
 
 
-OSPTK_DESCRIP="OSP Toolkit"
-OSPTK_OPTION="osptk"
+    OSPTK_DESCRIP="OSP Toolkit"
+    OSPTK_OPTION="osptk"
 
 # Check whether --with-osptk was given.
 if test "${with_osptk+set}" = set; then
   withval=$with_osptk;
-case ${withval} in
-     n|no)
-     USE_OSPTK=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} OSPTK"
-     ;;
-     *)
-     OSPTK_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} OSPTK"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_OSPTK=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} OSPTK"
+	;;
+	*)
+	OSPTK_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} OSPTK"
+	;;
+	esac
 
 fi
 
-PBX_OSPTK=0
+    PBX_OSPTK=0
 
 
 
 
 
 
-OSS_DESCRIP="Open Sound System"
-OSS_OPTION="oss"
+    OSS_DESCRIP="Open Sound System"
+    OSS_OPTION="oss"
 
 # Check whether --with-oss was given.
 if test "${with_oss+set}" = set; then
   withval=$with_oss;
-case ${withval} in
-     n|no)
-     USE_OSS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} OSS"
-     ;;
-     *)
-     OSS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} OSS"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_OSS=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} OSS"
+	;;
+	*)
+	OSS_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} OSS"
+	;;
+	esac
 
 fi
 
-PBX_OSS=0
+    PBX_OSS=0
 
 
 
 
 
 
-POPT_DESCRIP="popt"
-POPT_OPTION="popt"
+    POPT_DESCRIP="popt"
+    POPT_OPTION="popt"
 
 # Check whether --with-popt was given.
 if test "${with_popt+set}" = set; then
   withval=$with_popt;
-case ${withval} in
-     n|no)
-     USE_POPT=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} POPT"
-     ;;
-     *)
-     POPT_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} POPT"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_POPT=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} POPT"
+	;;
+	*)
+	POPT_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} POPT"
+	;;
+	esac
 
 fi
 
-PBX_POPT=0
+    PBX_POPT=0
 
 
 
 
 
 
-PGSQL_DESCRIP="PostgreSQL"
-PGSQL_OPTION="postgres"
+    PGSQL_DESCRIP="PostgreSQL"
+    PGSQL_OPTION="postgres"
 
 # Check whether --with-postgres was given.
 if test "${with_postgres+set}" = set; then
   withval=$with_postgres;
-case ${withval} in
-     n|no)
-     USE_PGSQL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} PGSQL"
-     ;;
-     *)
-     PGSQL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} PGSQL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_PGSQL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} PGSQL"
+	;;
+	*)
+	PGSQL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} PGSQL"
+	;;
+	esac
 
 fi
 
-PBX_PGSQL=0
+    PBX_PGSQL=0
 
 
 
 
 
 
-PRI_DESCRIP="ISDN PRI"
-PRI_OPTION="pri"
+    PRI_DESCRIP="ISDN PRI"
+    PRI_OPTION="pri"
 
 # Check whether --with-pri was given.
 if test "${with_pri+set}" = set; then
   withval=$with_pri;
-case ${withval} in
-     n|no)
-     USE_PRI=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} PRI"
-     ;;
-     *)
-     PRI_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} PRI"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_PRI=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} PRI"
+	;;
+	*)
+	PRI_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} PRI"
+	;;
+	esac
 
 fi
 
-PBX_PRI=0
+    PBX_PRI=0
 
 
 
 
 
 
-SS7_DESCRIP="ISDN SS7"
-SS7_OPTION="ss7"
+    SS7_DESCRIP="ISDN SS7"
+    SS7_OPTION="ss7"
 
 # Check whether --with-ss7 was given.
 if test "${with_ss7+set}" = set; then
   withval=$with_ss7;
-case ${withval} in
-     n|no)
-     USE_SS7=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SS7"
-     ;;
-     *)
-     SS7_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SS7"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SS7=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SS7"
+	;;
+	*)
+	SS7_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SS7"
+	;;
+	esac
 
 fi
 
-PBX_SS7=0
+    PBX_SS7=0
 
 
 
 
 
 
-PWLIB_DESCRIP="PWlib"
-PWLIB_OPTION="pwlib"
+    PWLIB_DESCRIP="PWlib"
+    PWLIB_OPTION="pwlib"
 
 # Check whether --with-pwlib was given.
 if test "${with_pwlib+set}" = set; then
   withval=$with_pwlib;
-case ${withval} in
-     n|no)
-     USE_PWLIB=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} PWLIB"
-     ;;
-     *)
-     PWLIB_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} PWLIB"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_PWLIB=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} PWLIB"
+	;;
+	*)
+	PWLIB_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} PWLIB"
+	;;
+	esac
 
 fi
 
-PBX_PWLIB=0
+    PBX_PWLIB=0
 
 
 
 
 
 
-OPENH323_DESCRIP="OpenH323"
-OPENH323_OPTION="h323"
+    OPENH323_DESCRIP="OpenH323"
+    OPENH323_OPTION="h323"
 
 # Check whether --with-h323 was given.
 if test "${with_h323+set}" = set; then
   withval=$with_h323;
-case ${withval} in
-     n|no)
-     USE_OPENH323=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} OPENH323"
-     ;;
-     *)
-     OPENH323_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} OPENH323"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_OPENH323=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} OPENH323"
+	;;
+	*)
+	OPENH323_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} OPENH323"
+	;;
+	esac
 
 fi
 
-PBX_OPENH323=0
+    PBX_OPENH323=0
 
 
 
 
 
 
-QT_DESCRIP="Qt"
-QT_OPTION="qt"
+    QT_DESCRIP="Qt"
+    QT_OPTION="qt"
 
 # Check whether --with-qt was given.
 if test "${with_qt+set}" = set; then
   withval=$with_qt;
-case ${withval} in
-     n|no)
-     USE_QT=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} QT"
-     ;;
-     *)
-     QT_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} QT"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_QT=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} QT"
+	;;
+	*)
+	QT_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} QT"
+	;;
+	esac
 
 fi
 
-PBX_QT=0
+    PBX_QT=0
 
 
 
 
 
 
-RADIUS_DESCRIP="Radius Client"
-RADIUS_OPTION="radius"
+    RADIUS_DESCRIP="Radius Client"
+    RADIUS_OPTION="radius"
 
 # Check whether --with-radius was given.
 if test "${with_radius+set}" = set; then
   withval=$with_radius;
-case ${withval} in
-     n|no)
-     USE_RADIUS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} RADIUS"
-     ;;
-     *)
-     RADIUS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} RADIUS"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_RADIUS=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} RADIUS"
+	;;
+	*)
+	RADIUS_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} RADIUS"
+	;;
+	esac
 
 fi
 
-PBX_RADIUS=0
+    PBX_RADIUS=0
 
 
 
 
 
 
-SPEEX_DESCRIP="Speex"
-SPEEX_OPTION="speex"
+    SPEEX_DESCRIP="Speex"
+    SPEEX_OPTION="speex"
 
 # Check whether --with-speex was given.
 if test "${with_speex+set}" = set; then
   withval=$with_speex;
-case ${withval} in
-     n|no)
-     USE_SPEEX=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SPEEX"
-     ;;
-     *)
-     SPEEX_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SPEEX"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SPEEX=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SPEEX"
+	;;
+	*)
+	SPEEX_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SPEEX"
+	;;
+	esac
 
 fi
 
-PBX_SPEEX=0
+    PBX_SPEEX=0
 
 
 
 
 
 
-SQLITE_DESCRIP="SQLite"
-SQLITE_OPTION="sqlite"
+    SQLITE_DESCRIP="SQLite"
+    SQLITE_OPTION="sqlite"
 
 # Check whether --with-sqlite was given.
 if test "${with_sqlite+set}" = set; then
   withval=$with_sqlite;
-case ${withval} in
-     n|no)
-     USE_SQLITE=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SQLITE"
-     ;;
-     *)
-     SQLITE_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SQLITE"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SQLITE=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SQLITE"
+	;;
+	*)
+	SQLITE_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SQLITE"
+	;;
+	esac
 
 fi
 
-PBX_SQLITE=0
+    PBX_SQLITE=0
 
 
 
 
 
 
-SQLITE3_DESCRIP="SQLite"
-SQLITE3_OPTION="sqlite3"
+    SQLITE3_DESCRIP="SQLite"
+    SQLITE3_OPTION="sqlite3"
 
 # Check whether --with-sqlite3 was given.
 if test "${with_sqlite3+set}" = set; then
   withval=$with_sqlite3;
-case ${withval} in
-     n|no)
-     USE_SQLITE3=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SQLITE3"
-     ;;
-     *)
-     SQLITE3_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SQLITE3"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SQLITE3=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+	;;
+	*)
+	SQLITE3_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SQLITE3"
+	;;
+	esac
 
 fi
 
-PBX_SQLITE3=0
+    PBX_SQLITE3=0
 
 
 
 
 
 
-SUPPSERV_DESCRIP="mISDN Supplemental Services"
-SUPPSERV_OPTION="suppserv"
+    SUPPSERV_DESCRIP="mISDN Supplemental Services"
+    SUPPSERV_OPTION="suppserv"
 
 # Check whether --with-suppserv was given.
 if test "${with_suppserv+set}" = set; then
   withval=$with_suppserv;
-case ${withval} in
-     n|no)
-     USE_SUPPSERV=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
-     ;;
-     *)
-     SUPPSERV_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SUPPSERV=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
+	;;
+	*)
+	SUPPSERV_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
+	;;
+	esac
 
 fi
 
-PBX_SUPPSERV=0
+    PBX_SUPPSERV=0
 
 
 
 
 
 
-OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer support"
-OPENSSL_OPTION="ssl"
+    OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer support"
+    OPENSSL_OPTION="ssl"
 
 # Check whether --with-ssl was given.
 if test "${with_ssl+set}" = set; then
   withval=$with_ssl;
-case ${withval} in
-     n|no)
-     USE_OPENSSL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} OPENSSL"
-     ;;
-     *)
-     OPENSSL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} OPENSSL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_OPENSSL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} OPENSSL"
+	;;
+	*)
+	OPENSSL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} OPENSSL"
+	;;
+	esac
 
 fi
 
-PBX_OPENSSL=0
+    PBX_OPENSSL=0
 
 
 
 
 
 
-FREETDS_DESCRIP="FreeTDS"
-FREETDS_OPTION="tds"
+    FREETDS_DESCRIP="FreeTDS"
+    FREETDS_OPTION="tds"
 
 # Check whether --with-tds was given.
 if test "${with_tds+set}" = set; then
   withval=$with_tds;
-case ${withval} in
-     n|no)
-     USE_FREETDS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} FREETDS"
-     ;;
-     *)
-     FREETDS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} FREETDS"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_FREETDS=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} FREETDS"
+	;;
+	*)
+	FREETDS_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} FREETDS"
+	;;
+	esac
 
 fi
 
-PBX_FREETDS=0
+    PBX_FREETDS=0
 
 
 
 
 
 
-TERMCAP_DESCRIP="Termcap"
-TERMCAP_OPTION="termcap"
+    TERMCAP_DESCRIP="Termcap"
+    TERMCAP_OPTION="termcap"
 
 # Check whether --with-termcap was given.
 if test "${with_termcap+set}" = set; then
   withval=$with_termcap;
-case ${withval} in
-     n|no)
-     USE_TERMCAP=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} TERMCAP"
-     ;;
-     *)
-     TERMCAP_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} TERMCAP"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_TERMCAP=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} TERMCAP"
+	;;
+	*)
+	TERMCAP_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} TERMCAP"
+	;;
+	esac
 
 fi
 
-PBX_TERMCAP=0
+    PBX_TERMCAP=0
 
 
 
 
 
 
-TINFO_DESCRIP="Term Info"
-TINFO_OPTION="tinfo"
+    TINFO_DESCRIP="Term Info"
+    TINFO_OPTION="tinfo"
 
 # Check whether --with-tinfo was given.
 if test "${with_tinfo+set}" = set; then
   withval=$with_tinfo;
-case ${withval} in
-     n|no)
-     USE_TINFO=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} TINFO"
-     ;;
-     *)
-     TINFO_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} TINFO"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_TINFO=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} TINFO"
+	;;
+	*)
+	TINFO_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} TINFO"
+	;;
+	esac
 
 fi
 
-PBX_TINFO=0
+    PBX_TINFO=0
 
 
 
 
 
 
-TONEZONE_DESCRIP="tonezone"
-TONEZONE_OPTION="tonezone"
+    TONEZONE_DESCRIP="tonezone"
+    TONEZONE_OPTION="tonezone"
 
 # Check whether --with-tonezone was given.
 if test "${with_tonezone+set}" = set; then
   withval=$with_tonezone;
-case ${withval} in
-     n|no)
-     USE_TONEZONE=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} TONEZONE"
-     ;;
-     *)
-     TONEZONE_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} TONEZONE"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_TONEZONE=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} TONEZONE"
+	;;
+	*)
+	TONEZONE_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} TONEZONE"
+	;;
+	esac
 
 fi
 
-PBX_TONEZONE=0
+    PBX_TONEZONE=0
 
 
 
 
 
 
-USB_DESCRIP="usb"
-USB_OPTION="usb"
+    USB_DESCRIP="usb"
+    USB_OPTION="usb"
 
 # Check whether --with-usb was given.
 if test "${with_usb+set}" = set; then
   withval=$with_usb;
-case ${withval} in
-     n|no)
-     USE_USB=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} USB"
-     ;;
-     *)
-     USB_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} USB"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_USB=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} USB"
+	;;
+	*)
+	USB_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} USB"
+	;;
+	esac
 
 fi
 
-PBX_USB=0
+    PBX_USB=0
 
 
 
 
 
 
-VORBIS_DESCRIP="Vorbis"
-VORBIS_OPTION="vorbis"
+    VORBIS_DESCRIP="Vorbis"
+    VORBIS_OPTION="vorbis"
 
 # Check whether --with-vorbis was given.
 if test "${with_vorbis+set}" = set; then
   withval=$with_vorbis;
-case ${withval} in
-     n|no)
-     USE_VORBIS=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} VORBIS"
-     ;;
-     *)
-     VORBIS_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} VORBIS"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_VORBIS=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} VORBIS"
+	;;
+	*)
+	VORBIS_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} VORBIS"
+	;;
+	esac
 
 fi
 
-PBX_VORBIS=0
+    PBX_VORBIS=0
 
 
 
 
 
 
-VPB_DESCRIP="Voicetronix API"
-VPB_OPTION="vpb"
+    VPB_DESCRIP="Voicetronix API"
+    VPB_OPTION="vpb"
 
 # Check whether --with-vpb was given.
 if test "${with_vpb+set}" = set; then
   withval=$with_vpb;
-case ${withval} in
-     n|no)
-     USE_VPB=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} VPB"
-     ;;
-     *)
-     VPB_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} VPB"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_VPB=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} VPB"
+	;;
+	*)
+	VPB_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} VPB"
+	;;
+	esac
 
 fi
 
-PBX_VPB=0
+    PBX_VPB=0
 
 
 
 
 
 
-ZLIB_DESCRIP="zlib"
-ZLIB_OPTION="z"
+    ZLIB_DESCRIP="zlib"
+    ZLIB_OPTION="z"
 
 # Check whether --with-z was given.
 if test "${with_z+set}" = set; then
   withval=$with_z;
-case ${withval} in
-     n|no)
-     USE_ZLIB=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ZLIB"
-     ;;
-     *)
-     ZLIB_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ZLIB"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ZLIB=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ZLIB"
+	;;
+	*)
+	ZLIB_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ZLIB"
+	;;
+	esac
 
 fi
 
-PBX_ZLIB=0
+    PBX_ZLIB=0
 
 
 
 
 
 
-ZAPTEL_DESCRIP="Zaptel"
-ZAPTEL_OPTION="zaptel"
+    ZAPTEL_DESCRIP="Zaptel"
+    ZAPTEL_OPTION="zaptel"
 
 # Check whether --with-zaptel was given.
 if test "${with_zaptel+set}" = set; then
   withval=$with_zaptel;
-case ${withval} in
-     n|no)
-     USE_ZAPTEL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
-     ;;
-     *)
-     ZAPTEL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ZAPTEL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
+	;;
+	*)
+	ZAPTEL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
+	;;
+	esac
 
 fi
 
-PBX_ZAPTEL=0
+    PBX_ZAPTEL=0
 
 
 
 
 
 
-ZAPTEL_TRANSCODE_DESCRIP="Zaptel_transcode"
-ZAPTEL_TRANSCODE_OPTION="zaptel_transcode"
+    ZAPTEL_TRANSCODE_DESCRIP="Zaptel_transcode"
+    ZAPTEL_TRANSCODE_OPTION="zaptel_transcode"
 
 # Check whether --with-zaptel_transcode was given.
 if test "${with_zaptel_transcode+set}" = set; then
   withval=$with_zaptel_transcode;
-case ${withval} in
-     n|no)
-     USE_ZAPTEL_TRANSCODE=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL_TRANSCODE"
-     ;;
-     *)
-     ZAPTEL_TRANSCODE_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL_TRANSCODE"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ZAPTEL_TRANSCODE=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL_TRANSCODE"
+	;;
+	*)
+	ZAPTEL_TRANSCODE_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL_TRANSCODE"
+	;;
+	esac
 
 fi
 
-PBX_ZAPTEL_TRANSCODE=0
+    PBX_ZAPTEL_TRANSCODE=0
 
 
 
 
 
 
-ZAPTEL_VLDTMF_DESCRIP="Zaptel_vldtmf"
-ZAPTEL_VLDTMF_OPTION="zaptel_vldtmf"
+    ZAPTEL_VLDTMF_DESCRIP="Zaptel_vldtmf"
+    ZAPTEL_VLDTMF_OPTION="zaptel_vldtmf"
 
 # Check whether --with-zaptel_vldtmf was given.
 if test "${with_zaptel_vldtmf+set}" = set; then
   withval=$with_zaptel_vldtmf;
-case ${withval} in
-     n|no)
-     USE_ZAPTEL_VLDTMF=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL_VLDTMF"
-     ;;
-     *)
-     ZAPTEL_VLDTMF_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} ZAPTEL_VLDTMF"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_ZAPTEL_VLDTMF=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL_VLDTMF"
+	;;
+	*)
+	ZAPTEL_VLDTMF_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} ZAPTEL_VLDTMF"
+	;;
+	esac
 
 fi
 
-PBX_ZAPTEL_VLDTMF=0
+    PBX_ZAPTEL_VLDTMF=0
 
 
 
@@ -8966,84 +8966,84 @@ PBX_ZAPTEL_VLDTMF=0
 
 
 
-SDL_DESCRIP="Sdl"
-SDL_OPTION="sdl"
+    SDL_DESCRIP="Sdl"
+    SDL_OPTION="sdl"
 
 # Check whether --with-sdl was given.
 if test "${with_sdl+set}" = set; then
   withval=$with_sdl;
-case ${withval} in
-     n|no)
-     USE_SDL=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SDL"
-     ;;
-     *)
-     SDL_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SDL"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SDL=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SDL"
+	;;
+	*)
+	SDL_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SDL"
+	;;
+	esac
 
 fi
 
-PBX_SDL=0
+    PBX_SDL=0
 
 
 
 
 
 
-SDL_IMAGE_DESCRIP="Sdl Image library"
-SDL_IMAGE_OPTION="SDL_image"
+    SDL_IMAGE_DESCRIP="Sdl Image library"
+    SDL_IMAGE_OPTION="SDL_image"
 
 # Check whether --with-SDL_image was given.
 if test "${with_SDL_image+set}" = set; then
   withval=$with_SDL_image;
-case ${withval} in
-     n|no)
-     USE_SDL_IMAGE=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
-     ;;
-     *)
-     SDL_IMAGE_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_SDL_IMAGE=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
+	;;
+	*)
+	SDL_IMAGE_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
+	;;
+	esac
 
 fi
 
-PBX_SDL_IMAGE=0
+    PBX_SDL_IMAGE=0
 
 
 
 
 
 
-FFMPEG_DESCRIP="Ffmpeg and avcodec library"
-FFMPEG_OPTION="avcodec"
+    FFMPEG_DESCRIP="Ffmpeg and avcodec library"
+    FFMPEG_OPTION="avcodec"
 
 # Check whether --with-avcodec was given.
 if test "${with_avcodec+set}" = set; then
   withval=$with_avcodec;
-case ${withval} in
-     n|no)
-     USE_FFMPEG=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} FFMPEG"
-     ;;
-     *)
-     FFMPEG_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} FFMPEG"
-     ;;
-esac
+	case ${withval} in
+	n|no)
+	USE_FFMPEG=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} FFMPEG"
+	;;
+	*)
+	FFMPEG_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} FFMPEG"
+	;;
+	esac
 
 fi
 
-PBX_FFMPEG=0
+    PBX_FFMPEG=0
 
 
 
@@ -12403,13 +12403,11 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }
@@ -12449,13 +12447,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }
@@ -56505,8 +56501,9 @@ fi
 
 
 
-PBX_SDL=0
-if test -n "$ac_tool_prefix"; then
+    if test "x${PBX_SDL}" != "x1" -a "${USE_SDL}" != "no"; then
+	PBX_SDL=0
+	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}sdl-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}sdl-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -56602,19 +56599,17 @@ else
   CONFIG_SDL="$ac_cv_prog_CONFIG_SDL"
 fi
 
-if test ! "x${CONFIG_SDL}" = xNo; then
-   SDL_INCLUDE=$(${CONFIG_SDL} --cflags )
-   SDL_LIB=$(${CONFIG_SDL} --libs )
-   PBX_SDL=1
+	if test ! "x${CONFIG_SDL}" = xNo; then
+	    SDL_INCLUDE=$(${CONFIG_SDL} --cflags )
+	    SDL_LIB=$(${CONFIG_SDL} --libs )
+	    PBX_SDL=1
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SDL 1
 _ACEOF
 
-fi
-
-
-
+	fi
+    fi
 
 
 if test "x${PBX_SDL_IMAGE}" != "x1" -a "${USE_SDL_IMAGE}" != "no"; then