One more build system change, to make the descriptions look better, if we have better...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@214436 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index 003564f84c7cac233025a22f6bca2d221a278306..1a810b681b1727951123dc2b2e05b1201b8a078f 100644 (file)
--- a/autoconf/ast_ext_lib.m4
+++ b/autoconf/ast_ext_lib.m4
@@ -26,6 +26,25 @@ AC_SUBST([$1_DIR])
 AC_SUBST([PBX_$1])
 ])
 
+# AST_EXT_LIB_SETUP_DEPENDENT([package symbol name], [package friendly name], [master package symbol name], [master package option name])
+
+AC_DEFUN([AST_EXT_LIB_SETUP_DEPENDENT],
+[
+$1_DESCRIP="$2"
+m4_ifval([$4], [$1_OPTION=$4])
+m4_ifval([$3], [
+if test "x${$3_MANDATORY}" = "xyes" ; then
+   $1_MANDATORY="yes"
+fi
+])
+PBX_$1=0
+AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])
+AC_SUBST([$1_LIB])
+AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
+AC_SUBST([PBX_$1])
+])
+
 # AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [additional INCLUDE data])
 
 AC_DEFUN([AST_EXT_LIB_CHECK],
@@ -60,8 +79,12 @@ if test "${USE_$1}" != "no"; then
          then
             AC_MSG_NOTICE([***])
             AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
-            AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
-            AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
+            if test "x${$1_OPTION}" = "x" ; then
+               AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support])
+            else
+               AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
+               AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
+            fi
             exit 1
          fi
          $1_LIB=""
@@ -69,24 +92,20 @@ if test "${USE_$1}" != "no"; then
          PBX_$1=0
       else
          PBX_$1=1
-         if test "x${$1_OPTION}" = "x"; then
-            dnl Ensure that we have an autoheader, when AST_EXT_LIB_SETUP was
-            dnl not called.  Note that we cannot use shell substitution in the
-            dnl description, because the shell is never invoked when rendering
-            dnl the autoheader.  Only m4 substitutions will expand correctly.
-            AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to 1 to indicate $1 functionality.])
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 [@%:@define] HAVE_$1 1
 _ACEOF
-         fi
       fi
    elif test -n "${$1_MANDATORY}";
    then
       AC_MSG_NOTICE([***])
       AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
-      AC_MSG_NOTICE([*** Either correct the installation, or run configure])
-      AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
+      if test "x${$1_OPTION}" = "x" ; then
+         AC_MSG_NOTICE([*** Please correct the installation])
+      else
+         AC_MSG_NOTICE([*** Either correct the installation, or run configure])
+         AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
+      fi
       exit 1
    fi
 fi

diff --git a/configure b/configure
index 3d8265a364590e55e769cdb2ce9bf8bd326a8c23..a1a81b60ac56f428ae38a3e074b1ca32ca7d6f8f 100755 (executable)
--- a/configure
+++ b/configure
@@ -813,6 +813,14 @@ PRI_LIB
 PRI_INCLUDE
 PRI_DIR
 PBX_PRI
+PRI_VERSION_LIB
+PRI_VERSION_INCLUDE
+PRI_VERSION_DIR
+PBX_PRI_VERSION
+PRI_INBANDDISCONNECT_LIB
+PRI_INBANDDISCONNECT_INCLUDE
+PRI_INBANDDISCONNECT_DIR
+PBX_PRI_INBANDDISCONNECT
 PWLIB_LIB
 PWLIB_INCLUDE
 PWLIB_DIR
@@ -833,6 +841,10 @@ SPEEXDSP_LIB
 SPEEXDSP_INCLUDE
 SPEEXDSP_DIR
 PBX_SPEEXDSP
+SPEEX_PREPROCESS_LIB
+SPEEX_PREPROCESS_INCLUDE
+SPEEX_PREPROCESS_DIR
+PBX_SPEEX_PREPROCESS
 SQLITE_LIB
 SQLITE_INCLUDE
 SQLITE_DIR
@@ -906,7 +918,6 @@ OPENH323_INCDIR
 OPENH323_LIBDIR
 OPENH323_SUFFIX
 OPENH323_BUILD
-PBX_SPEEX_PREPROCESS
 PBX_ZAPTEL_VLDTMF
 EDITLINE_LIB
 PBX_H323
@@ -8483,6 +8494,38 @@ PBX_PRI=0
 
 
 
+PRI_VERSION_DESCRIP="ISDN PRI get_version"
+PRI_VERSION_OPTION=pri
+
+if test "x${PRI_MANDATORY}" = "xyes" ; then
+   PRI_VERSION_MANDATORY="yes"
+fi
+
+PBX_PRI_VERSION=0
+
+
+
+
+
+
+
+
+PRI_INBANDDISCONNECT_DESCRIP="ISDN PRI set_inbanddisconnect"
+PRI_INBANDDISCONNECT_OPTION=pri
+
+if test "x${PRI_MANDATORY}" = "xyes" ; then
+   PRI_INBANDDISCONNECT_MANDATORY="yes"
+fi
+
+PBX_PRI_INBANDDISCONNECT=0
+
+
+
+
+
+
+
+
 PWLIB_DESCRIP="PWlib"
 PWLIB_OPTION="pwlib"
 
@@ -8633,6 +8676,18 @@ PBX_SPEEXDSP=0
 
 
 
+SPEEX_PREPROCESS_DESCRIP="speex_preprocess_ctl"
+SPEEX_PREPROCESS_OPTION=speex
+
+PBX_SPEEX_PREPROCESS=0
+
+
+
+
+
+
+
+
 SQLITE_DESCRIP="SQLite"
 SQLITE_OPTION="sqlite"
 
@@ -17006,10 +17061,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the asound development package installed." >&5
 echo "$as_me: *** It appears that you do not have the asound development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${ALSA_DESCRIP} support, or re-run configure" >&5
