Make autoheader descriptions render correctly in our autoconfig.h file.

(Figured out while working with issue #14906)


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@214357 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 329 insertions, 35 deletions

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index 07d0fddbb..003564f84 100644
--- a/autoconf/ast_ext_lib.m4
+++ b/autoconf/ast_ext_lib.m4
@@ -19,6 +19,7 @@ case ${withval} in
 esac
 ])
 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])
@@ -68,7 +69,17 @@ if test "${USE_$1}" != "no"; then
          PBX_$1=0
       else
          PBX_$1=1
-         AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to indicate the ${$1_DESCRIP} library])
+         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
+[@%:@define] HAVE_$1 1
+_ACEOF
+         fi
       fi
    elif test -n "${$1_MANDATORY}";
    then
diff --git a/configure b/configure
index 51e75d214..3d8265a36 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 210064 .
+# From configure.ac Revision: 210066 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -7791,6 +7791,8 @@ PBX_ALSA=0
 
 
 
+
+
 CURL_DESCRIP="cURL"
 CURL_OPTION="curl"
 
@@ -7819,6 +7821,8 @@ PBX_CURL=0
 
 
 
+
+
 CAP_DESCRIP="POSIX 1.e capabilities"
 CAP_OPTION="cap"
 
@@ -7847,6 +7851,8 @@ PBX_CAP=0
 
 
 
+
+
 CURSES_DESCRIP="curses"
 CURSES_OPTION="curses"
 
@@ -7875,6 +7881,8 @@ PBX_CURSES=0
 
 
 
+
+
 DAHDI_DESCRIP="DAHDI"
 DAHDI_OPTION="dahdi"
 
@@ -7903,6 +7911,8 @@ PBX_DAHDI=0
 
 
 
+
+
 GNUTLS_DESCRIP="GNU TLS support (used for iksemel only)"
 GNUTLS_OPTION="gnutls"
 
@@ -7931,6 +7941,8 @@ PBX_GNUTLS=0
 
 
 
+
+
 GSM_DESCRIP="GSM"
 GSM_OPTION="gsm"
 
@@ -7959,6 +7971,8 @@ PBX_GSM=0
 
 
 
+
+
 IKSEMEL_DESCRIP="Iksemel Jabber Library"
 IKSEMEL_OPTION="iksemel"
 
@@ -7987,6 +8001,8 @@ PBX_IKSEMEL=0
 
 
 
+
+
 IMAP_TK_DESCRIP="UW IMAP Toolkit"
 IMAP_TK_OPTION="imap"
 
@@ -8015,6 +8031,8 @@ PBX_IMAP_TK=0
 
 
 
+
+
 ISDNNET_DESCRIP="ISDN4Linux Library"
 ISDNNET_OPTION="isdnnet"
 
@@ -8043,6 +8061,8 @@ PBX_ISDNNET=0
 
 
 
+
+
 KDE_DESCRIP="KDE"
 KDE_OPTION="kde"
 
@@ -8071,6 +8091,8 @@ PBX_KDE=0
 
 
 
+
+
 LTDL_DESCRIP="libtool"
 LTDL_OPTION="ltdl"
 
@@ -8099,6 +8121,8 @@ PBX_LTDL=0
 
 
 
+
+
 MISDN_DESCRIP="mISDN User Library"
 MISDN_OPTION="misdn"
 
@@ -8127,6 +8151,8 @@ PBX_MISDN=0
 
 
 
+
+
 NBS_DESCRIP="Network Broadcast Sound"
 NBS_OPTION="nbs"
 
@@ -8155,6 +8181,8 @@ PBX_NBS=0
 
 
 
+
+
 NCURSES_DESCRIP="ncurses"
 NCURSES_OPTION="ncurses"
 
@@ -8183,6 +8211,8 @@ PBX_NCURSES=0
 
 
 
+
+
 NETSNMP_DESCRIP="Net-SNMP"
 NETSNMP_OPTION="netsnmp"
 
@@ -8211,6 +8241,8 @@ PBX_NETSNMP=0
 
 
 
+
+
 NEWT_DESCRIP="newt"
 NEWT_OPTION="newt"
 
@@ -8239,6 +8271,8 @@ PBX_NEWT=0
 
 
 
+
+
 UNIXODBC_DESCRIP="unixODBC"
 UNIXODBC_OPTION="odbc"
 
@@ -8267,6 +8301,8 @@ PBX_UNIXODBC=0
 
 
 
+
+
 OGG_DESCRIP="OGG"
 OGG_OPTION="ogg"
 
@@ -8295,6 +8331,8 @@ PBX_OGG=0
 
 
 
+
+
 OSPTK_DESCRIP="OSP Toolkit"
 OSPTK_OPTION="osptk"
 
@@ -8323,6 +8361,8 @@ PBX_OSPTK=0
 
 
 
+
+
 OSS_DESCRIP="Open Sound System"
 OSS_OPTION="oss"
 
@@ -8351,6 +8391,8 @@ PBX_OSS=0
 
 
 
+
+
 POPT_DESCRIP="popt"
 POPT_OPTION="popt"
 
@@ -8379,6 +8421,8 @@ PBX_POPT=0
 
 
 
+
+
 PGSQL_DESCRIP="PostgreSQL"
 PGSQL_OPTION="postgres"
 
@@ -8407,6 +8451,8 @@ PBX_PGSQL=0
 
 
 
+
+
 PRI_DESCRIP="ISDN PRI"
 PRI_OPTION="pri"
 
@@ -8435,6 +8481,8 @@ PBX_PRI=0
 
 
 
+
+
 PWLIB_DESCRIP="PWlib"
 PWLIB_OPTION="pwlib"
 
@@ -8463,6 +8511,8 @@ PBX_PWLIB=0
 
 
 
+
+
 OPENH323_DESCRIP="OpenH323"
 OPENH323_OPTION="h323"
 
@@ -8491,6 +8541,8 @@ PBX_OPENH323=0
 
 
 
+
+
 RADIUS_DESCRIP="Radius Client"
 RADIUS_OPTION="radius"
 
@@ -8519,6 +8571,8 @@ PBX_RADIUS=0
 
 
 
+
+
 SPEEX_DESCRIP="Speex"
 SPEEX_OPTION="speex"
 
@@ -8547,6 +8601,8 @@ PBX_SPEEX=0
 
 
 
+
+
 SPEEXDSP_DESCRIP="Speexdsp"
 SPEEXDSP_OPTION="speexdsp"
 
@@ -8575,6 +8631,8 @@ PBX_SPEEXDSP=0
 
 
 
+
+
 SQLITE_DESCRIP="SQLite"
 SQLITE_OPTION="sqlite"
 
@@ -8603,6 +8661,8 @@ PBX_SQLITE=0
 
 
 
+
+
 SUPPSERV_DESCRIP="mISDN Supplemental Services"
 SUPPSERV_OPTION="suppserv"
 
@@ -8631,6 +8691,8 @@ PBX_SUPPSERV=0
 
 
 
+
+
 OPENSSL_DESCRIP="OpenSSL"
 OPENSSL_OPTION="ssl"
 
@@ -8659,6 +8721,8 @@ PBX_OPENSSL=0
 
 
 
+
+
 FREETDS_DESCRIP="FreeTDS"
 FREETDS_OPTION="tds"
 
@@ -8687,6 +8751,8 @@ PBX_FREETDS=0
 
 
 
+
+
 TERMCAP_DESCRIP="Termcap"
 TERMCAP_OPTION="termcap"
 
@@ -8715,6 +8781,8 @@ PBX_TERMCAP=0
 
 
 
+
+
 TINFO_DESCRIP="Term Info"
 TINFO_OPTION="tinfo"
 
@@ -8743,6 +8811,8 @@ PBX_TINFO=0
 
 
 
+
+
 TONEZONE_DESCRIP="tonezone"
 TONEZONE_OPTION="tonezone"
 