+            if test "x${ALSA_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${ALSA_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${ALSA_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${ALSA_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${ALSA_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ALSA_OPTION}" >&6;}
+            fi
             exit 1
          fi
          ALSA_LIB=""
@@ -17017,17 +17077,9 @@ echo "$as_me: *** without explicitly specifying --with-${ALSA_OPTION}" >&6;}
          PBX_ALSA=0
       else
          PBX_ALSA=1
-         if test "x${ALSA_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_ALSA 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_ALSA 1
-_ACEOF
-         fi
       fi
    elif test -n "${ALSA_MANDATORY}";
    then
@@ -17035,10 +17087,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${ALSA_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${ALSA_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${ALSA_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ALSA_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -17279,10 +17336,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the curses development package installed." >&5
 echo "$as_me: *** It appears that you do not have the curses development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${CURSES_DESCRIP} support, or re-run configure" >&5
+            if test "x${CURSES_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${CURSES_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${CURSES_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${CURSES_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${CURSES_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
+            fi
             exit 1
          fi
          CURSES_LIB=""
@@ -17290,17 +17352,9 @@ echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
          PBX_CURSES=0
       else
          PBX_CURSES=1
-         if test "x${CURSES_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CURSES 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_CURSES 1
 _ACEOF
-         fi
       fi
    elif test -n "${CURSES_MANDATORY}";
    then
@@ -17308,10 +17362,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${CURSES_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -17553,10 +17612,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the cap development package installed." >&5
 echo "$as_me: *** It appears that you do not have the cap development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${CAP_DESCRIP} support, or re-run configure" >&5
+            if test "x${CAP_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${CAP_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${CAP_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${CAP_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${CAP_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${CAP_OPTION}" >&6;}
+            fi
             exit 1
          fi
          CAP_LIB=""
@@ -17564,17 +17628,9 @@ echo "$as_me: *** without explicitly specifying --with-${CAP_OPTION}" >&6;}
          PBX_CAP=0
       else
          PBX_CAP=1
-         if test "x${CAP_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CAP 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_CAP 1
 _ACEOF
-         fi
       fi
    elif test -n "${CAP_MANDATORY}";
    then
@@ -17582,10 +17638,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${CAP_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${CAP_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${CAP_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${CAP_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -18685,10 +18746,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the iksemel development package installed." >&5
 echo "$as_me: *** It appears that you do not have the iksemel development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${IKSEMEL_DESCRIP} support, or re-run configure" >&5
+            if test "x${IKSEMEL_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${IKSEMEL_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${IKSEMEL_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${IKSEMEL_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${IKSEMEL_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&6;}
+            fi
             exit 1
          fi
          IKSEMEL_LIB=""
@@ -18696,17 +18762,9 @@ echo "$as_me: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&6;}
          PBX_IKSEMEL=0
       else
          PBX_IKSEMEL=1
-         if test "x${IKSEMEL_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_IKSEMEL 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_IKSEMEL 1
-_ACEOF
-         fi
       fi
    elif test -n "${IKSEMEL_MANDATORY}";
    then
@@ -18714,10 +18772,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${IKSEMEL_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${IKSEMEL_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${IKSEMEL_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -18959,10 +19022,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the gnutls development package installed." >&5
 echo "$as_me: *** It appears that you do not have the gnutls development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${GNUTLS_DESCRIP} support, or re-run configure" >&5
+            if test "x${GNUTLS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${GNUTLS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${GNUTLS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${GNUTLS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${GNUTLS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          GNUTLS_LIB=""
@@ -18970,17 +19038,9 @@ echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
          PBX_GNUTLS=0
       else
          PBX_GNUTLS=1
-         if test "x${GNUTLS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_GNUTLS 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS 1
-_ACEOF
-         fi
       fi
    elif test -n "${GNUTLS_MANDATORY}";
    then
@@ -18988,10 +19048,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${GNUTLS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${GNUTLS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${GNUTLS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -20078,10 +20143,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the ltdl development package installed." >&5
 echo "$as_me: *** It appears that you do not have the ltdl development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${LTDL_DESCRIP} support, or re-run configure" >&5
+            if test "x${LTDL_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${LTDL_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${LTDL_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${LTDL_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${LTDL_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LTDL_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LTDL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${LTDL_OPTION}" >&6;}
+            fi
             exit 1
          fi
          LTDL_LIB=""
@@ -20089,17 +20159,9 @@ echo "$as_me: *** without explicitly specifying --with-${LTDL_OPTION}" >&6;}
          PBX_LTDL=0
       else
          PBX_LTDL=1
-         if test "x${LTDL_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_LTDL 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_LTDL 1
-_ACEOF
-         fi
       fi
    elif test -n "${LTDL_MANDATORY}";
    then
@@ -20107,10 +20169,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${LTDL_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${LTDL_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${LTDL_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LTDL_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${LTDL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${LTDL_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -20568,10 +20635,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the mISDN development package installed." >&5
 echo "$as_me: *** It appears that you do not have the mISDN development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${MISDN_DESCRIP} support, or re-run configure" >&5
+            if test "x${MISDN_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${MISDN_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${MISDN_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${MISDN_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${MISDN_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${MISDN_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${MISDN_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${MISDN_OPTION}" >&6;}
+            fi
             exit 1
          fi
          MISDN_LIB=""
@@ -20579,17 +20651,9 @@ echo "$as_me: *** without explicitly specifying --with-${MISDN_OPTION}" >&6;}
          PBX_MISDN=0
       else
          PBX_MISDN=1
-         if test "x${MISDN_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_MISDN 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_MISDN 1
-_ACEOF
-         fi
       fi
    elif test -n "${MISDN_MANDATORY}";
    then
@@ -20597,10 +20661,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${MISDN_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${MISDN_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${MISDN_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${MISDN_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${MISDN_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${MISDN_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -20842,10 +20911,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the isdnnet development package installed." >&5
 echo "$as_me: *** It appears that you do not have the isdnnet development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${ISDNNET_DESCRIP} support, or re-run configure" >&5
+            if test "x${ISDNNET_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${ISDNNET_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${ISDNNET_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${ISDNNET_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${ISDNNET_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&6;}
+            fi
             exit 1
          fi
          ISDNNET_LIB=""
@@ -20853,17 +20927,9 @@ echo "$as_me: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&6;}
          PBX_ISDNNET=0
       else
          PBX_ISDNNET=1
-         if test "x${ISDNNET_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ISDNNET 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_ISDNNET 1
 _ACEOF
-         fi
       fi
    elif test -n "${ISDNNET_MANDATORY}";
    then
@@ -20871,10 +20937,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${ISDNNET_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${ISDNNET_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${ISDNNET_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ISDNNET_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -21114,10 +21185,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the suppserv development package installed." >&5
 echo "$as_me: *** It appears that you do not have the suppserv development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${SUPPSERV_DESCRIP} support, or re-run configure" >&5
+            if test "x${SUPPSERV_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${SUPPSERV_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${SUPPSERV_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${SUPPSERV_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${SUPPSERV_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&6;}
+            fi
             exit 1
          fi
          SUPPSERV_LIB=""
@@ -21125,17 +21201,9 @@ echo "$as_me: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&6;}
          PBX_SUPPSERV=0
       else
          PBX_SUPPSERV=1
-         if test "x${SUPPSERV_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SUPPSERV 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_SUPPSERV 1
 _ACEOF
-         fi
       fi
    elif test -n "${SUPPSERV_MANDATORY}";
    then
@@ -21143,10 +21211,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${SUPPSERV_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${SUPPSERV_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${SUPPSERV_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SUPPSERV_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -21527,10 +21600,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the nbs development package installed." >&5
 echo "$as_me: *** It appears that you do not have the nbs development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${NBS_DESCRIP} support, or re-run configure" >&5
+            if test "x${NBS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${NBS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${NBS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${NBS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${NBS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NBS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NBS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NBS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          NBS_LIB=""
@@ -21538,17 +21616,9 @@ echo "$as_me: *** without explicitly specifying --with-${NBS_OPTION}" >&6;}
          PBX_NBS=0
       else
          PBX_NBS=1
-         if test "x${NBS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NBS 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_NBS 1
 _ACEOF
-         fi
       fi
    elif test -n "${NBS_MANDATORY}";
    then
@@ -21556,10 +21626,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${NBS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${NBS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${NBS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NBS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NBS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NBS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -21800,10 +21875,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the ncurses development package installed." >&5
 echo "$as_me: *** It appears that you do not have the ncurses development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${NCURSES_DESCRIP} support, or re-run configure" >&5
+            if test "x${NCURSES_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${NCURSES_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${NCURSES_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${NCURSES_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${NCURSES_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NCURSES_OPTION}" >&6;}
+            fi
             exit 1
          fi
          NCURSES_LIB=""
@@ -21811,17 +21891,9 @@ echo "$as_me: *** without explicitly specifying --with-${NCURSES_OPTION}" >&6;}
          PBX_NCURSES=0
       else
          PBX_NCURSES=1
-         if test "x${NCURSES_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NCURSES 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_NCURSES 1
 _ACEOF
-         fi
       fi
    elif test -n "${NCURSES_MANDATORY}";
    then
@@ -21829,10 +21901,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${NCURSES_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${NCURSES_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${NCURSES_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NCURSES_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -22397,10 +22474,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the newt development package installed." >&5
 echo "$as_me: *** It appears that you do not have the newt development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${NEWT_DESCRIP} support, or re-run configure" >&5
+            if test "x${NEWT_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${NEWT_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${NEWT_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${NEWT_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${NEWT_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NEWT_OPTION}" >&6;}
+            fi
             exit 1
          fi
          NEWT_LIB=""
@@ -22408,17 +22490,9 @@ echo "$as_me: *** without explicitly specifying --with-${NEWT_OPTION}" >&6;}
          PBX_NEWT=0
       else
          PBX_NEWT=1
-         if test "x${NEWT_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_NEWT 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_NEWT 1
-_ACEOF
-         fi
       fi
    elif test -n "${NEWT_MANDATORY}";
    then
@@ -22426,10 +22500,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${NEWT_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${NEWT_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${NEWT_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${NEWT_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -22670,10 +22749,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the odbc development package installed." >&5
 echo "$as_me: *** It appears that you do not have the odbc development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${UNIXODBC_DESCRIP} support, or re-run configure" >&5
+            if test "x${UNIXODBC_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${UNIXODBC_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${UNIXODBC_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${UNIXODBC_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${UNIXODBC_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&6;}
+            fi
             exit 1
          fi
          UNIXODBC_LIB=""
@@ -22681,17 +22765,9 @@ echo "$as_me: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&6;}
          PBX_UNIXODBC=0
       else
          PBX_UNIXODBC=1
-         if test "x${UNIXODBC_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_UNIXODBC 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_UNIXODBC 1
-_ACEOF
-         fi
       fi
    elif test -n "${UNIXODBC_MANDATORY}";
    then
@@ -22699,10 +22775,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${UNIXODBC_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${UNIXODBC_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${UNIXODBC_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${UNIXODBC_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -22943,10 +23024,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the ogg development package installed." >&5
 echo "$as_me: *** It appears that you do not have the ogg development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${OGG_DESCRIP} support, or re-run configure" >&5
+            if test "x${OGG_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${OGG_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${OGG_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${OGG_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${OGG_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OGG_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OGG_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OGG_OPTION}" >&6;}
+            fi
             exit 1
          fi
          OGG_LIB=""
@@ -22954,17 +23040,9 @@ echo "$as_me: *** without explicitly specifying --with-${OGG_OPTION}" >&6;}
          PBX_OGG=0
       else
          PBX_OGG=1
-         if test "x${OGG_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_OGG 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_OGG 1
-_ACEOF
-         fi
       fi
    elif test -n "${OGG_MANDATORY}";
    then
@@ -22972,10 +23050,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${OGG_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${OGG_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${OGG_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OGG_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OGG_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OGG_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -23505,10 +23588,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the ossaudio development package installed." >&5
 echo "$as_me: *** It appears that you do not have the ossaudio development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&5
+            if test "x${OSS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${OSS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${OSS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${OSS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          OSS_LIB=""
@@ -23516,17 +23604,9 @@ echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;}
          PBX_OSS=0
       else
          PBX_OSS=1
-         if test "x${OSS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_OSS 1
-_ACEOF
-         fi
       fi
    elif test -n "${OSS_MANDATORY}";
    then
@@ -23534,10 +23614,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${OSS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${OSS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OSS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -24120,10 +24205,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the popt development package installed." >&5
 echo "$as_me: *** It appears that you do not have the popt development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&5
+            if test "x${POPT_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${POPT_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${POPT_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${POPT_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;}
+            fi
             exit 1
          fi
          POPT_LIB=""
@@ -24131,17 +24221,9 @@ echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;}
          PBX_POPT=0
       else
          PBX_POPT=1
-         if test "x${POPT_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_POPT 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_POPT 1
 _ACEOF
-         fi
       fi
    elif test -n "${POPT_MANDATORY}";
    then
@@ -24149,10 +24231,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${POPT_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${POPT_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${POPT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${POPT_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -24393,10 +24480,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5
 echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&5
+            if test "x${PRI_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${PRI_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${PRI_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;}
+            fi
             exit 1
          fi
          PRI_LIB=""
@@ -24404,17 +24496,9 @@ echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;}
          PBX_PRI=0
       else
          PBX_PRI=1
-         if test "x${PRI_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI 1
 _ACEOF
-         fi
       fi
    elif test -n "${PRI_MANDATORY}";
    then
@@ -24422,10 +24506,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${PRI_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${PRI_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -24666,10 +24755,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5
 echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${PRI_VERSION_DESCRIP} support, or re-run configure" >&5
+            if test "x${PRI_VERSION_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_VERSION_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${PRI_VERSION_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_VERSION_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${PRI_VERSION_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&6;}
+            fi
             exit 1
          fi
          PRI_VERSION_LIB=""
@@ -24677,17 +24771,9 @@ echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&
          PBX_PRI_VERSION=0
       else
          PBX_PRI_VERSION=1
-         if test "x${PRI_VERSION_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_VERSION 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_VERSION 1
-_ACEOF
-         fi
       fi
    elif test -n "${PRI_VERSION_MANDATORY}";
    then
@@ -24695,10 +24781,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${PRI_VERSION_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${PRI_VERSION_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${PRI_VERSION_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -24939,10 +25030,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5
 echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support, or re-run configure" >&5
+            if test "x${PRI_INBANDDISCONNECT_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&6;}
+            fi
             exit 1
          fi
          PRI_INBANDDISCONNECT_LIB=""
@@ -24950,17 +25046,9 @@ echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OP
          PBX_PRI_INBANDDISCONNECT=0
       else
          PBX_PRI_INBANDDISCONNECT=1
-         if test "x${PRI_INBANDDISCONNECT_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_INBANDDISCONNECT 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_INBANDDISCONNECT 1
-_ACEOF
-         fi
       fi
    elif test -n "${PRI_INBANDDISCONNECT_MANDATORY}";
    then
@@ -24968,10 +25056,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${PRI_INBANDDISCONNECT_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${PRI_INBANDDISCONNECT_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${PRI_INBANDDISCONNECT_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -27088,10 +27181,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the radiusclient-ng development package installed." >&5
 echo "$as_me: *** It appears that you do not have the radiusclient-ng development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&5
+            if test "x${RADIUS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${RADIUS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${RADIUS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${RADIUS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          RADIUS_LIB=""
@@ -27099,17 +27197,9 @@ echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;}
          PBX_RADIUS=0
       else
          PBX_RADIUS=1
-         if test "x${RADIUS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_RADIUS 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_RADIUS 1
-_ACEOF
-         fi
       fi
    elif test -n "${RADIUS_MANDATORY}";
    then
@@ -27117,10 +27207,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${RADIUS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${RADIUS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${RADIUS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${RADIUS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -27361,10 +27456,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the speex development package installed." >&5
 echo "$as_me: *** It appears that you do not have the speex development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&5
+            if test "x${SPEEX_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${SPEEX_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${SPEEX_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;}
+            fi
             exit 1
          fi
          SPEEX_LIB=""
@@ -27372,17 +27472,9 @@ echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;}
          PBX_SPEEX=0
       else
          PBX_SPEEX=1
-         if test "x${SPEEX_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_SPEEX 1
-_ACEOF
-         fi
       fi
    elif test -n "${SPEEX_MANDATORY}";
    then
@@ -27390,10 +27482,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${SPEEX_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${SPEEX_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEX_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -27635,10 +27732,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the speex development package installed." >&5
 echo "$as_me: *** It appears that you do not have the speex development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support, or re-run configure" >&5
+            if test "x${SPEEX_PREPROCESS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${SPEEX_PREPROCESS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          SPEEX_PREPROCESS_LIB=""
@@ -27646,17 +27748,9 @@ echo "$as_me: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION
          PBX_SPEEX_PREPROCESS=0
       else
          PBX_SPEEX_PREPROCESS=1
-         if test "x${SPEEX_PREPROCESS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SPEEX_PREPROCESS 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX_PREPROCESS 1
 _ACEOF
-         fi
       fi
    elif test -n "${SPEEX_PREPROCESS_MANDATORY}";
    then
@@ -27664,10 +27758,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${SPEEX_PREPROCESS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${SPEEX_PREPROCESS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${SPEEX_PREPROCESS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEX_PREPROCESS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -27911,10 +28010,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the speexdsp development package installed." >&5
 echo "$as_me: *** It appears that you do not have the speexdsp development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${SPEEXDSP_DESCRIP} support, or re-run configure" >&5
+            if test "x${SPEEXDSP_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEXDSP_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${SPEEXDSP_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${SPEEXDSP_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${SPEEXDSP_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&6;}
+            fi
             exit 1
          fi
          SPEEXDSP_LIB=""
@@ -27922,17 +28026,9 @@ echo "$as_me: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&6;}
          PBX_SPEEXDSP=0
       else
          PBX_SPEEXDSP=1
-         if test "x${SPEEXDSP_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SPEEXDSP 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEXDSP 1
 _ACEOF
-         fi
       fi
    elif test -n "${SPEEXDSP_MANDATORY}";
    then
@@ -27940,10 +28036,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${SPEEXDSP_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${SPEEXDSP_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${SPEEXDSP_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SPEEXDSP_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -28189,10 +28290,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the sqlite development package installed." >&5
 echo "$as_me: *** It appears that you do not have the sqlite development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&5
+            if test "x${SQLITE_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${SQLITE_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${SQLITE_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${SQLITE_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;}
+            fi
             exit 1
          fi
          SQLITE_LIB=""
@@ -28200,17 +28306,9 @@ echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;}
          PBX_SQLITE=0
       else
          PBX_SQLITE=1
-         if test "x${SQLITE_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SQLITE 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_SQLITE 1
 _ACEOF
-         fi
       fi
    elif test -n "${SQLITE_MANDATORY}";
    then
@@ -28218,10 +28316,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${SQLITE_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${SQLITE_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${SQLITE_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${SQLITE_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -28462,10 +28565,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the ssl development package installed." >&5
 echo "$as_me: *** It appears that you do not have the ssl development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&5
+            if test "x${OPENSSL_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${OPENSSL_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${OPENSSL_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${OPENSSL_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;}
+            fi
             exit 1
          fi
          OPENSSL_LIB=""
@@ -28473,17 +28581,9 @@ echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;}
          PBX_OPENSSL=0
       else
          PBX_OPENSSL=1
-         if test "x${OPENSSL_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OPENSSL 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL 1
 _ACEOF
-         fi
       fi
    elif test -n "${OPENSSL_MANDATORY}";
    then
@@ -28491,10 +28591,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${OPENSSL_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${OPENSSL_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OPENSSL_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -28736,10 +28841,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the osptk development package installed." >&5
 echo "$as_me: *** It appears that you do not have the osptk development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&5
+            if test "x${OSPTK_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${OSPTK_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${OSPTK_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${OSPTK_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;}
+            fi
             exit 1
          fi
          OSPTK_LIB=""
@@ -28747,17 +28857,9 @@ echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;}
          PBX_OSPTK=0
       else
          PBX_OSPTK=1
-         if test "x${OSPTK_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_OSPTK 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_OSPTK 1
-_ACEOF
-         fi
       fi
    elif test -n "${OSPTK_MANDATORY}";
    then
@@ -28765,10 +28867,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${OSPTK_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${OSPTK_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${OSPTK_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -29010,10 +29117,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the tds development package installed." >&5
 echo "$as_me: *** It appears that you do not have the tds development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${FREETDS_DESCRIP} support, or re-run configure" >&5
+            if test "x${FREETDS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${FREETDS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${FREETDS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${FREETDS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${FREETDS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${FREETDS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${FREETDS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${FREETDS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          FREETDS_LIB=""
@@ -29021,17 +29133,9 @@ echo "$as_me: *** without explicitly specifying --with-${FREETDS_OPTION}" >&6;}
          PBX_FREETDS=0
       else
          PBX_FREETDS=1
-         if test "x${FREETDS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_FREETDS 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETDS 1
 _ACEOF
-         fi
       fi
    elif test -n "${FREETDS_MANDATORY}";
    then
@@ -29039,10 +29143,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${FREETDS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${FREETDS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${FREETDS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${FREETDS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${FREETDS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${FREETDS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -29310,10 +29419,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the termcap development package installed." >&5
 echo "$as_me: *** It appears that you do not have the termcap development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${TERMCAP_DESCRIP} support, or re-run configure" >&5
+            if test "x${TERMCAP_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${TERMCAP_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${TERMCAP_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${TERMCAP_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${TERMCAP_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&6;}
+            fi
             exit 1
          fi
          TERMCAP_LIB=""
@@ -29321,17 +29435,9 @@ echo "$as_me: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&6;}
          PBX_TERMCAP=0
       else
          PBX_TERMCAP=1
-         if test "x${TERMCAP_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_TERMCAP 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_TERMCAP 1
-_ACEOF
-         fi
       fi
    elif test -n "${TERMCAP_MANDATORY}";
    then
@@ -29339,10 +29445,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${TERMCAP_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${TERMCAP_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${TERMCAP_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TERMCAP_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -29583,10 +29694,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the tinfo development package installed." >&5
 echo "$as_me: *** It appears that you do not have the tinfo development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${TINFO_DESCRIP} support, or re-run configure" >&5
+            if test "x${TINFO_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${TINFO_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${TINFO_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${TINFO_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${TINFO_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TINFO_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TINFO_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TINFO_OPTION}" >&6;}
+            fi
             exit 1
          fi
          TINFO_LIB=""
@@ -29594,17 +29710,9 @@ echo "$as_me: *** without explicitly specifying --with-${TINFO_OPTION}" >&6;}
          PBX_TINFO=0
       else
          PBX_TINFO=1
-         if test "x${TINFO_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_TINFO 1
 _ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
-#define HAVE_TINFO 1
-_ACEOF
-         fi
       fi
    elif test -n "${TINFO_MANDATORY}";
    then
@@ -29612,10 +29720,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${TINFO_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${TINFO_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${TINFO_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TINFO_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TINFO_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TINFO_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -29875,10 +29988,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the tonezone development package installed." >&5
 echo "$as_me: *** It appears that you do not have the tonezone development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${TONEZONE_DESCRIP} support, or re-run configure" >&5
+            if test "x${TONEZONE_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${TONEZONE_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${TONEZONE_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${TONEZONE_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${TONEZONE_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&6;}
+            fi
             exit 1
          fi
          TONEZONE_LIB=""
@@ -29886,17 +30004,9 @@ echo "$as_me: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&6;}
          PBX_TONEZONE=0
       else
          PBX_TONEZONE=1
-         if test "x${TONEZONE_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_TONEZONE 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_TONEZONE 1
 _ACEOF
-         fi
       fi
    elif test -n "${TONEZONE_MANDATORY}";
    then
@@ -29904,10 +30014,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${TONEZONE_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${TONEZONE_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${TONEZONE_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${TONEZONE_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -30148,10 +30263,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the usb development package installed." >&5
 echo "$as_me: *** It appears that you do not have the usb development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${USB_DESCRIP} support, or re-run configure" >&5
+            if test "x${USB_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${USB_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${USB_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${USB_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${USB_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${USB_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${USB_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${USB_OPTION}" >&6;}
+            fi
             exit 1
          fi
          USB_LIB=""
@@ -30159,17 +30279,9 @@ echo "$as_me: *** without explicitly specifying --with-${USB_OPTION}" >&6;}
          PBX_USB=0
       else
          PBX_USB=1
-         if test "x${USB_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_USB 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_USB 1
 _ACEOF
-         fi
       fi
    elif test -n "${USB_MANDATORY}";
    then
@@ -30177,10 +30289,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${USB_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${USB_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${USB_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${USB_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${USB_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${USB_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -30421,10 +30538,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the vorbis development package installed." >&5
 echo "$as_me: *** It appears that you do not have the vorbis development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${VORBIS_DESCRIP} support, or re-run configure" >&5
+            if test "x${VORBIS_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${VORBIS_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${VORBIS_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${VORBIS_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${VORBIS_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${VORBIS_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${VORBIS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${VORBIS_OPTION}" >&6;}
+            fi
             exit 1
          fi
          VORBIS_LIB=""
@@ -30432,17 +30554,9 @@ echo "$as_me: *** without explicitly specifying --with-${VORBIS_OPTION}" >&6;}
          PBX_VORBIS=0
       else
          PBX_VORBIS=1
-         if test "x${VORBIS_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_VORBIS 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_VORBIS 1
 _ACEOF
-         fi
       fi
    elif test -n "${VORBIS_MANDATORY}";
    then
@@ -30450,10 +30564,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${VORBIS_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${VORBIS_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${VORBIS_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${VORBIS_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${VORBIS_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${VORBIS_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -30802,10 +30921,15 @@ fi
 echo "$as_me: ***" >&6;}
             { echo "$as_me:$LINENO: *** It appears that you do not have the z development package installed." >&5
 echo "$as_me: *** It appears that you do not have the z development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ${ZLIB_DESCRIP} support, or re-run configure" >&5
+            if test "x${ZLIB_OPTION}" = "x" ; then
+               { echo "$as_me:$LINENO: *** Please install it to include ${ZLIB_DESCRIP} support" >&5
+echo "$as_me: *** Please install it to include ${ZLIB_DESCRIP} support" >&6;}
+            else
+               { echo "$as_me:$LINENO: *** Please install it to include ${ZLIB_DESCRIP} support, or re-run configure" >&5
 echo "$as_me: *** Please install it to include ${ZLIB_DESCRIP} support, or re-run configure" >&6;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ZLIB_OPTION}" >&5
+               { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ZLIB_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ZLIB_OPTION}" >&6;}
+            fi
             exit 1
          fi
          ZLIB_LIB=""
@@ -30813,17 +30937,9 @@ echo "$as_me: *** without explicitly specifying --with-${ZLIB_OPTION}" >&6;}
          PBX_ZLIB=0
       else
          PBX_ZLIB=1
-         if test "x${ZLIB_OPTION}" = "x"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB 1
-_ACEOF
-
-         else
-            cat >>confdefs.h <<_ACEOF
+         cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB 1
 _ACEOF
-         fi
       fi
    elif test -n "${ZLIB_MANDATORY}";
    then
@@ -30831,10 +30947,15 @@ _ACEOF
 echo "$as_me: ***" >&6;}
       { echo "$as_me:$LINENO: *** The ${ZLIB_DESCRIP} installation on this system appears to be broken." >&5
 echo "$as_me: *** The ${ZLIB_DESCRIP} installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
+      if test "x${ZLIB_OPTION}" = "x" ; then
+         { echo "$as_me:$LINENO: *** Please correct the installation" >&5
+echo "$as_me: *** Please correct the installation" >&6;}
+      else
+         { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
 echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-      { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ZLIB_OPTION}" >&5
+         { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ZLIB_OPTION}" >&5
 echo "$as_me: *** without explicitly specifying --with-${ZLIB_OPTION}" >&6;}
+      fi
       exit 1
    fi
 fi
@@ -32839,6 +32960,14 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PRI_VERSION_LIB!$PRI_VERSION_LIB$ac_delim
+PRI_VERSION_INCLUDE!$PRI_VERSION_INCLUDE$ac_delim
+PRI_VERSION_DIR!$PRI_VERSION_DIR$ac_delim
+PBX_PRI_VERSION!$PBX_PRI_VERSION$ac_delim
+PRI_INBANDDISCONNECT_LIB!$PRI_INBANDDISCONNECT_LIB$ac_delim
+PRI_INBANDDISCONNECT_INCLUDE!$PRI_INBANDDISCONNECT_INCLUDE$ac_delim
+PRI_INBANDDISCONNECT_DIR!$PRI_INBANDDISCONNECT_DIR$ac_delim
+PBX_PRI_INBANDDISCONNECT!$PBX_PRI_INBANDDISCONNECT$ac_delim
 PWLIB_LIB!$PWLIB_LIB$ac_delim
 PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
 PWLIB_DIR!$PWLIB_DIR$ac_delim
@@ -32859,6 +32988,10 @@ SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim
 SPEEXDSP_INCLUDE!$SPEEXDSP_INCLUDE$ac_delim
 SPEEXDSP_DIR!$SPEEXDSP_DIR$ac_delim
 PBX_SPEEXDSP!$PBX_SPEEXDSP$ac_delim
+SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim
+SPEEX_PREPROCESS_INCLUDE!$SPEEX_PREPROCESS_INCLUDE$ac_delim
+SPEEX_PREPROCESS_DIR!$SPEEX_PREPROCESS_DIR$ac_delim
+PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
 SQLITE_LIB!$SQLITE_LIB$ac_delim
 SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
 SQLITE_DIR!$SQLITE_DIR$ac_delim
@@ -32924,18 +33057,6 @@ NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim
 PG_CONFIG!$PG_CONFIG$ac_delim
 PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim
 PWLIBDIR!$PWLIBDIR$ac_delim
-PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim
-PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim
-PWLIB_PLATFORM!$PWLIB_PLATFORM$ac_delim
-OPENH323DIR!$OPENH323DIR$ac_delim
-OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
-OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
-OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
-OPENH323_BUILD!$OPENH323_BUILD$ac_delim
-PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
-PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim
-EDITLINE_LIB!$EDITLINE_LIB$ac_delim
-PBX_H323!$PBX_H323$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -32977,6 +33098,17 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PWLIB_INCDIR!$PWLIB_INCDIR$ac_delim
+PWLIB_LIBDIR!$PWLIB_LIBDIR$ac_delim
+PWLIB_PLATFORM!$PWLIB_PLATFORM$ac_delim
+OPENH323DIR!$OPENH323DIR$ac_delim
+OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
+OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
+OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
+OPENH323_BUILD!$OPENH323_BUILD$ac_delim
+PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim
+EDITLINE_LIB!$EDITLINE_LIB$ac_delim
+PBX_H323!$PBX_H323$ac_delim
 PBX_IXJUSER!$PBX_IXJUSER$ac_delim
 GTKCONFIG!$GTKCONFIG$ac_delim
 PBX_GTK!$PBX_GTK$ac_delim
@@ -32990,7 +33122,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/configure.ac b/configure.ac
index 48fbb72b9c9739e7822887f9c586f5d68e81373c..4bf815fd1a83e1476ee75447f98e53f2cb073227 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -202,11 +202,14 @@ AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
 AST_EXT_LIB_SETUP([POPT], [popt], [popt])
 AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
 AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
+AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri])
+AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
 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([SPEEX], [Speex], [speex])
 AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
+AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex])
 AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
 AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
 AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL], [ssl])

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index dc6c804fb68643b8977a1d0b0a61b6243f72712b..f22758fdc8bceb35f45e0755e06a5d421bbc8139 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -28,7 +28,7 @@
    */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 to indicate ALSA functionality. */
+/* Define to 1 if you have the Advanced Linux Sound Architecture library. */
 #undef HAVE_ALSA
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
@@ -65,7 +65,7 @@
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
-/* Define to 1 to indicate CAP functionality. */
+/* Define to 1 if you have the POSIX 1.e capabilities library. */
 #undef HAVE_CAP
 
 /* Define to 1 if your system has a working `chown' function. */
@@ -74,7 +74,7 @@
 /* Define if your system has the curl libraries. */
 #undef HAVE_CURL
 
-/* Define to 1 to indicate CURSES functionality. */
+/* Define to 1 if you have the curses library. */
 #undef HAVE_CURSES
 
 /* Define if your system has the DAHDI headers. */
@@ -105,7 +105,7 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 to indicate FREETDS functionality. */
+/* Define to 1 if you have the FreeTDS library. */
 #undef HAVE_FREETDS
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
@@ -153,7 +153,8 @@
 /* Define to 1 if your glob function supports GLOB_NOMAGIC option. */
 #undef HAVE_GLOB_NOMAGIC
 
-/* Define to 1 to indicate GNUTLS functionality. */
+/* Define to 1 if you have the GNU TLS support (used for iksemel only)
+   library. */
 #undef HAVE_GNUTLS
 
 /* Define to indicate the GSM library */
@@ -171,7 +172,7 @@
 /* Define if your system has the GTK2 libraries. */
 #undef HAVE_GTK2
 
-/* Define to 1 to indicate IKSEMEL functionality. */
+/* Define to 1 if you have the Iksemel Jabber Library library. */
 #undef HAVE_IKSEMEL
 
 /* Define if your system has the UW IMAP Toolkit c-client library. */
@@ -196,7 +197,7 @@
 /* Define to 1 if you have the `isascii' function. */
 #undef HAVE_ISASCII
 
-/* Define to 1 to indicate ISDNNET functionality. */
+/* Define to 1 if you have the ISDN4Linux Library library. */
 #undef HAVE_ISDNNET
 
 /* Define to 1 if you have the KDE library. */
@@ -220,7 +221,7 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 to indicate LTDL functionality. */
+/* Define to 1 if you have the libtool library. */
 #undef HAVE_LTDL
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -238,7 +239,7 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define to 1 to indicate MISDN functionality. */
+/* Define to 1 if you have the mISDN User Library library. */
 #undef HAVE_MISDN
 
 /* Define to 1 if you have the `mkdir' function. */
@@ -250,10 +251,10 @@
 /* Define to 1 if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
-/* Define to 1 to indicate NBS functionality. */
+/* Define to 1 if you have the Network Broadcast Sound library. */
 #undef HAVE_NBS
 
-/* Define to 1 to indicate NCURSES functionality. */
+/* Define to 1 if you have the ncurses library. */
 #undef HAVE_NCURSES
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
@@ -268,22 +269,22 @@
 /* Define to indicate the Net-SNMP library */
 #undef HAVE_NETSNMP
 
-/* Define to 1 to indicate NEWT functionality. */
+/* Define to 1 if you have the newt library. */
 #undef HAVE_NEWT
 
-/* Define to 1 to indicate OGG functionality. */
+/* Define to 1 if you have the OGG library. */
 #undef HAVE_OGG
 
 /* Define if your system has the OpenH323 libraries. */
 #undef HAVE_OPENH323
 
-/* Define to 1 to indicate OPENSSL functionality. */
+/* Define to 1 if you have the OpenSSL library. */
 #undef HAVE_OPENSSL
 
-/* Define to 1 to indicate OSPTK functionality. */
+/* Define to 1 if you have the OSP Toolkit library. */
 #undef HAVE_OSPTK
 
-/* Define to 1 to indicate OSS functionality. */
+/* Define to indicate the Open Sound System library */
 #undef HAVE_OSS
 
 /* Define to 1 if OSX atomic operations are supported. */
@@ -292,19 +293,19 @@
 /* Define to indicate the PostgreSQL library */
 #undef HAVE_PGSQL
 
-/* Define to 1 to indicate POPT functionality. */
+/* Define to 1 if you have the popt library. */
 #undef HAVE_POPT
 
 /* Define to 1 if you have the `pow' function. */
 #undef HAVE_POW
 
-/* Define to 1 to indicate PRI functionality. */
+/* Define to 1 if you have the ISDN PRI library. */
 #undef HAVE_PRI
 
-/* Define to 1 to indicate PRI_INBANDDISCONNECT functionality. */
+/* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
 #undef HAVE_PRI_INBANDDISCONNECT
 
-/* Define to 1 to indicate PRI_VERSION functionality. */
+/* Define to 1 if you have the ISDN PRI get_version library. */
 #undef HAVE_PRI_VERSION
 
 /* Define if you have POSIX threads libraries and header files. */
@@ -328,7 +329,7 @@
 /* Define if your system has the PWLib libraries. */
 #undef HAVE_PWLIB
 
-/* Define to 1 to indicate RADIUS functionality. */
+/* Define to 1 if you have the Radius Client library. */
 #undef HAVE_RADIUS
 
 /* Define to 1 if you have the `regcomp' function. */
@@ -361,16 +362,16 @@
 /* Define to 1 if your system has soxmix application. */
 #undef HAVE_SOXMIX
 
-/* Define to 1 to indicate SPEEX functionality. */
+/* Define to 1 if you have the Speex library. */
 #undef HAVE_SPEEX
 
-/* Define to 1 to indicate SPEEXDSP functionality. */
+/* Define to 1 if you have the Speexdsp library. */
 #undef HAVE_SPEEXDSP
 
-/* Define to 1 to indicate SPEEX_PREPROCESS functionality. */
+/* Define to 1 if you have the speex_preprocess_ctl library. */
 #undef HAVE_SPEEX_PREPROCESS
 
-/* Define to 1 to indicate SQLITE functionality. */
+/* Define to 1 if you have the SQLite library. */
 #undef HAVE_SQLITE
 
 /* Define to 1 if you have the `sqrt' function. */
@@ -459,7 +460,7 @@
 /* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 to indicate SUPPSERV functionality. */
+/* Define to 1 if you have the mISDN Supplemental Services library. */
 #undef HAVE_SUPPSERV
 
 /* Define to 1 if you have the <syslog.h> header file. */
@@ -503,7 +504,7 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define to 1 to indicate TERMCAP functionality. */
+/* Define to 1 if you have the Termcap library. */
 #undef HAVE_TERMCAP
 
 /* Define to 1 if you have the <termios.h> header file. */
@@ -512,22 +513,22 @@
 /* Define to 1 if your system has timersub in time.h */
 #undef HAVE_TIMERSUB
 
-/* Define to 1 to indicate TINFO functionality. */
+/* Define to 1 if you have the Term Info library. */
 #undef HAVE_TINFO
 
-/* Define to 1 to indicate TONEZONE functionality. */
+/* Define to 1 if you have the tonezone library. */
 #undef HAVE_TONEZONE
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 to indicate UNIXODBC functionality. */
+/* Define to 1 if you have the unixODBC library. */
 #undef HAVE_UNIXODBC
 
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 to indicate USB functionality. */
+/* Define to 1 if you have the usb library. */
 #undef HAVE_USB
 
 /* Define to 1 if you have the `utime' function. */
@@ -548,7 +549,7 @@
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H
 
-/* Define to 1 to indicate VORBIS functionality. */
+/* Define to 1 if you have the Vorbis library. */
 #undef HAVE_VORBIS
 
 /* Define if your system has the VoiceTronix API libraries. */
@@ -569,7 +570,7 @@
 /* Define if your Zaptel drivers have chan_alarms. */
 #undef HAVE_ZAPTEL_CHANALARMS
 
-/* Define to 1 to indicate ZLIB functionality. */
+/* Define to 1 if you have the zlib library. */
 #undef HAVE_ZLIB
 
 /* Define to 1 if the system has the type `_Bool'. */