@@ -8771,6 +8841,8 @@ PBX_TONEZONE=0
 
 
 
+
+
 USB_DESCRIP="usb"
 USB_OPTION="usb"
 
@@ -8799,6 +8871,8 @@ PBX_USB=0
 
 
 
+
+
 VORBIS_DESCRIP="Vorbis"
 VORBIS_OPTION="vorbis"
 
@@ -8827,6 +8901,8 @@ PBX_VORBIS=0
 
 
 
+
+
 VPB_DESCRIP="Voicetronix API"
 VPB_OPTION="vpb"
 
@@ -8855,6 +8931,8 @@ PBX_VPB=0
 
 
 
+
+
 ZLIB_DESCRIP="zlib"
 ZLIB_OPTION="z"
 
@@ -8883,6 +8961,8 @@ PBX_ZLIB=0
 
 
 
+
+
 ZAPTEL_DESCRIP="Zaptel"
 ZAPTEL_OPTION="zaptel"
 
@@ -8911,6 +8991,8 @@ PBX_ZAPTEL=0
 
 
 
+
+
 # check for basic system features and functionality before
 # checking for package libraries
 
@@ -16935,11 +17017,17 @@ 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
 #define HAVE_ALSA 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ALSA 1
+_ACEOF
+         fi
       fi
    elif test -n "${ALSA_MANDATORY}";
    then
@@ -17202,11 +17290,17 @@ 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
+#define HAVE_CURSES 1
+_ACEOF
+         fi
       fi
    elif test -n "${CURSES_MANDATORY}";
    then
@@ -17470,11 +17564,17 @@ 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
+#define HAVE_CAP 1
+_ACEOF
+         fi
       fi
    elif test -n "${CAP_MANDATORY}";
    then
@@ -18596,11 +18696,17 @@ 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
 #define HAVE_IKSEMEL 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_IKSEMEL 1
+_ACEOF
+         fi
       fi
    elif test -n "${IKSEMEL_MANDATORY}";
    then
@@ -18864,11 +18970,17 @@ 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
 #define HAVE_GNUTLS 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS 1
+_ACEOF
+         fi
       fi
    elif test -n "${GNUTLS_MANDATORY}";
    then
@@ -19977,11 +20089,17 @@ 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
 #define HAVE_LTDL 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LTDL 1
+_ACEOF
+         fi
       fi
    elif test -n "${LTDL_MANDATORY}";
    then
@@ -20461,11 +20579,17 @@ 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
 #define HAVE_MISDN 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_MISDN 1
+_ACEOF
+         fi
       fi
    elif test -n "${MISDN_MANDATORY}";
    then
@@ -20729,11 +20853,17 @@ 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
+#define HAVE_ISDNNET 1
+_ACEOF
+         fi
       fi
    elif test -n "${ISDNNET_MANDATORY}";
    then
@@ -20995,11 +21125,17 @@ 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
+#define HAVE_SUPPSERV 1
+_ACEOF
+         fi
       fi
    elif test -n "${SUPPSERV_MANDATORY}";
    then
@@ -21402,11 +21538,17 @@ 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
+#define HAVE_NBS 1
+_ACEOF
+         fi
       fi
    elif test -n "${NBS_MANDATORY}";
    then
@@ -21669,11 +21811,17 @@ 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
+#define HAVE_NCURSES 1
+_ACEOF
+         fi
       fi
    elif test -n "${NCURSES_MANDATORY}";
    then
@@ -22260,11 +22408,17 @@ 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
 #define HAVE_NEWT 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_NEWT 1
+_ACEOF
+         fi
       fi
    elif test -n "${NEWT_MANDATORY}";
    then
@@ -22527,11 +22681,17 @@ 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
 #define HAVE_UNIXODBC 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_UNIXODBC 1
+_ACEOF
+         fi
       fi
    elif test -n "${UNIXODBC_MANDATORY}";
    then
@@ -22794,11 +22954,17 @@ 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
 #define HAVE_OGG 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OGG 1
+_ACEOF
+         fi
       fi
    elif test -n "${OGG_MANDATORY}";
    then
@@ -23350,11 +23516,17 @@ 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
 #define HAVE_OSS 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OSS 1
+_ACEOF
+         fi
       fi
    elif test -n "${OSS_MANDATORY}";
    then
@@ -23959,11 +24131,17 @@ 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
+#define HAVE_POPT 1
+_ACEOF
+         fi
       fi
    elif test -n "${POPT_MANDATORY}";
    then
@@ -24226,11 +24404,17 @@ 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
+#define HAVE_PRI 1
+_ACEOF
+         fi
       fi
    elif test -n "${PRI_MANDATORY}";
    then
@@ -24493,11 +24677,17 @@ 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
 #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
@@ -24760,11 +24950,17 @@ 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
 #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
@@ -26903,11 +27099,17 @@ 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
 #define HAVE_RADIUS 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_RADIUS 1
+_ACEOF
+         fi
       fi
    elif test -n "${RADIUS_MANDATORY}";
    then
@@ -27170,11 +27372,17 @@ 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
 #define HAVE_SPEEX 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPEEX 1
+_ACEOF
+         fi
       fi
    elif test -n "${SPEEX_MANDATORY}";
    then
@@ -27438,11 +27646,17 @@ 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
+#define HAVE_SPEEX_PREPROCESS 1
+_ACEOF
+         fi
       fi
    elif test -n "${SPEEX_PREPROCESS_MANDATORY}";
    then
@@ -27708,11 +27922,17 @@ 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
+#define HAVE_SPEEXDSP 1
+_ACEOF
+         fi
       fi
    elif test -n "${SPEEXDSP_MANDATORY}";
    then
@@ -27980,11 +28200,17 @@ 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
+#define HAVE_SQLITE 1
+_ACEOF
+         fi
       fi
    elif test -n "${SQLITE_MANDATORY}";
    then
@@ -28247,11 +28473,17 @@ 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
+#define HAVE_OPENSSL 1
+_ACEOF
+         fi
       fi
    elif test -n "${OPENSSL_MANDATORY}";
    then
@@ -28515,11 +28747,17 @@ 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
 #define HAVE_OSPTK 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OSPTK 1
+_ACEOF
+         fi
       fi
    elif test -n "${OSPTK_MANDATORY}";
    then
@@ -28783,11 +29021,17 @@ 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
+#define HAVE_FREETDS 1
+_ACEOF
+         fi
       fi
    elif test -n "${FREETDS_MANDATORY}";
    then
@@ -29077,11 +29321,17 @@ 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
 #define HAVE_TERMCAP 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TERMCAP 1
+_ACEOF
+         fi
       fi
    elif test -n "${TERMCAP_MANDATORY}";
    then
@@ -29344,11 +29594,17 @@ 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
 #define HAVE_TINFO 1
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TINFO 1
+_ACEOF
+         fi
       fi
    elif test -n "${TINFO_MANDATORY}";
    then
@@ -29630,11 +29886,17 @@ 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
+#define HAVE_TONEZONE 1
+_ACEOF
+         fi
       fi
    elif test -n "${TONEZONE_MANDATORY}";
    then
@@ -29897,11 +30159,17 @@ 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
+#define HAVE_USB 1
+_ACEOF
+         fi
       fi
    elif test -n "${USB_MANDATORY}";
    then
@@ -30164,11 +30432,17 @@ 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
+#define HAVE_VORBIS 1
+_ACEOF
+         fi
       fi
    elif test -n "${VORBIS_MANDATORY}";
    then
@@ -30539,11 +30813,17 @@ 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
+#define HAVE_ZLIB 1
+_ACEOF
+         fi
       fi
    elif test -n "${ZLIB_MANDATORY}";
    then
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 9fddef692..dc6c804fb 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -28,7 +28,7 @@
    */
 #undef HAVE_ALLOCA_H
 
-/* Define to indicate the ${ALSA_DESCRIP} library */
+/* Define to 1 to indicate ALSA functionality. */
 #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 indicate the ${CAP_DESCRIP} library */
+/* Define to 1 to indicate CAP functionality. */
 #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 indicate the ${CURSES_DESCRIP} library */
+/* Define to 1 to indicate CURSES functionality. */
 #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 indicate the ${FREETDS_DESCRIP} library */
+/* Define to 1 to indicate FREETDS functionality. */
 #undef HAVE_FREETDS
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
@@ -153,7 +153,7 @@
 /* Define to 1 if your glob function supports GLOB_NOMAGIC option. */
 #undef HAVE_GLOB_NOMAGIC
 
-/* Define to indicate the ${GNUTLS_DESCRIP} library */
+/* Define to 1 to indicate GNUTLS functionality. */
 #undef HAVE_GNUTLS
 
 /* Define to indicate the GSM library */
@@ -171,7 +171,7 @@
 /* Define if your system has the GTK2 libraries. */
 #undef HAVE_GTK2
 
-/* Define to indicate the ${IKSEMEL_DESCRIP} library */
+/* Define to 1 to indicate IKSEMEL functionality. */
 #undef HAVE_IKSEMEL
 
 /* Define if your system has the UW IMAP Toolkit c-client library. */
@@ -196,9 +196,12 @@
 /* Define to 1 if you have the `isascii' function. */
 #undef HAVE_ISASCII
 
-/* Define to indicate the ${ISDNNET_DESCRIP} library */
+/* Define to 1 to indicate ISDNNET functionality. */
 #undef HAVE_ISDNNET
 
+/* Define to 1 if you have the KDE library. */
+#undef HAVE_KDE
+
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
@@ -217,7 +220,7 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to indicate the ${LTDL_DESCRIP} library */
+/* Define to 1 to indicate LTDL functionality. */
 #undef HAVE_LTDL
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -235,7 +238,7 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define to indicate the ${MISDN_DESCRIP} library */
+/* Define to 1 to indicate MISDN functionality. */
 #undef HAVE_MISDN
 
 /* Define to 1 if you have the `mkdir' function. */
@@ -247,10 +250,10 @@
 /* Define to 1 if you have the `munmap' function. */
 #undef HAVE_MUNMAP
 
-/* Define to indicate the ${NBS_DESCRIP} library */
+/* Define to 1 to indicate NBS functionality. */
 #undef HAVE_NBS
 
-/* Define to indicate the ${NCURSES_DESCRIP} library */
+/* Define to 1 to indicate NCURSES functionality. */
 #undef HAVE_NCURSES
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
@@ -265,22 +268,22 @@
 /* Define to indicate the Net-SNMP library */
 #undef HAVE_NETSNMP
 
-/* Define to indicate the ${NEWT_DESCRIP} library */
+/* Define to 1 to indicate NEWT functionality. */
 #undef HAVE_NEWT
 
-/* Define to indicate the ${OGG_DESCRIP} library */
+/* Define to 1 to indicate OGG functionality. */
 #undef HAVE_OGG
 
 /* Define if your system has the OpenH323 libraries. */
 #undef HAVE_OPENH323
 
-/* Define to indicate the ${OPENSSL_DESCRIP} library */
+/* Define to 1 to indicate OPENSSL functionality. */
 #undef HAVE_OPENSSL
 
-/* Define to indicate the ${OSPTK_DESCRIP} library */
+/* Define to 1 to indicate OSPTK functionality. */
 #undef HAVE_OSPTK
 
-/* Define to indicate the ${OSS_DESCRIP} library */
+/* Define to 1 to indicate OSS functionality. */
 #undef HAVE_OSS
 
 /* Define to 1 if OSX atomic operations are supported. */
@@ -289,19 +292,19 @@
 /* Define to indicate the PostgreSQL library */
 #undef HAVE_PGSQL
 
-/* Define to indicate the ${POPT_DESCRIP} library */
+/* Define to 1 to indicate POPT functionality. */
 #undef HAVE_POPT
 
 /* Define to 1 if you have the `pow' function. */
 #undef HAVE_POW
 
-/* Define to indicate the ${PRI_DESCRIP} library */
+/* Define to 1 to indicate PRI functionality. */
 #undef HAVE_PRI
 
-/* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library */
+/* Define to 1 to indicate PRI_INBANDDISCONNECT functionality. */
 #undef HAVE_PRI_INBANDDISCONNECT
 
-/* Define to indicate the ${PRI_VERSION_DESCRIP} library */
+/* Define to 1 to indicate PRI_VERSION functionality. */
 #undef HAVE_PRI_VERSION
 
 /* Define if you have POSIX threads libraries and header files. */
@@ -325,7 +328,7 @@
 /* Define if your system has the PWLib libraries. */
 #undef HAVE_PWLIB
 
-/* Define to indicate the ${RADIUS_DESCRIP} library */
+/* Define to 1 to indicate RADIUS functionality. */
 #undef HAVE_RADIUS
 
 /* Define to 1 if you have the `regcomp' function. */
@@ -358,16 +361,16 @@
 /* Define to 1 if your system has soxmix application. */
 #undef HAVE_SOXMIX
 
-/* Define to indicate the ${SPEEX_DESCRIP} library */
+/* Define to 1 to indicate SPEEX functionality. */
 #undef HAVE_SPEEX
 
-/* Define to indicate the ${SPEEXDSP_DESCRIP} library */
+/* Define to 1 to indicate SPEEXDSP functionality. */
 #undef HAVE_SPEEXDSP
 
-/* Define to indicate the ${SPEEX_PREPROCESS_DESCRIP} library */
+/* Define to 1 to indicate SPEEX_PREPROCESS functionality. */
 #undef HAVE_SPEEX_PREPROCESS
 
-/* Define to indicate the ${SQLITE_DESCRIP} library */
+/* Define to 1 to indicate SQLITE functionality. */
 #undef HAVE_SQLITE
 
 /* Define to 1 if you have the `sqrt' function. */
@@ -456,7 +459,7 @@
 /* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to indicate the ${SUPPSERV_DESCRIP} library */
+/* Define to 1 to indicate SUPPSERV functionality. */
 #undef HAVE_SUPPSERV
 
 /* Define to 1 if you have the <syslog.h> header file. */
@@ -500,7 +503,7 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define to indicate the ${TERMCAP_DESCRIP} library */
+/* Define to 1 to indicate TERMCAP functionality. */
 #undef HAVE_TERMCAP
 
 /* Define to 1 if you have the <termios.h> header file. */
@@ -509,22 +512,22 @@
 /* Define to 1 if your system has timersub in time.h */
 #undef HAVE_TIMERSUB
 
-/* Define to indicate the ${TINFO_DESCRIP} library */
+/* Define to 1 to indicate TINFO functionality. */
 #undef HAVE_TINFO
 
-/* Define to indicate the ${TONEZONE_DESCRIP} library */
+/* Define to 1 to indicate TONEZONE functionality. */
 #undef HAVE_TONEZONE
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to indicate the ${UNIXODBC_DESCRIP} library */
+/* Define to 1 to indicate UNIXODBC functionality. */
 #undef HAVE_UNIXODBC
 
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to indicate the ${USB_DESCRIP} library */
+/* Define to 1 to indicate USB functionality. */
 #undef HAVE_USB
 
 /* Define to 1 if you have the `utime' function. */
@@ -545,7 +548,7 @@
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H
 
-/* Define to indicate the ${VORBIS_DESCRIP} library */
+/* Define to 1 to indicate VORBIS functionality. */
 #undef HAVE_VORBIS
 
 /* Define if your system has the VoiceTronix API libraries. */
@@ -566,7 +569,7 @@
 /* Define if your Zaptel drivers have chan_alarms. */
 #undef HAVE_ZAPTEL_CHANALARMS
 
-/* Define to indicate the ${ZLIB_DESCRIP} library */
+/* Define to 1 to indicate ZLIB functionality. */
 #undef HAVE_ZLIB
 
 /* Define to 1 if the system has the type `_Bool'. */