diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index 907d7994481523fde5b52633d75772f43be9bb39..3a563d8ac62f5fab4f3c19ca982ea4935db251bb 100644
--- a/autoconf/ast_ext_lib.m4
+++ b/autoconf/ast_ext_lib.m4
@@ -29,6 +29,7 @@ AC_DEFUN([AST_EXT_LIB_SETUP],
 	;;
 	esac
     ])
+    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])
@@ -73,7 +74,7 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
-	 AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
+         AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
          CPPFLAGS="${saved_cppflags}"
       fi
       if test "x${$1_HEADER_FOUND}" = "x0" ; then
@@ -84,9 +85,19 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
 	    $1_LIB=""
 	 fi
          PBX_$1=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
-         AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define this to indicate the ${$1_DESCRIP} library])
-	 AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the ${$1_DESCRIP} library version])
+         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.])
+            AC_DEFINE_UNQUOTED([HAVE_$1_VERSION], [$7], [Define to indicate the $1 library version])
+         else
+            cat >>confdefs.h <<_ACEOF
+[@%:@define] HAVE_$1 1
+[@%:@define] HAVE_$1_VERSION $7
+_ACEOF
+         fi
       fi
    fi
 fi
diff --git a/configure b/configure
index 31843efcfacccd8ebca5bd3479b7bd7c7db287b9..43e620586d80d84a3876a8e80df85c922973f724 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 213748 .
+# From configure.ac Revision: 214152 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -8170,6 +8170,8 @@ fi
 
 
 
+
+
 # BKTR is used for backtrace support on platforms that do not
 # have it natively.
 
@@ -8204,6 +8206,8 @@ fi
 
 
 
+
+
     BLUETOOTH_DESCRIP="Bluetooth Support"
     BLUETOOTH_OPTION="bluetooth"
     PBX_BLUETOOTH=0
@@ -8235,6 +8239,8 @@ fi
 
 
 
+
+
     CAP_DESCRIP="POSIX 1.e capabilities"
     CAP_OPTION="cap"
     PBX_CAP=0
@@ -8266,6 +8272,8 @@ fi
 
 
 
+
+
     CURL_DESCRIP="cURL"
     CURL_OPTION="curl"
     PBX_CURL=0
@@ -8297,6 +8305,8 @@ fi
 
 
 
+
+
     CURSES_DESCRIP="curses"
     CURSES_OPTION="curses"
     PBX_CURSES=0
@@ -8328,6 +8338,8 @@ fi
 
 
 
+
+
     CRYPTO_DESCRIP="OpenSSL Cryptography support"
     CRYPTO_OPTION="crypto"
     PBX_CRYPTO=0
@@ -8359,6 +8371,8 @@ fi
 
 
 
+
+
     DAHDI_DESCRIP="DAHDI"
     DAHDI_OPTION="dahdi"
     PBX_DAHDI=0
@@ -8390,6 +8404,8 @@ fi
 
 
 
+
+
     FFMPEG_DESCRIP="Ffmpeg and avcodec library"
     FFMPEG_OPTION="avcodec"
     PBX_FFMPEG=0
@@ -8421,6 +8437,8 @@ fi
 
 
 
+
+
     GSM_DESCRIP="External GSM library"
     GSM_OPTION="gsm"
     PBX_GSM=0
@@ -8452,6 +8470,8 @@ fi
 
 
 
+
+
     GTK_DESCRIP="gtk libraries"
     GTK_OPTION="gtk"
     PBX_GTK=0
@@ -8483,6 +8503,8 @@ fi
 
 
 
+
+
     GTK2_DESCRIP="gtk2 libraries"
     GTK2_OPTION="gtk2"
     PBX_GTK2=0
@@ -8514,6 +8536,8 @@ fi
 
 
 
+
+
     GMIME_DESCRIP="GMime library"
     GMIME_OPTION="gmime"
     PBX_GMIME=0
@@ -8545,6 +8569,8 @@ fi
 
 
 
+
+
     HOARD_DESCRIP="Hoard Memory Allocator"
     HOARD_OPTION="hoard"
     PBX_HOARD=0
@@ -8576,6 +8602,8 @@ fi
 
 
 
+
+
     ICAL_DESCRIP="ical libraries"
     ICAL_OPTION="ical"
     PBX_ICAL=0
@@ -8607,6 +8635,8 @@ fi
 
 
 
+
+
     ICONV_DESCRIP="Iconv Library"
     ICONV_OPTION="iconv"
     PBX_ICONV=0
@@ -8638,6 +8668,8 @@ fi
 
 
 
+
+
     IKSEMEL_DESCRIP="Iksemel Jabber Library"
     IKSEMEL_OPTION="iksemel"
     PBX_IKSEMEL=0
@@ -8669,6 +8701,8 @@ fi
 
 
 
+
+
     IMAP_TK_DESCRIP="UW IMAP Toolkit"
     IMAP_TK_OPTION="imap"
     PBX_IMAP_TK=0
@@ -8700,6 +8734,8 @@ fi
 
 
 
+
+
     INOTIFY_DESCRIP="inotify support"
     INOTIFY_OPTION="inotify"
     PBX_INOTIFY=0
@@ -8731,6 +8767,8 @@ fi
 
 
 
+
+
     IODBC_DESCRIP="iODBC"
     IODBC_OPTION="iodbc"
     PBX_IODBC=0
@@ -8762,6 +8800,8 @@ fi
 
 
 
+
+
     ISDNNET_DESCRIP="ISDN4Linux Library"
     ISDNNET_OPTION="isdnnet"
     PBX_ISDNNET=0
@@ -8793,6 +8833,8 @@ fi
 
 
 
+
+
     JACK_DESCRIP="Jack Audio Connection Kit"
     JACK_OPTION="jack"
     PBX_JACK=0
@@ -8824,6 +8866,8 @@ fi
 
 
 
+
+
     LDAP_DESCRIP="OpenLDAP"
     LDAP_OPTION="ldap"
     PBX_LDAP=0
@@ -8855,6 +8899,8 @@ fi
 
 
 
+
+
     LIBXML2_DESCRIP="LibXML2"
     LIBXML2_OPTION="libxml2"
     PBX_LIBXML2=0
@@ -8886,6 +8932,8 @@ fi
 
 
 
+
+
     LTDL_DESCRIP="libtool"
     LTDL_OPTION="ltdl"
     PBX_LTDL=0
@@ -8917,6 +8965,8 @@ fi
 
 
 
+
+
     LUA_DESCRIP="Lua"
     LUA_OPTION="lua"
     PBX_LUA=0
@@ -8948,6 +8998,8 @@ fi
 
 
 
+
+
     MISDN_DESCRIP="mISDN User Library"
     MISDN_OPTION="misdn"
     PBX_MISDN=0
@@ -8979,6 +9031,8 @@ fi
 
 
 
+
+
     MYSQLCLIENT_DESCRIP="mysqlclient"
     MYSQLCLIENT_OPTION="mysqlclient"
     PBX_MYSQLCLIENT=0
@@ -9010,6 +9064,8 @@ fi
 
 
 
+
+
     NBS_DESCRIP="Network Broadcast Sound"
     NBS_OPTION="nbs"
     PBX_NBS=0
@@ -9041,6 +9097,8 @@ fi
 
 
 
+
+
     NCURSES_DESCRIP="ncurses"
     NCURSES_OPTION="ncurses"
     PBX_NCURSES=0
@@ -9072,6 +9130,8 @@ fi
 
 
 
+
+
     NEON_DESCRIP="neon"
     NEON_OPTION="neon"
     PBX_NEON=0
@@ -9103,6 +9163,8 @@ fi
 
 
 
+
+
     NETSNMP_DESCRIP="Net-SNMP"
     NETSNMP_OPTION="netsnmp"
     PBX_NETSNMP=0
@@ -9134,6 +9196,8 @@ fi
 
 
 
+
+
     NEWT_DESCRIP="newt"
     NEWT_OPTION="newt"
     PBX_NEWT=0
@@ -9165,6 +9229,8 @@ fi
 
 
 
+
+
     OGG_DESCRIP="OGG"
     OGG_OPTION="ogg"
     PBX_OGG=0
@@ -9196,6 +9262,8 @@ fi
 
 
 
+
+
     OSPTK_DESCRIP="OSP Toolkit"
     OSPTK_OPTION="osptk"
     PBX_OSPTK=0
@@ -9227,6 +9295,8 @@ fi
 
 
 
+
+
     OSS_DESCRIP="Open Sound System"
     OSS_OPTION="oss"
     PBX_OSS=0
@@ -9258,6 +9328,8 @@ fi
 
 
 
+
+
     PGSQL_DESCRIP="PostgreSQL"
     PGSQL_OPTION="postgres"
     PBX_PGSQL=0
@@ -9289,6 +9361,8 @@ fi
 
 
 
+
+
     POPT_DESCRIP="popt"
     POPT_OPTION="popt"
     PBX_POPT=0
@@ -9320,6 +9394,8 @@ fi
 
 
 
+
+
     PORTAUDIO_DESCRIP="PortAudio"
     PORTAUDIO_OPTION="portaudio"
     PBX_PORTAUDIO=0
@@ -9351,6 +9427,8 @@ fi
 
 
 
+
+
     PRI_DESCRIP="ISDN PRI"
     PRI_OPTION="pri"
     PBX_PRI=0
@@ -9382,6 +9460,8 @@ fi
 
 
 
+
+
     RESAMPLE_DESCRIP="LIBRESAMPLE"
     RESAMPLE_OPTION="resample"
     PBX_RESAMPLE=0
@@ -9413,6 +9493,8 @@ fi
 
 
 
+
+
     SPANDSP_DESCRIP="SPANDSP"
     SPANDSP_OPTION="spandsp"
     PBX_SPANDSP=0
@@ -9444,6 +9526,8 @@ fi
 
 
 
+
+
     SS7_DESCRIP="ISDN SS7"
     SS7_OPTION="ss7"
     PBX_SS7=0
@@ -9475,6 +9559,8 @@ fi
 
 
 
+
+
     OPENR2_DESCRIP="MFR2"
     OPENR2_OPTION="openr2"
     PBX_OPENR2=0
@@ -9506,6 +9592,8 @@ fi
 
 
 
+
+
     PWLIB_DESCRIP="PWlib"
     PWLIB_OPTION="pwlib"
     PBX_PWLIB=0
@@ -9537,6 +9625,8 @@ fi
 
 
 
+
+
     OPENH323_DESCRIP="OpenH323"
     OPENH323_OPTION="h323"
     PBX_OPENH323=0
@@ -9568,6 +9658,8 @@ fi
 
 
 
+
+
     RADIUS_DESCRIP="Radius Client"
     RADIUS_OPTION="radius"
     PBX_RADIUS=0
@@ -9599,6 +9691,8 @@ fi
 
 
 
+
+
     SDL_DESCRIP="Sdl"
     SDL_OPTION="sdl"
     PBX_SDL=0
@@ -9630,6 +9724,8 @@ fi
 
 
 
+
+
     SDL_IMAGE_DESCRIP="Sdl Image library"
     SDL_IMAGE_OPTION="SDL_image"
     PBX_SDL_IMAGE=0
@@ -9661,6 +9757,8 @@ fi
 
 
 
+
+
     OPENAIS_DESCRIP="OpenAIS"
     OPENAIS_OPTION="openais"
     PBX_OPENAIS=0
@@ -9692,6 +9790,8 @@ fi
 
 
 
+
+
     SPEEX_DESCRIP="Speex"
     SPEEX_OPTION="speex"
     PBX_SPEEX=0
@@ -9723,6 +9823,8 @@ fi
 
 
 
+
+
     SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines"
     SPEEX_PREPROCESS_OPTION="speex"
     PBX_SPEEX_PREPROCESS=0
@@ -9754,6 +9856,8 @@ fi
 
 
 
+
+
     SPEEXDSP_DESCRIP="Speexdsp"
     SPEEXDSP_OPTION="speexdsp"
     PBX_SPEEXDSP=0
@@ -9785,6 +9889,8 @@ fi
 
 
 
+
+
     SQLITE_DESCRIP="SQLite"
     SQLITE_OPTION="sqlite"
     PBX_SQLITE=0
@@ -9816,6 +9922,8 @@ fi
 
 
 
+
+
     SQLITE3_DESCRIP="SQLite"
     SQLITE3_OPTION="sqlite3"
     PBX_SQLITE3=0
@@ -9847,6 +9955,8 @@ fi
 
 
 
+
+
     SUPPSERV_DESCRIP="mISDN Supplemental Services"
     SUPPSERV_OPTION="suppserv"
     PBX_SUPPSERV=0
@@ -9878,6 +9988,8 @@ fi
 
 
 
+
+
     OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer support"
     OPENSSL_OPTION="ssl"
     PBX_OPENSSL=0
@@ -9909,6 +10021,8 @@ fi
 
 
 
+
+
     FREETDS_DESCRIP="FreeTDS"
     FREETDS_OPTION="tds"
     PBX_FREETDS=0
@@ -9940,6 +10054,8 @@ fi
 
 
 
+
+
     TERMCAP_DESCRIP="Termcap"
     TERMCAP_OPTION="termcap"
     PBX_TERMCAP=0
@@ -9971,6 +10087,8 @@ fi
 
 
 
+
+
     TINFO_DESCRIP="Term Info"
     TINFO_OPTION="tinfo"
     PBX_TINFO=0
@@ -10002,6 +10120,8 @@ fi
 
 
 
+
+
     TONEZONE_DESCRIP="tonezone"
     TONEZONE_OPTION="tonezone"
     PBX_TONEZONE=0
@@ -10033,6 +10153,8 @@ fi
 
 
 
+
+
     UNIXODBC_DESCRIP="unixODBC"
     UNIXODBC_OPTION="unixodbc"
     PBX_UNIXODBC=0
@@ -10064,6 +10186,8 @@ fi
 
 
 
+
+
     USB_DESCRIP="usb"
     USB_OPTION="usb"
     PBX_USB=0
@@ -10095,6 +10219,8 @@ fi
 
 
 
+
+
     VORBIS_DESCRIP="Vorbis"
     VORBIS_OPTION="vorbis"
     PBX_VORBIS=0
@@ -10126,6 +10252,8 @@ fi
 
 
 
+
+
     VPB_DESCRIP="Voicetronix API"
     VPB_OPTION="vpb"
     PBX_VPB=0
@@ -10157,6 +10285,8 @@ fi
 
 
 
+
+
     X11_DESCRIP="X11 support"
     X11_OPTION="x11"
     PBX_X11=0
@@ -10188,6 +10318,8 @@ fi
 
 
 
+
+
     ZLIB_DESCRIP="zlib"
     ZLIB_OPTION="z"
     PBX_ZLIB=0
@@ -10219,6 +10351,8 @@ fi
 
 
 
+
+
     TIMERFD_DESCRIP="timerfd"
     TIMERFD_OPTION="timerfd"
     PBX_TIMERFD=0
@@ -10250,6 +10384,8 @@ fi
 
 
 
+
+
 # check for basic system features and functionality before
 # checking for package libraries
 
@@ -20283,7 +20419,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}"
-	 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
+         if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
 echo $ECHO_N "checking for alsa/asoundlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
@@ -20430,7 +20566,7 @@ fi
 	    ALSA_LIB=""
 	 fi
          PBX_ALSA=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ALSA_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ALSA 1
@@ -20441,6 +20577,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ALSA_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ALSA 1
+#define HAVE_ALSA_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -20545,7 +20687,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}"
-	 if test "${ac_cv_header_curses_h+set}" = set; then
+         if test "${ac_cv_header_curses_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for curses.h" >&5
 echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_curses_h+set}" = set; then
@@ -20692,7 +20834,7 @@ fi
 	    CURSES_LIB=""
 	 fi
          PBX_CURSES=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${CURSES_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CURSES 1
@@ -20703,6 +20845,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_CURSES_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_CURSES 1
+#define HAVE_CURSES_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -20808,7 +20956,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}"
-	 if test "${ac_cv_header_sys_capability_h+set}" = set; then
+         if test "${ac_cv_header_sys_capability_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sys/capability.h" >&5
 echo $ECHO_N "checking for sys/capability.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_capability_h+set}" = set; then
@@ -20955,7 +21103,7 @@ fi
 	    CAP_LIB=""
 	 fi
          PBX_CAP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${CAP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CAP 1
@@ -20966,6 +21114,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_CAP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_CAP 1
+#define HAVE_CAP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -21378,7 +21532,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXP2L_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -21525,7 +21679,7 @@ fi
 	    EXP2L_LIB=""
 	 fi
          PBX_EXP2L=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXP2L_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP2L 1
@@ -21536,6 +21690,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP2L_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXP2L 1
+#define HAVE_EXP2L_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -21639,7 +21799,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOG2L_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -21786,7 +21946,7 @@ fi
 	    LOG2L_LIB=""
 	 fi
          PBX_LOG2L=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOG2L_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG2L 1
@@ -21797,6 +21957,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG2L_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOG2L 1
+#define HAVE_LOG2L_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -21900,7 +22066,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXP10L_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -22047,7 +22213,7 @@ fi
 	    EXP10L_LIB=""
 	 fi
          PBX_EXP10L=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXP10L_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP10L 1
@@ -22058,6 +22224,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP10L_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXP10L 1
+#define HAVE_EXP10L_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -22161,7 +22333,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOG10L_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -22308,7 +22480,7 @@ fi
 	    LOG10L_LIB=""
 	 fi
          PBX_LOG10L=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOG10L_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG10L 1
@@ -22319,6 +22491,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG10L_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOG10L 1
+#define HAVE_LOG10L_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -22422,7 +22600,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SINL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -22569,7 +22747,7 @@ fi
 	    SINL_LIB=""
 	 fi
          PBX_SINL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SINL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SINL 1
@@ -22580,6 +22758,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SINL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SINL 1
+#define HAVE_SINL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -22683,7 +22867,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${COSL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -22830,7 +23014,7 @@ fi
 	    COSL_LIB=""
 	 fi
          PBX_COSL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${COSL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_COSL 1
@@ -22841,6 +23025,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_COSL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_COSL 1
+#define HAVE_COSL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -22944,7 +23134,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TANL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -23091,7 +23281,7 @@ fi
 	    TANL_LIB=""
 	 fi
          PBX_TANL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TANL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TANL 1
@@ -23102,6 +23292,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TANL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TANL 1
+#define HAVE_TANL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -23205,7 +23401,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ASINL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -23352,7 +23548,7 @@ fi
 	    ASINL_LIB=""
 	 fi
          PBX_ASINL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ASINL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ASINL 1
@@ -23363,6 +23559,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ASINL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ASINL 1
+#define HAVE_ASINL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -23466,7 +23668,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ACOSL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -23613,7 +23815,7 @@ fi
 	    ACOSL_LIB=""
 	 fi
          PBX_ACOSL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ACOSL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ACOSL 1
@@ -23624,6 +23826,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ACOSL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ACOSL 1
+#define HAVE_ACOSL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -23727,7 +23935,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ATANL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -23874,7 +24082,7 @@ fi
 	    ATANL_LIB=""
 	 fi
          PBX_ATANL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ATANL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ATANL 1
@@ -23885,6 +24093,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ATANL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ATANL 1
+#define HAVE_ATANL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -23988,7 +24202,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ATAN2L_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -24135,7 +24349,7 @@ fi
 	    ATAN2L_LIB=""
 	 fi
          PBX_ATAN2L=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ATAN2L_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN2L 1
@@ -24146,6 +24360,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN2L_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ATAN2L 1
+#define HAVE_ATAN2L_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -24249,7 +24469,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${POWL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -24396,7 +24616,7 @@ fi
 	    POWL_LIB=""
 	 fi
          PBX_POWL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${POWL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_POWL 1
@@ -24407,6 +24627,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_POWL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_POWL 1
+#define HAVE_POWL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -24510,7 +24736,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQRTL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -24657,7 +24883,7 @@ fi
 	    SQRTL_LIB=""
 	 fi
          PBX_SQRTL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SQRTL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SQRTL 1
@@ -24668,6 +24894,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SQRTL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SQRTL 1
+#define HAVE_SQRTL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -24771,7 +25003,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RINTL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -24918,7 +25150,7 @@ fi
 	    RINTL_LIB=""
 	 fi
          PBX_RINTL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${RINTL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_RINTL 1
@@ -24929,6 +25161,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_RINTL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_RINTL 1
+#define HAVE_RINTL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -25032,7 +25270,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXPL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -25179,7 +25417,7 @@ fi
 	    EXPL_LIB=""
 	 fi
          PBX_EXPL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXPL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXPL 1
@@ -25190,6 +25428,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXPL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXPL 1
+#define HAVE_EXPL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -25293,7 +25537,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOGL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -25440,7 +25684,7 @@ fi
 	    LOGL_LIB=""
 	 fi
          PBX_LOGL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOGL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOGL 1
@@ -25451,6 +25695,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOGL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOGL 1
+#define HAVE_LOGL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -25554,7 +25804,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${REMAINDERL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -25701,7 +25951,7 @@ fi
 	    REMAINDERL_LIB=""
 	 fi
          PBX_REMAINDERL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${REMAINDERL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_REMAINDERL 1
@@ -25712,6 +25962,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_REMAINDERL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_REMAINDERL 1
+#define HAVE_REMAINDERL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -25815,7 +26071,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FMODL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -25962,7 +26218,7 @@ fi
 	    FMODL_LIB=""
 	 fi
          PBX_FMODL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FMODL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FMODL 1
@@ -25973,6 +26229,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FMODL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FMODL 1
+#define HAVE_FMODL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -26076,7 +26338,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ROUNDL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -26223,7 +26485,7 @@ fi
 	    ROUNDL_LIB=""
 	 fi
          PBX_ROUNDL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ROUNDL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ROUNDL 1
@@ -26234,6 +26496,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ROUNDL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ROUNDL 1
+#define HAVE_ROUNDL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -26337,7 +26605,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TRUNCL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -26484,7 +26752,7 @@ fi
 	    TRUNCL_LIB=""
 	 fi
          PBX_TRUNCL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TRUNCL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TRUNCL 1
@@ -26495,6 +26763,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TRUNCL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TRUNCL 1
+#define HAVE_TRUNCL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -26598,7 +26872,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${STRTOLD_INCLUDE}"
-	 if test "${ac_cv_header_stdlib_h+set}" = set; then
+         if test "${ac_cv_header_stdlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for stdlib.h" >&5
 echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdlib_h+set}" = set; then
@@ -26745,7 +27019,7 @@ fi
 	    STRTOLD_LIB=""
 	 fi
          PBX_STRTOLD=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${STRTOLD_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOLD 1
@@ -26756,6 +27030,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOLD_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_STRTOLD 1
+#define HAVE_STRTOLD_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -26859,7 +27139,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FLOORL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -27006,7 +27286,7 @@ fi
 	    FLOORL_LIB=""
 	 fi
          PBX_FLOORL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FLOORL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOORL 1
@@ -27017,6 +27297,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOORL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FLOORL 1
+#define HAVE_FLOORL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -27120,7 +27406,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CEILL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -27267,7 +27553,7 @@ fi
 	    CEILL_LIB=""
 	 fi
          PBX_CEILL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${CEILL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CEILL 1
@@ -27278,6 +27564,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_CEILL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_CEILL 1
+#define HAVE_CEILL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -27381,7 +27673,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXP2_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -27528,7 +27820,7 @@ fi
 	    EXP2_LIB=""
 	 fi
          PBX_EXP2=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXP2_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP2 1
@@ -27539,6 +27831,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP2_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXP2 1
+#define HAVE_EXP2_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -27642,7 +27940,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOG2_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -27789,7 +28087,7 @@ fi
 	    LOG2_LIB=""
 	 fi
          PBX_LOG2=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOG2_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG2 1
@@ -27800,6 +28098,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG2_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOG2 1
+#define HAVE_LOG2_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -27903,7 +28207,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXP10_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -28050,7 +28354,7 @@ fi
 	    EXP10_LIB=""
 	 fi
          PBX_EXP10=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXP10_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP10 1
@@ -28061,6 +28365,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP10_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXP10 1
+#define HAVE_EXP10_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -28164,7 +28474,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOG10_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -28311,7 +28621,7 @@ fi
 	    LOG10_LIB=""
 	 fi
          PBX_LOG10=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOG10_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG10 1
@@ -28322,6 +28632,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG10_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOG10 1
+#define HAVE_LOG10_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -28425,7 +28741,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SIN_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -28572,7 +28888,7 @@ fi
 	    SIN_LIB=""
 	 fi
          PBX_SIN=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SIN_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SIN 1
@@ -28583,6 +28899,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SIN_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SIN 1
+#define HAVE_SIN_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -28686,7 +29008,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${COS_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -28833,7 +29155,7 @@ fi
 	    COS_LIB=""
 	 fi
          PBX_COS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${COS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_COS 1
@@ -28844,6 +29166,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_COS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_COS 1
+#define HAVE_COS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -28947,7 +29275,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TAN_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -29094,7 +29422,7 @@ fi
 	    TAN_LIB=""
 	 fi
          PBX_TAN=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TAN_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TAN 1
@@ -29105,6 +29433,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TAN_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TAN 1
+#define HAVE_TAN_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -29208,7 +29542,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ASIN_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -29355,7 +29689,7 @@ fi
 	    ASIN_LIB=""
 	 fi
          PBX_ASIN=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ASIN_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ASIN 1
@@ -29366,6 +29700,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ASIN_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ASIN 1
+#define HAVE_ASIN_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -29469,7 +29809,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ACOS_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -29616,7 +29956,7 @@ fi
 	    ACOS_LIB=""
 	 fi
          PBX_ACOS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ACOS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ACOS 1
@@ -29627,6 +29967,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ACOS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ACOS 1
+#define HAVE_ACOS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -29730,7 +30076,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ATAN_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -29877,7 +30223,7 @@ fi
 	    ATAN_LIB=""
 	 fi
          PBX_ATAN=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ATAN_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN 1
@@ -29888,6 +30234,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ATAN 1
+#define HAVE_ATAN_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -29991,7 +30343,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ATAN2_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -30138,7 +30490,7 @@ fi
 	    ATAN2_LIB=""
 	 fi
          PBX_ATAN2=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ATAN2_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN2 1
@@ -30149,6 +30501,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ATAN2_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ATAN2 1
+#define HAVE_ATAN2_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -30252,7 +30610,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${POW_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -30399,7 +30757,7 @@ fi
 	    POW_LIB=""
 	 fi
          PBX_POW=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${POW_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_POW 1
@@ -30410,6 +30768,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_POW_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_POW 1
+#define HAVE_POW_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -30513,7 +30877,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQRT_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -30660,7 +31024,7 @@ fi
 	    SQRT_LIB=""
 	 fi
          PBX_SQRT=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SQRT_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SQRT 1
@@ -30671,6 +31035,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SQRT_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SQRT 1
+#define HAVE_SQRT_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -30774,7 +31144,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RINT_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -30921,7 +31291,7 @@ fi
 	    RINT_LIB=""
 	 fi
          PBX_RINT=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${RINT_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_RINT 1
@@ -30932,6 +31302,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_RINT_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_RINT 1
+#define HAVE_RINT_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -31035,7 +31411,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${EXP_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -31182,7 +31558,7 @@ fi
 	    EXP_LIB=""
 	 fi
          PBX_EXP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${EXP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP 1
@@ -31193,6 +31569,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_EXP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_EXP 1
+#define HAVE_EXP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -31296,7 +31678,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LOG_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -31443,7 +31825,7 @@ fi
 	    LOG_LIB=""
 	 fi
          PBX_LOG=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LOG_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG 1
@@ -31454,6 +31836,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LOG_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LOG 1
+#define HAVE_LOG_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -31557,7 +31945,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${REMAINDER_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -31704,7 +32092,7 @@ fi
 	    REMAINDER_LIB=""
 	 fi
          PBX_REMAINDER=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${REMAINDER_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_REMAINDER 1
@@ -31715,6 +32103,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_REMAINDER_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_REMAINDER 1
+#define HAVE_REMAINDER_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -31818,7 +32212,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FMOD_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -31965,7 +32359,7 @@ fi
 	    FMOD_LIB=""
 	 fi
          PBX_FMOD=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FMOD_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FMOD 1
@@ -31976,6 +32370,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FMOD_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FMOD 1
+#define HAVE_FMOD_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -32079,7 +32479,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ROUND_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -32226,7 +32626,7 @@ fi
 	    ROUND_LIB=""
 	 fi
          PBX_ROUND=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ROUND_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ROUND 1
@@ -32237,6 +32637,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ROUND_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ROUND 1
+#define HAVE_ROUND_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -32340,7 +32746,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TRUNC_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -32487,7 +32893,7 @@ fi
 	    TRUNC_LIB=""
 	 fi
          PBX_TRUNC=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TRUNC_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TRUNC 1
@@ -32498,6 +32904,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TRUNC_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TRUNC 1
+#define HAVE_TRUNC_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -32601,7 +33013,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${STRTOD_INCLUDE}"
-	 if test "${ac_cv_header_stdlib_h+set}" = set; then
+         if test "${ac_cv_header_stdlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for stdlib.h" >&5
 echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdlib_h+set}" = set; then
@@ -32748,7 +33160,7 @@ fi
 	    STRTOD_LIB=""
 	 fi
          PBX_STRTOD=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${STRTOD_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOD 1
@@ -32759,6 +33171,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOD_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_STRTOD 1
+#define HAVE_STRTOD_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -32862,7 +33280,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FLOOR_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -33009,7 +33427,7 @@ fi
 	    FLOOR_LIB=""
 	 fi
          PBX_FLOOR=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FLOOR_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOOR 1
@@ -33020,6 +33438,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOOR_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FLOOR 1
+#define HAVE_FLOOR_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -33123,7 +33547,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CEIL_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -33270,7 +33694,7 @@ fi
 	    CEIL_LIB=""
 	 fi
          PBX_CEIL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${CEIL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CEIL 1
@@ -33281,6 +33705,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_CEIL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_CEIL 1
+#define HAVE_CEIL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -34235,7 +34665,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
-	 if test "${ac_cv_header_iconv_h+set}" = set; then
+         if test "${ac_cv_header_iconv_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for iconv.h" >&5
 echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_iconv_h+set}" = set; then
@@ -34382,7 +34812,7 @@ fi
 	    ICONV_LIB=""
 	 fi
          PBX_ICONV=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ICONV_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ICONV 1
@@ -34393,6 +34823,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ICONV_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ICONV 1
+#define HAVE_ICONV_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -34497,7 +34933,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
-	 if test "${ac_cv_header_iconv_h+set}" = set; then
+         if test "${ac_cv_header_iconv_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for iconv.h" >&5
 echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_iconv_h+set}" = set; then
@@ -34644,7 +35080,7 @@ fi
 	    ICONV_LIB=""
 	 fi
          PBX_ICONV=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ICONV_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ICONV 1
@@ -34655,6 +35091,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ICONV_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ICONV 1
+#define HAVE_ICONV_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -34759,7 +35201,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}"
-	 if test "${ac_cv_header_libical_ical_h+set}" = set; then
+         if test "${ac_cv_header_libical_ical_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libical/ical.h" >&5
 echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libical_ical_h+set}" = set; then
@@ -34906,7 +35348,7 @@ fi
 	    ICAL_LIB=""
 	 fi
          PBX_ICAL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ICAL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ICAL 1
@@ -34917,6 +35359,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ICAL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ICAL 1
+#define HAVE_ICAL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -35021,7 +35469,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}"
-	 if test "${ac_cv_header_iksemel_h+set}" = set; then
+         if test "${ac_cv_header_iksemel_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for iksemel.h" >&5
 echo $ECHO_N "checking for iksemel.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_iksemel_h+set}" = set; then
@@ -35168,7 +35616,7 @@ fi
 	    IKSEMEL_LIB=""
 	 fi
          PBX_IKSEMEL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${IKSEMEL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_IKSEMEL 1
@@ -35179,6 +35627,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_IKSEMEL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_IKSEMEL 1
+#define HAVE_IKSEMEL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -36115,7 +36569,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}"
-	 if test "${ac_cv_header_sql_h+set}" = set; then
+         if test "${ac_cv_header_sql_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sql.h" >&5
 echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sql_h+set}" = set; then
@@ -36262,7 +36716,7 @@ fi
 	    IODBC_LIB=""
 	 fi
          PBX_IODBC=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${IODBC_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_IODBC 1
@@ -36273,6 +36727,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_IODBC_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_IODBC 1
+#define HAVE_IODBC_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -36377,7 +36837,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}"
-	 if test "${ac_cv_header_sys_inotify_h+set}" = set; then
+         if test "${ac_cv_header_sys_inotify_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
 echo $ECHO_N "checking for sys/inotify.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_inotify_h+set}" = set; then
@@ -36524,7 +36984,7 @@ fi
 	    INOTIFY_LIB=""
 	 fi
          PBX_INOTIFY=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${INOTIFY_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_INOTIFY 1
@@ -36535,6 +36995,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_INOTIFY_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_INOTIFY 1
+#define HAVE_INOTIFY_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -36639,7 +37105,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}"
-	 if test "${ac_cv_header_jack_jack_h+set}" = set; then
+         if test "${ac_cv_header_jack_jack_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for jack/jack.h" >&5
 echo $ECHO_N "checking for jack/jack.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_jack_jack_h+set}" = set; then
@@ -36786,7 +37252,7 @@ fi
 	    JACK_LIB=""
 	 fi
          PBX_JACK=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${JACK_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_JACK 1
@@ -36797,6 +37263,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_JACK_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_JACK 1
+#define HAVE_JACK_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -36902,7 +37374,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LTDL_INCLUDE}"
-	 if test "${ac_cv_header_ltdl_h+set}" = set; then
+         if test "${ac_cv_header_ltdl_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ltdl.h" >&5
 echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_ltdl_h+set}" = set; then
@@ -37049,7 +37521,7 @@ fi
 	    LTDL_LIB=""
 	 fi
          PBX_LTDL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LTDL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LTDL 1
@@ -37060,6 +37532,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LTDL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LTDL 1
+#define HAVE_LTDL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -37164,7 +37642,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}"
-	 if test "${ac_cv_header_ldap_h+set}" = set; then
+         if test "${ac_cv_header_ldap_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ldap.h" >&5
 echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_ldap_h+set}" = set; then
@@ -37311,7 +37789,7 @@ fi
 	    LDAP_LIB=""
 	 fi
          PBX_LDAP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LDAP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP 1
@@ -37322,6 +37800,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LDAP 1
+#define HAVE_LDAP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -37632,7 +38116,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}"
-	 if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then
+         if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/mISDNlib.h" >&5
 echo $ECHO_N "checking for mISDNuser/mISDNlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_mISDNuser_mISDNlib_h+set}" = set; then
@@ -37779,7 +38263,7 @@ fi
 	    MISDN_LIB=""
 	 fi
          PBX_MISDN=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${MISDN_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_MISDN 1
@@ -37790,6 +38274,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_MISDN_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_MISDN 1
+#define HAVE_MISDN_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -37895,7 +38385,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}"
-	 if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then
+         if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/isdn_net.h" >&5
 echo $ECHO_N "checking for mISDNuser/isdn_net.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_mISDNuser_isdn_net_h+set}" = set; then
@@ -38042,7 +38532,7 @@ fi
 	    ISDNNET_LIB=""
 	 fi
          PBX_ISDNNET=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ISDNNET_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ISDNNET 1
@@ -38053,6 +38543,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ISDNNET_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ISDNNET 1
+#define HAVE_ISDNNET_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -38156,7 +38652,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}"
-	 if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then
+         if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for mISDNuser/suppserv.h" >&5
 echo $ECHO_N "checking for mISDNuser/suppserv.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_mISDNuser_suppserv_h+set}" = set; then
@@ -38303,7 +38799,7 @@ fi
 	    SUPPSERV_LIB=""
 	 fi
          PBX_SUPPSERV=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SUPPSERV_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SUPPSERV 1
@@ -38314,6 +38810,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SUPPSERV_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SUPPSERV 1
+#define HAVE_SUPPSERV_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -38889,7 +39391,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}"
-	 if test "${ac_cv_header_nbs_h+set}" = set; then
+         if test "${ac_cv_header_nbs_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for nbs.h" >&5
 echo $ECHO_N "checking for nbs.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_nbs_h+set}" = set; then
@@ -39036,7 +39538,7 @@ fi
 	    NBS_LIB=""
 	 fi
          PBX_NBS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${NBS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_NBS 1
@@ -39047,6 +39549,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_NBS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_NBS 1
+#define HAVE_NBS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -39151,7 +39659,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
-	 if test "${ac_cv_header_curses_h+set}" = set; then
+         if test "${ac_cv_header_curses_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for curses.h" >&5
 echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_curses_h+set}" = set; then
@@ -39298,7 +39806,7 @@ fi
 	    NCURSES_LIB=""
 	 fi
          PBX_NCURSES=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${NCURSES_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_NCURSES 1
@@ -39309,6 +39817,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_NCURSES_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_NCURSES 1
+#define HAVE_NCURSES_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -39775,7 +40289,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
-	 if test "${ac_cv_header_newt_h+set}" = set; then
+         if test "${ac_cv_header_newt_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for newt.h" >&5
 echo $ECHO_N "checking for newt.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_newt_h+set}" = set; then
@@ -39922,7 +40436,7 @@ fi
 	    NEWT_LIB=""
 	 fi
          PBX_NEWT=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${NEWT_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_NEWT 1
@@ -39933,6 +40447,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_NEWT_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_NEWT 1
+#define HAVE_NEWT_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -40037,7 +40557,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}"
-	 if test "${ac_cv_header_sql_h+set}" = set; then
+         if test "${ac_cv_header_sql_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sql.h" >&5
 echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sql_h+set}" = set; then
@@ -40184,7 +40704,7 @@ fi
 	    UNIXODBC_LIB=""
 	 fi
          PBX_UNIXODBC=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${UNIXODBC_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UNIXODBC 1
@@ -40195,6 +40715,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_UNIXODBC_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_UNIXODBC 1
+#define HAVE_UNIXODBC_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -40299,7 +40825,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -40446,7 +40972,7 @@ fi
 	    OGG_LIB=""
 	 fi
          PBX_OGG=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OGG_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OGG 1
@@ -40457,6 +40983,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OGG_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OGG 1
+#define HAVE_OGG_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -40562,7 +41094,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
-	 if test "${ac_cv_header_execinfo_h+set}" = set; then
+         if test "${ac_cv_header_execinfo_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for execinfo.h" >&5
 echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_execinfo_h+set}" = set; then
@@ -40709,7 +41241,7 @@ fi
 	    BKTR_LIB=""
 	 fi
          PBX_BKTR=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${BKTR_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_BKTR 1
@@ -40720,6 +41252,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_BKTR_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_BKTR 1
+#define HAVE_BKTR_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -40824,7 +41362,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
-	 if test "${ac_cv_header_execinfo_h+set}" = set; then
+         if test "${ac_cv_header_execinfo_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for execinfo.h" >&5
 echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_execinfo_h+set}" = set; then
@@ -40971,7 +41509,7 @@ fi
 	    BKTR_LIB=""
 	 fi
          PBX_BKTR=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${BKTR_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_BKTR 1
@@ -40982,6 +41520,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_BKTR_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_BKTR 1
+#define HAVE_BKTR_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -41086,7 +41630,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE}"
-	 if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
+         if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5
 echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
@@ -41233,7 +41777,7 @@ fi
 	    BLUETOOTH_LIB=""
 	 fi
          PBX_BLUETOOTH=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${BLUETOOTH_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_BLUETOOTH 1
@@ -41244,6 +41788,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_BLUETOOTH_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_BLUETOOTH 1
+#define HAVE_BLUETOOTH_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -41349,7 +41899,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-	 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
+         if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
 echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
@@ -41496,7 +42046,7 @@ fi
 	    OSS_LIB=""
 	 fi
          PBX_OSS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OSS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS 1
@@ -41507,6 +42057,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OSS 1
+#define HAVE_OSS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -41610,7 +42166,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-	 if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
+         if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
 echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
@@ -41757,7 +42313,7 @@ fi
 	    OSS_LIB=""
 	 fi
          PBX_OSS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OSS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS 1
@@ -41768,6 +42324,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OSS 1
+#define HAVE_OSS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -41871,7 +42433,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-	 if test "${ac_cv_header_soundcard_h+set}" = set; then
+         if test "${ac_cv_header_soundcard_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for soundcard.h" >&5
 echo $ECHO_N "checking for soundcard.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_soundcard_h+set}" = set; then
@@ -42018,7 +42580,7 @@ fi
 	    OSS_LIB=""
 	 fi
          PBX_OSS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OSS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS 1
@@ -42029,6 +42591,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OSS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OSS 1
+#define HAVE_OSS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -42461,7 +43029,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}"
-	 if test "${ac_cv_header_popt_h+set}" = set; then
+         if test "${ac_cv_header_popt_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for popt.h" >&5
 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_popt_h+set}" = set; then
@@ -42608,7 +43176,7 @@ fi
 	    POPT_LIB=""
 	 fi
          PBX_POPT=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${POPT_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_POPT 1
@@ -42619,6 +43187,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_POPT_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_POPT 1
+#define HAVE_POPT_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -42723,7 +43297,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}"
-	 if test "${ac_cv_header_portaudio_h+set}" = set; then
+         if test "${ac_cv_header_portaudio_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for portaudio.h" >&5
 echo $ECHO_N "checking for portaudio.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_portaudio_h+set}" = set; then
@@ -42870,7 +43444,7 @@ fi
 	    PORTAUDIO_LIB=""
 	 fi
          PBX_PORTAUDIO=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PORTAUDIO_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PORTAUDIO 1
@@ -42881,6 +43455,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PORTAUDIO_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PORTAUDIO 1
+#define HAVE_PORTAUDIO_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -42985,7 +43565,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}"
-	 if test "${ac_cv_header_libpri_h+set}" = set; then
+         if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libpri_h+set}" = set; then
@@ -43132,7 +43712,7 @@ fi
 	    PRI_LIB=""
 	 fi
          PBX_PRI=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PRI_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI 1
@@ -43143,6 +43723,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PRI 1
+#define HAVE_PRI_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -43250,7 +43836,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}"
-	 if test "${ac_cv_header_libpri_h+set}" = set; then
+         if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libpri_h+set}" = set; then
@@ -43397,7 +43983,7 @@ fi
 	    PRI_PROG_W_CAUSE_LIB=""
 	 fi
          PBX_PRI_PROG_W_CAUSE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PRI_PROG_W_CAUSE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_PROG_W_CAUSE 1
@@ -43408,6 +43994,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_PROG_W_CAUSE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PRI_PROG_W_CAUSE 1
+#define HAVE_PRI_PROG_W_CAUSE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -43511,7 +44103,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
-	 if test "${ac_cv_header_libpri_h+set}" = set; then
+         if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libpri_h+set}" = set; then
@@ -43658,7 +44250,7 @@ fi
 	    PRI_INBANDDISCONNECT_LIB=""
 	 fi
          PBX_PRI_INBANDDISCONNECT=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PRI_INBANDDISCONNECT_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_INBANDDISCONNECT 1
@@ -43669,6 +44261,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_INBANDDISCONNECT_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PRI_INBANDDISCONNECT 1
+#define HAVE_PRI_INBANDDISCONNECT_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -43772,7 +44370,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_SERVICE_MESSAGES_INCLUDE}"
-	 if test "${ac_cv_header_libpri_h+set}" = set; then
+         if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libpri_h+set}" = set; then
@@ -43919,7 +44517,7 @@ fi
 	    PRI_SERVICE_MESSAGES_LIB=""
 	 fi
          PBX_PRI_SERVICE_MESSAGES=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PRI_SERVICE_MESSAGES_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_SERVICE_MESSAGES 1
@@ -43930,6 +44528,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_SERVICE_MESSAGES_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PRI_SERVICE_MESSAGES 1
+#define HAVE_PRI_SERVICE_MESSAGES_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -44033,7 +44637,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_REVERSE_CHARGE_INCLUDE}"
-	 if test "${ac_cv_header_libpri_h+set}" = set; then
+         if test "${ac_cv_header_libpri_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libpri.h" >&5
 echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libpri_h+set}" = set; then
@@ -44180,7 +44784,7 @@ fi
 	    PRI_REVERSE_CHARGE_LIB=""
 	 fi
          PBX_PRI_REVERSE_CHARGE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${PRI_REVERSE_CHARGE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_REVERSE_CHARGE 1
@@ -44191,6 +44795,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_PRI_REVERSE_CHARGE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_PRI_REVERSE_CHARGE 1
+#define HAVE_PRI_REVERSE_CHARGE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -44296,7 +44906,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}"
-	 if test "${ac_cv_header_libresample_h+set}" = set; then
+         if test "${ac_cv_header_libresample_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libresample.h" >&5
 echo $ECHO_N "checking for libresample.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libresample_h+set}" = set; then
@@ -44443,7 +45053,7 @@ fi
 	    RESAMPLE_LIB=""
 	 fi
          PBX_RESAMPLE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${RESAMPLE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_RESAMPLE 1
@@ -44454,6 +45064,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_RESAMPLE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_RESAMPLE 1
+#define HAVE_RESAMPLE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -44650,7 +45266,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
-	 if test "${ac_cv_header_spandsp_h+set}" = set; then
+         if test "${ac_cv_header_spandsp_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for spandsp.h" >&5
 echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_spandsp_h+set}" = set; then
@@ -44797,7 +45413,7 @@ fi
 	    SPANDSP_LIB=""
 	 fi
          PBX_SPANDSP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SPANDSP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SPANDSP 1
@@ -44808,6 +45424,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SPANDSP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPANDSP 1
+#define HAVE_SPANDSP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -44916,7 +45538,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
-	 if test "${ac_cv_header_spandsp_h+set}" = set; then
+         if test "${ac_cv_header_spandsp_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for spandsp.h" >&5
 echo $ECHO_N "checking for spandsp.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_spandsp_h+set}" = set; then
@@ -45063,7 +45685,7 @@ fi
 	    SPANDSP_LIB=""
 	 fi
          PBX_SPANDSP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SPANDSP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SPANDSP 1
@@ -45074,6 +45696,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SPANDSP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPANDSP 1
+#define HAVE_SPANDSP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -45179,7 +45807,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}"
-	 if test "${ac_cv_header_libss7_h+set}" = set; then
+         if test "${ac_cv_header_libss7_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for libss7.h" >&5
 echo $ECHO_N "checking for libss7.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_libss7_h+set}" = set; then
@@ -45326,7 +45954,7 @@ fi
 	    SS7_LIB=""
 	 fi
          PBX_SS7=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SS7_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SS7 1
@@ -45337,6 +45965,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SS7_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SS7 1
+#define HAVE_SS7_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -45441,7 +46075,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}"
-	 if test "${ac_cv_header_openr2_h+set}" = set; then
+         if test "${ac_cv_header_openr2_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openr2.h" >&5
 echo $ECHO_N "checking for openr2.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openr2_h+set}" = set; then
@@ -45588,7 +46222,7 @@ fi
 	    OPENR2_LIB=""
 	 fi
          PBX_OPENR2=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OPENR2_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENR2 1
@@ -45599,6 +46233,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENR2_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENR2 1
+#define HAVE_OPENR2_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -47558,7 +48198,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-	 if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
+         if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5
 echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
@@ -47705,7 +48345,7 @@ fi
 	    LUA_LIB=""
 	 fi
          PBX_LUA=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LUA_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LUA 1
@@ -47716,6 +48356,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LUA_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LUA 1
+#define HAVE_LUA_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -47820,7 +48466,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-	 if test "${ac_cv_header_lua_h+set}" = set; then
+         if test "${ac_cv_header_lua_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for lua.h" >&5
 echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lua_h+set}" = set; then
@@ -47967,7 +48613,7 @@ fi
 	    LUA_LIB=""
 	 fi
          PBX_LUA=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${LUA_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LUA 1
@@ -47978,6 +48624,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_LUA_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_LUA 1
+#define HAVE_LUA_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -48082,7 +48734,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
-	 if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
+         if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5
 echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
@@ -48229,7 +48881,7 @@ fi
 	    RADIUS_LIB=""
 	 fi
          PBX_RADIUS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${RADIUS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_RADIUS 1
@@ -48240,6 +48892,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_RADIUS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_RADIUS 1
+#define HAVE_RADIUS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -48353,7 +49011,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENAIS_INCLUDE}"
-	 if test "${ac_cv_header_openais_saClm_h+set}" = set; then
+         if test "${ac_cv_header_openais_saClm_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openais/saClm.h" >&5
 echo $ECHO_N "checking for openais/saClm.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openais_saClm_h+set}" = set; then
@@ -48500,7 +49158,7 @@ fi
 	    OPENAIS_LIB=""
 	 fi
          PBX_OPENAIS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OPENAIS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENAIS 1
@@ -48511,6 +49169,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENAIS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENAIS 1
+#define HAVE_OPENAIS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -48630,7 +49294,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}"
-	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
+         if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_speex_speex_h+set}" = set; then
@@ -48777,7 +49441,7 @@ fi
 	    SPEEX_LIB=""
 	 fi
          PBX_SPEEX=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SPEEX_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX 1
@@ -48788,6 +49452,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPEEX 1
+#define HAVE_SPEEX_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -48893,7 +49563,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}"
-	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
+         if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_speex_speex_h+set}" = set; then
@@ -49040,7 +49710,7 @@ fi
 	    SPEEX_PREPROCESS_LIB=""
 	 fi
          PBX_SPEEX_PREPROCESS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SPEEX_PREPROCESS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX_PREPROCESS 1
@@ -49051,6 +49721,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEX_PREPROCESS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPEEX_PREPROCESS 1
+#define HAVE_SPEEX_PREPROCESS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -49158,7 +49834,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}"
-	 if test "${ac_cv_header_speex_speex_h+set}" = set; then
+         if test "${ac_cv_header_speex_speex_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for speex/speex.h" >&5
 echo $ECHO_N "checking for speex/speex.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_speex_speex_h+set}" = set; then
@@ -49305,7 +49981,7 @@ fi
 	    SPEEXDSP_LIB=""
 	 fi
          PBX_SPEEXDSP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SPEEXDSP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEXDSP 1
@@ -49316,6 +49992,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SPEEXDSP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SPEEXDSP 1
+#define HAVE_SPEEXDSP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -49425,7 +50107,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}"
-	 if test "${ac_cv_header_sqlite_h+set}" = set; then
+         if test "${ac_cv_header_sqlite_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sqlite.h" >&5
 echo $ECHO_N "checking for sqlite.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sqlite_h+set}" = set; then
@@ -49572,7 +50254,7 @@ fi
 	    SQLITE_LIB=""
 	 fi
          PBX_SQLITE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SQLITE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SQLITE 1
@@ -49583,6 +50265,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SQLITE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE 1
+#define HAVE_SQLITE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -49687,7 +50375,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}"
-	 if test "${ac_cv_header_sqlite3_h+set}" = set; then
+         if test "${ac_cv_header_sqlite3_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sqlite3.h" >&5
 echo $ECHO_N "checking for sqlite3.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sqlite3_h+set}" = set; then
@@ -49834,7 +50522,7 @@ fi
 	    SQLITE3_LIB=""
 	 fi
          PBX_SQLITE3=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SQLITE3_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SQLITE3 1
@@ -49845,6 +50533,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SQLITE3_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3 1
+#define HAVE_SQLITE3_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -49949,7 +50643,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}"
-	 if test "${ac_cv_header_openssl_aes_h+set}" = set; then
+         if test "${ac_cv_header_openssl_aes_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openssl/aes.h" >&5
 echo $ECHO_N "checking for openssl/aes.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openssl_aes_h+set}" = set; then
@@ -50096,7 +50790,7 @@ fi
 	    CRYPTO_LIB=""
 	 fi
          PBX_CRYPTO=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${CRYPTO_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPTO 1
@@ -50107,6 +50801,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPTO_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_CRYPTO 1
+#define HAVE_CRYPTO_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -50213,7 +50913,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}"
-	 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
+         if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
 echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
@@ -50360,7 +51060,7 @@ fi
 	    OPENSSL_LIB=""
 	 fi
          PBX_OPENSSL=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${OPENSSL_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL 1
@@ -50371,6 +51071,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL 1
+#define HAVE_OPENSSL_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -50969,7 +51675,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${HOARD_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -51116,7 +51822,7 @@ fi
 	    HOARD_LIB=""
 	 fi
          PBX_HOARD=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${HOARD_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_HOARD 1
@@ -51127,6 +51833,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_HOARD_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_HOARD 1
+#define HAVE_HOARD_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -51231,7 +51943,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}"
-	 if test "${ac_cv_header_sybdb_h+set}" = set; then
+         if test "${ac_cv_header_sybdb_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sybdb.h" >&5
 echo $ECHO_N "checking for sybdb.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_sybdb_h+set}" = set; then
@@ -51378,7 +52090,7 @@ fi
 	    FREETDS_LIB=""
 	 fi
          PBX_FREETDS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FREETDS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETDS 1
@@ -51389,6 +52101,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETDS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FREETDS 1
+#define HAVE_FREETDS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -51493,7 +52211,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TERMCAP_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -51640,7 +52358,7 @@ fi
 	    TERMCAP_LIB=""
 	 fi
          PBX_TERMCAP=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TERMCAP_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TERMCAP 1
@@ -51651,6 +52369,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TERMCAP_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TERMCAP 1
+#define HAVE_TERMCAP_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -51755,7 +52479,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
-	 if test "${ac_cv_header_+set}" = set; then
+         if test "${ac_cv_header_+set}" = set; then
   { echo "$as_me:$LINENO: checking for " >&5
 echo $ECHO_N "checking for ... $ECHO_C" >&6; }
 if test "${ac_cv_header_+set}" = set; then
@@ -51902,7 +52626,7 @@ fi
 	    TINFO_LIB=""
 	 fi
          PBX_TINFO=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TINFO_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TINFO 1
@@ -51913,6 +52637,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TINFO_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TINFO 1
+#define HAVE_TINFO_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -52089,7 +52819,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}"
-	 if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then
+         if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for dahdi/tonezone.h" >&5
 echo $ECHO_N "checking for dahdi/tonezone.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_dahdi_tonezone_h+set}" = set; then
@@ -52236,7 +52966,7 @@ fi
 	    TONEZONE_LIB=""
 	 fi
          PBX_TONEZONE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${TONEZONE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_TONEZONE 1
@@ -52247,6 +52977,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_TONEZONE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_TONEZONE 1
+#define HAVE_TONEZONE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -52351,7 +53087,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE}"
-	 if test "${ac_cv_header_usb_h+set}" = set; then
+         if test "${ac_cv_header_usb_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for usb.h" >&5
 echo $ECHO_N "checking for usb.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_usb_h+set}" = set; then
@@ -52498,7 +53234,7 @@ fi
 	    USB_LIB=""
 	 fi
          PBX_USB=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${USB_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_USB 1
@@ -52509,6 +53245,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_USB_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_USB 1
+#define HAVE_USB_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -52615,7 +53357,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
-	 if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
+         if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5
 echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
@@ -52762,7 +53504,7 @@ fi
 	    VORBIS_LIB=""
 	 fi
          PBX_VORBIS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${VORBIS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_VORBIS 1
@@ -52773,6 +53515,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_VORBIS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS 1
+#define HAVE_VORBIS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -52877,7 +53625,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
-	 if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
+         if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for vorbis/codec.h" >&5
 echo $ECHO_N "checking for vorbis/codec.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_vorbis_codec_h+set}" = set; then
@@ -53024,7 +53772,7 @@ fi
 	    VORBIS_LIB=""
 	 fi
          PBX_VORBIS=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${VORBIS_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_VORBIS 1
@@ -53035,6 +53783,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_VORBIS_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS 1
+#define HAVE_VORBIS_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -53238,7 +53992,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}"
-	 if test "${ac_cv_header_zlib_h+set}" = set; then
+         if test "${ac_cv_header_zlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for zlib.h" >&5
 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_zlib_h+set}" = set; then
@@ -53385,7 +54139,7 @@ fi
 	    ZLIB_LIB=""
 	 fi
          PBX_ZLIB=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${ZLIB_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB 1
@@ -53396,6 +54150,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_ZLIB 1
+#define HAVE_ZLIB_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -54031,7 +54791,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
-	 if test "${ac_cv_header_SDL_image_h+set}" = set; then
+         if test "${ac_cv_header_SDL_image_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for SDL_image.h" >&5
 echo $ECHO_N "checking for SDL_image.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_SDL_image_h+set}" = set; then
@@ -54178,7 +54938,7 @@ fi
 	    SDL_IMAGE_LIB=""
 	 fi
          PBX_SDL_IMAGE=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${SDL_IMAGE_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SDL_IMAGE 1
@@ -54189,6 +54949,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_SDL_IMAGE_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_IMAGE 1
+#define HAVE_SDL_IMAGE_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -54292,7 +55058,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}"
-	 if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
+         if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
 echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
@@ -54439,7 +55205,7 @@ fi
 	    FFMPEG_LIB=""
 	 fi
          PBX_FFMPEG=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${FFMPEG_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG 1
@@ -54450,6 +55216,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG_VERSION
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_FFMPEG 1
+#define HAVE_FFMPEG_VERSION
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -54696,7 +55468,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
-	 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+         if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -54843,7 +55615,7 @@ fi
 	    X11_LIB=""
 	 fi
          PBX_X11=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${X11_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_X11 1
@@ -54854,6 +55626,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_X11_VERSION standard_path
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_X11 1
+#define HAVE_X11_VERSION standard_path
+_ACEOF
+         fi
       fi
    fi
 fi
@@ -54957,7 +55735,7 @@ fi
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
-	 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+         if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
 echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -55104,7 +55882,7 @@ fi
 	    X11_LIB=""
 	 fi
          PBX_X11=1
-         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+         if test "x${X11_OPTION}" = "x"; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_X11 1
@@ -55115,6 +55893,12 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_X11_VERSION X11R6
 _ACEOF
 
+         else
+            cat >>confdefs.h <<_ACEOF
+#define HAVE_X11 1
+#define HAVE_X11_VERSION X11R6
+_ACEOF
+         fi
       fi
    fi
 fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index b6a988ecfbbdb47caedafbb5f5d037a511305e22..2fc0d361a41e1b7166608ff3ad3921165d07c817 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -21,16 +21,16 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define this to indicate the ${ACOS_DESCRIP} library */
+/* Define to 1 to indicate ACOS functionality. */
 #undef HAVE_ACOS
 
-/* Define this to indicate the ${ACOSL_DESCRIP} library */
+/* Define to 1 to indicate ACOSL functionality. */
 #undef HAVE_ACOSL
 
-/* Define to indicate the ${ACOSL_DESCRIP} library version */
+/* Define to indicate the ACOSL library version */
 #undef HAVE_ACOSL_VERSION
 
-/* Define to indicate the ${ACOS_DESCRIP} library version */
+/* Define to indicate the ACOS library version */
 #undef HAVE_ACOS_VERSION
 
 /* Define to 1 if you have `alloca', as a function or macro. */
@@ -40,10 +40,10 @@
    */
 #undef HAVE_ALLOCA_H
 
-/* Define this to indicate the ${ALSA_DESCRIP} library */
+/* Define to 1 to indicate ALSA functionality. */
 #undef HAVE_ALSA
 
-/* Define to indicate the ${ALSA_DESCRIP} library version */
+/* Define to indicate the ALSA library version */
 #undef HAVE_ALSA_VERSION
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
@@ -52,43 +52,43 @@
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
 #undef HAVE_ARPA_NAMESER_H
 
-/* Define this to indicate the ${ASIN_DESCRIP} library */
+/* Define to 1 to indicate ASIN functionality. */
 #undef HAVE_ASIN
 
-/* Define this to indicate the ${ASINL_DESCRIP} library */
+/* Define to 1 to indicate ASINL functionality. */
 #undef HAVE_ASINL
 
-/* Define to indicate the ${ASINL_DESCRIP} library version */
+/* Define to indicate the ASINL library version */
 #undef HAVE_ASINL_VERSION
 
-/* Define to indicate the ${ASIN_DESCRIP} library version */
+/* Define to indicate the ASIN library version */
 #undef HAVE_ASIN_VERSION
 
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define this to indicate the ${ATAN_DESCRIP} library */
+/* Define to 1 to indicate ATAN functionality. */
 #undef HAVE_ATAN
 
-/* Define this to indicate the ${ATAN2_DESCRIP} library */
+/* Define to 1 to indicate ATAN2 functionality. */
 #undef HAVE_ATAN2
 
-/* Define this to indicate the ${ATAN2L_DESCRIP} library */
+/* Define to 1 to indicate ATAN2L functionality. */
 #undef HAVE_ATAN2L
 
-/* Define to indicate the ${ATAN2L_DESCRIP} library version */
+/* Define to indicate the ATAN2L library version */
 #undef HAVE_ATAN2L_VERSION
 
-/* Define to indicate the ${ATAN2_DESCRIP} library version */
+/* Define to indicate the ATAN2 library version */
 #undef HAVE_ATAN2_VERSION
 
-/* Define this to indicate the ${ATANL_DESCRIP} library */
+/* Define to 1 to indicate ATANL functionality. */
 #undef HAVE_ATANL
 
-/* Define to indicate the ${ATANL_DESCRIP} library version */
+/* Define to indicate the ATANL library version */
 #undef HAVE_ATANL_VERSION
 
-/* Define to indicate the ${ATAN_DESCRIP} library version */
+/* Define to indicate the ATAN library version */
 #undef HAVE_ATAN_VERSION
 
 /* Define to 1 if you have the `atexit' function. */
@@ -126,37 +126,37 @@
 /* Define to 1 if your GCC C compiler supports the 'weakref' attribute. */
 #undef HAVE_ATTRIBUTE_weakref
 
-/* Define this to indicate the ${BKTR_DESCRIP} library */
+/* Define to 1 to indicate BKTR functionality. */
 #undef HAVE_BKTR
 
-/* Define to indicate the ${BKTR_DESCRIP} library version */
+/* Define to indicate the BKTR library version */
 #undef HAVE_BKTR_VERSION
 
-/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+/* Define to 1 to indicate BLUETOOTH functionality. */
 #undef HAVE_BLUETOOTH
 
-/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+/* Define to indicate the BLUETOOTH library version */
 #undef HAVE_BLUETOOTH_VERSION
 
 /* Define to 1 if byteswap.h macros are available. */
 #undef HAVE_BYTESWAP_H
 
-/* Define this to indicate the ${CAP_DESCRIP} library */
+/* Define to 1 to indicate CAP functionality. */
 #undef HAVE_CAP
 
-/* Define to indicate the ${CAP_DESCRIP} library version */
+/* Define to indicate the CAP library version */
 #undef HAVE_CAP_VERSION
 
-/* Define this to indicate the ${CEIL_DESCRIP} library */
+/* Define to 1 to indicate CEIL functionality. */
 #undef HAVE_CEIL
 
-/* Define this to indicate the ${CEILL_DESCRIP} library */
+/* Define to 1 to indicate CEILL functionality. */
 #undef HAVE_CEILL
 
-/* Define to indicate the ${CEILL_DESCRIP} library version */
+/* Define to indicate the CEILL library version */
 #undef HAVE_CEILL_VERSION
 
-/* Define to indicate the ${CEIL_DESCRIP} library version */
+/* Define to indicate the CEIL library version */
 #undef HAVE_CEIL_VERSION
 
 /* Define to 1 if your system has a working `chown' function. */
@@ -165,31 +165,31 @@
 /* Define to 1 if you have the `closefrom' function. */
 #undef HAVE_CLOSEFROM
 
-/* Define this to indicate the ${COS_DESCRIP} library */
+/* Define to 1 to indicate COS functionality. */
 #undef HAVE_COS
 
-/* Define this to indicate the ${COSL_DESCRIP} library */
+/* Define to 1 to indicate COSL functionality. */
 #undef HAVE_COSL
 
-/* Define to indicate the ${COSL_DESCRIP} library version */
+/* Define to indicate the COSL library version */
 #undef HAVE_COSL_VERSION
 
-/* Define to indicate the ${COS_DESCRIP} library version */
+/* Define to indicate the COS library version */
 #undef HAVE_COS_VERSION
 
-/* Define this to indicate the ${CRYPTO_DESCRIP} library */
+/* Define to 1 to indicate CRYPTO functionality. */
 #undef HAVE_CRYPTO
 
-/* Define to indicate the ${CRYPTO_DESCRIP} library version */
+/* Define to indicate the CRYPTO library version */
 #undef HAVE_CRYPTO_VERSION
 
 /* Define if your system has the curl libraries. */
 #undef HAVE_CURL
 
-/* Define this to indicate the ${CURSES_DESCRIP} library */
+/* Define to 1 to indicate CURSES functionality. */
 #undef HAVE_CURSES
 
-/* Define to indicate the ${CURSES_DESCRIP} library version */
+/* Define to indicate the CURSES library version */
 #undef HAVE_CURSES_VERSION
 
 /* Define if your system has the DAHDI headers. */
@@ -238,73 +238,73 @@
 /* Define to 1 if you have the `euidaccess' function. */
 #undef HAVE_EUIDACCESS
 
-/* Define this to indicate the ${EXP_DESCRIP} library */
+/* Define to 1 to indicate EXP functionality. */
 #undef HAVE_EXP
 
-/* Define this to indicate the ${EXP10_DESCRIP} library */
+/* Define to 1 to indicate EXP10 functionality. */
 #undef HAVE_EXP10
 
-/* Define this to indicate the ${EXP10L_DESCRIP} library */
+/* Define to 1 to indicate EXP10L functionality. */
 #undef HAVE_EXP10L
 
-/* Define to indicate the ${EXP10L_DESCRIP} library version */
+/* Define to indicate the EXP10L library version */
 #undef HAVE_EXP10L_VERSION
 
-/* Define to indicate the ${EXP10_DESCRIP} library version */
+/* Define to indicate the EXP10 library version */
 #undef HAVE_EXP10_VERSION
 
-/* Define this to indicate the ${EXP2_DESCRIP} library */
+/* Define to 1 to indicate EXP2 functionality. */
 #undef HAVE_EXP2
 
-/* Define this to indicate the ${EXP2L_DESCRIP} library */
+/* Define to 1 to indicate EXP2L functionality. */
 #undef HAVE_EXP2L
 
-/* Define to indicate the ${EXP2L_DESCRIP} library version */
+/* Define to indicate the EXP2L library version */
 #undef HAVE_EXP2L_VERSION
 
-/* Define to indicate the ${EXP2_DESCRIP} library version */
+/* Define to indicate the EXP2 library version */
 #undef HAVE_EXP2_VERSION
 
-/* Define this to indicate the ${EXPL_DESCRIP} library */
+/* Define to 1 to indicate EXPL functionality. */
 #undef HAVE_EXPL
 
-/* Define to indicate the ${EXPL_DESCRIP} library version */
+/* Define to indicate the EXPL library version */
 #undef HAVE_EXPL_VERSION
 
-/* Define to indicate the ${EXP_DESCRIP} library version */
+/* Define to indicate the EXP library version */
 #undef HAVE_EXP_VERSION
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define this to indicate the ${FFMPEG_DESCRIP} library */
+/* Define to 1 to indicate FFMPEG functionality. */
 #undef HAVE_FFMPEG
 
-/* Define to indicate the ${FFMPEG_DESCRIP} library version */
+/* Define to indicate the FFMPEG library version */
 #undef HAVE_FFMPEG_VERSION
 
-/* Define this to indicate the ${FLOOR_DESCRIP} library */
+/* Define to 1 to indicate FLOOR functionality. */
 #undef HAVE_FLOOR
 
-/* Define this to indicate the ${FLOORL_DESCRIP} library */
+/* Define to 1 to indicate FLOORL functionality. */
 #undef HAVE_FLOORL
 
-/* Define to indicate the ${FLOORL_DESCRIP} library version */
+/* Define to indicate the FLOORL library version */
 #undef HAVE_FLOORL_VERSION
 
-/* Define to indicate the ${FLOOR_DESCRIP} library version */
+/* Define to indicate the FLOOR library version */
 #undef HAVE_FLOOR_VERSION
 
-/* Define this to indicate the ${FMOD_DESCRIP} library */
+/* Define to 1 to indicate FMOD functionality. */
 #undef HAVE_FMOD
 
-/* Define this to indicate the ${FMODL_DESCRIP} library */
+/* Define to 1 to indicate FMODL functionality. */
 #undef HAVE_FMODL
 
-/* Define to indicate the ${FMODL_DESCRIP} library version */
+/* Define to indicate the FMODL library version */
 #undef HAVE_FMODL_VERSION
 
-/* Define to indicate the ${FMOD_DESCRIP} library version */
+/* Define to indicate the FMOD library version */
 #undef HAVE_FMOD_VERSION
 
 /* Define to 1 if you have the `fopencookie' function. */
@@ -313,10 +313,10 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define this to indicate the ${FREETDS_DESCRIP} library */
+/* Define to 1 to indicate FREETDS functionality. */
 #undef HAVE_FREETDS
 
-/* Define to indicate the ${FREETDS_DESCRIP} library version */
+/* Define to indicate the FREETDS library version */
 #undef HAVE_FREETDS_VERSION
 
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
@@ -397,28 +397,28 @@
 /* Define if your system has the GTK2 libraries. */
 #undef HAVE_GTK2
 
-/* Define this to indicate the ${HOARD_DESCRIP} library */
+/* Define to 1 to indicate HOARD functionality. */
 #undef HAVE_HOARD
 
-/* Define to indicate the ${HOARD_DESCRIP} library version */
+/* Define to indicate the HOARD library version */
 #undef HAVE_HOARD_VERSION
 
-/* Define this to indicate the ${ICAL_DESCRIP} library */
+/* Define to 1 to indicate ICAL functionality. */
 #undef HAVE_ICAL
 
-/* Define to indicate the ${ICAL_DESCRIP} library version */
+/* Define to indicate the ICAL library version */
 #undef HAVE_ICAL_VERSION
 
-/* Define this to indicate the ${ICONV_DESCRIP} library */
+/* Define to 1 to indicate ICONV functionality. */
 #undef HAVE_ICONV
 
-/* Define to indicate the ${ICONV_DESCRIP} library version */
+/* Define to indicate the ICONV library version */
 #undef HAVE_ICONV_VERSION
 
-/* Define this to indicate the ${IKSEMEL_DESCRIP} library */
+/* Define to 1 to indicate IKSEMEL functionality. */
 #undef HAVE_IKSEMEL
 
-/* Define to indicate the ${IKSEMEL_DESCRIP} library version */
+/* Define to indicate the IKSEMEL library version */
 #undef HAVE_IKSEMEL_VERSION
 
 /* Define if your system has the UW IMAP Toolkit c-client library. */
@@ -434,19 +434,19 @@
 /* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
-/* Define this to indicate the ${INOTIFY_DESCRIP} library */
+/* Define to 1 to indicate INOTIFY functionality. */
 #undef HAVE_INOTIFY
 
-/* Define to indicate the ${INOTIFY_DESCRIP} library version */
+/* Define to indicate the INOTIFY library version */
 #undef HAVE_INOTIFY_VERSION
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define this to indicate the ${IODBC_DESCRIP} library */
+/* Define to 1 to indicate IODBC functionality. */
 #undef HAVE_IODBC
 
-/* Define to indicate the ${IODBC_DESCRIP} library version */
+/* Define to indicate the IODBC library version */
 #undef HAVE_IODBC_VERSION
 
 /* Define to 1 if you have the `ioperm' function. */
@@ -461,22 +461,22 @@
 /* Define to 1 if you have the `isascii' function. */
 #undef HAVE_ISASCII
 
-/* Define this to indicate the ${ISDNNET_DESCRIP} library */
+/* Define to 1 to indicate ISDNNET functionality. */
 #undef HAVE_ISDNNET
 
-/* Define to indicate the ${ISDNNET_DESCRIP} library version */
+/* Define to indicate the ISDNNET library version */
 #undef HAVE_ISDNNET_VERSION
 
-/* Define this to indicate the ${JACK_DESCRIP} library */
+/* Define to 1 to indicate JACK functionality. */
 #undef HAVE_JACK
 
-/* Define to indicate the ${JACK_DESCRIP} library version */
+/* Define to indicate the JACK library version */
 #undef HAVE_JACK_VERSION
 
-/* Define this to indicate the ${LDAP_DESCRIP} library */
+/* Define to 1 to indicate LDAP functionality. */
 #undef HAVE_LDAP
 
-/* Define to indicate the ${LDAP_DESCRIP} library version */
+/* Define to indicate the LDAP library version */
 #undef HAVE_LDAP_VERSION
 
 /* Define to 1 if you have the <libintl.h> header file. */
@@ -497,52 +497,52 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define this to indicate the ${LOG_DESCRIP} library */
+/* Define to 1 to indicate LOG functionality. */
 #undef HAVE_LOG
 
-/* Define this to indicate the ${LOG10_DESCRIP} library */
+/* Define to 1 to indicate LOG10 functionality. */
 #undef HAVE_LOG10
 
-/* Define this to indicate the ${LOG10L_DESCRIP} library */
+/* Define to 1 to indicate LOG10L functionality. */
 #undef HAVE_LOG10L
 
-/* Define to indicate the ${LOG10L_DESCRIP} library version */
+/* Define to indicate the LOG10L library version */
 #undef HAVE_LOG10L_VERSION
 
-/* Define to indicate the ${LOG10_DESCRIP} library version */
+/* Define to indicate the LOG10 library version */
 #undef HAVE_LOG10_VERSION
 
-/* Define this to indicate the ${LOG2_DESCRIP} library */
+/* Define to 1 to indicate LOG2 functionality. */
 #undef HAVE_LOG2
 
-/* Define this to indicate the ${LOG2L_DESCRIP} library */
+/* Define to 1 to indicate LOG2L functionality. */
 #undef HAVE_LOG2L
 
-/* Define to indicate the ${LOG2L_DESCRIP} library version */
+/* Define to indicate the LOG2L library version */
 #undef HAVE_LOG2L_VERSION
 
-/* Define to indicate the ${LOG2_DESCRIP} library version */
+/* Define to indicate the LOG2 library version */
 #undef HAVE_LOG2_VERSION
 
-/* Define this to indicate the ${LOGL_DESCRIP} library */
+/* Define to 1 to indicate LOGL functionality. */
 #undef HAVE_LOGL
 
-/* Define to indicate the ${LOGL_DESCRIP} library version */
+/* Define to indicate the LOGL library version */
 #undef HAVE_LOGL_VERSION
 
-/* Define to indicate the ${LOG_DESCRIP} library version */
+/* Define to indicate the LOG library version */
 #undef HAVE_LOG_VERSION
 
-/* Define this to indicate the ${LTDL_DESCRIP} library */
+/* Define to 1 to indicate LTDL functionality. */
 #undef HAVE_LTDL
 
-/* Define to indicate the ${LTDL_DESCRIP} library version */
+/* Define to indicate the LTDL library version */
 #undef HAVE_LTDL_VERSION
 
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define to 1 to indicate LUA functionality. */
 #undef HAVE_LUA
 
-/* Define to indicate the ${LUA_DESCRIP} library version */
+/* Define to indicate the LUA library version */
 #undef HAVE_LUA_VERSION
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -560,7 +560,7 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
-/* Define this to indicate the ${MISDN_DESCRIP} library */
+/* Define to 1 to indicate MISDN functionality. */
 #undef HAVE_MISDN
 
 /* Define if your system has the MISDN_FAC_ERROR headers. */
@@ -575,7 +575,7 @@
 /* Define MISDN_FAC_RESULT headers version */
 #undef HAVE_MISDN_FAC_RESULT_VERSION
 
-/* Define to indicate the ${MISDN_DESCRIP} library version */
+/* Define to indicate the MISDN library version */
 #undef HAVE_MISDN_VERSION
 
 /* Define to 1 if you have the `mkdir' function. */
@@ -590,16 +590,16 @@
 /* Define if your system has the MYSQLCLIENT libraries. */
 #undef HAVE_MYSQLCLIENT
 
-/* Define this to indicate the ${NBS_DESCRIP} library */
+/* Define to 1 to indicate NBS functionality. */
 #undef HAVE_NBS
 
-/* Define to indicate the ${NBS_DESCRIP} library version */
+/* Define to indicate the NBS library version */
 #undef HAVE_NBS_VERSION
 
-/* Define this to indicate the ${NCURSES_DESCRIP} library */
+/* Define to 1 to indicate NCURSES functionality. */
 #undef HAVE_NCURSES
 
-/* Define to indicate the ${NCURSES_DESCRIP} library version */
+/* Define to indicate the NCURSES library version */
 #undef HAVE_NCURSES_VERSION
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
@@ -617,46 +617,46 @@
 /* Define if your system has the NETSNMP libraries. */
 #undef HAVE_NETSNMP
 
-/* Define this to indicate the ${NEWT_DESCRIP} library */
+/* Define to 1 to indicate NEWT functionality. */
 #undef HAVE_NEWT
 
-/* Define to indicate the ${NEWT_DESCRIP} library version */
+/* Define to indicate the NEWT library version */
 #undef HAVE_NEWT_VERSION
 
-/* Define this to indicate the ${OGG_DESCRIP} library */
+/* Define to 1 to indicate OGG functionality. */
 #undef HAVE_OGG
 
-/* Define to indicate the ${OGG_DESCRIP} library version */
+/* Define to indicate the OGG library version */
 #undef HAVE_OGG_VERSION
 
-/* Define this to indicate the ${OPENAIS_DESCRIP} library */
+/* Define to 1 to indicate OPENAIS functionality. */
 #undef HAVE_OPENAIS
 
-/* Define to indicate the ${OPENAIS_DESCRIP} library version */
+/* Define to indicate the OPENAIS library version */
 #undef HAVE_OPENAIS_VERSION
 
 /* Define if your system has the OpenH323 libraries. */
 #undef HAVE_OPENH323
 
-/* Define this to indicate the ${OPENR2_DESCRIP} library */
+/* Define to 1 to indicate OPENR2 functionality. */
 #undef HAVE_OPENR2
 
-/* Define to indicate the ${OPENR2_DESCRIP} library version */
+/* Define to indicate the OPENR2 library version */
 #undef HAVE_OPENR2_VERSION
 
-/* Define this to indicate the ${OPENSSL_DESCRIP} library */
+/* Define to 1 to indicate OPENSSL functionality. */
 #undef HAVE_OPENSSL
 
-/* Define to indicate the ${OPENSSL_DESCRIP} library version */
+/* Define to indicate the OPENSSL library version */
 #undef HAVE_OPENSSL_VERSION
 
 /* Define this to indicate the ${OSPTK_DESCRIP} library */
 #undef HAVE_OSPTK
 
-/* Define this to indicate the ${OSS_DESCRIP} library */
+/* Define to 1 to indicate OSS functionality. */
 #undef HAVE_OSS
 
-/* Define to indicate the ${OSS_DESCRIP} library version */
+/* Define to indicate the OSS library version */
 #undef HAVE_OSS_VERSION
 
 /* Define to 1 if OSX atomic operations are supported. */
@@ -668,58 +668,58 @@
 /* Define to 1 if your system defines IP_PKTINFO. */
 #undef HAVE_PKTINFO
 
-/* Define this to indicate the ${POPT_DESCRIP} library */
+/* Define to 1 to indicate POPT functionality. */
 #undef HAVE_POPT
 
-/* Define to indicate the ${POPT_DESCRIP} library version */
+/* Define to indicate the POPT library version */
 #undef HAVE_POPT_VERSION
 
-/* Define this to indicate the ${PORTAUDIO_DESCRIP} library */
+/* Define to 1 to indicate PORTAUDIO functionality. */
 #undef HAVE_PORTAUDIO
 
-/* Define to indicate the ${PORTAUDIO_DESCRIP} library version */
+/* Define to indicate the PORTAUDIO library version */
 #undef HAVE_PORTAUDIO_VERSION
 
-/* Define this to indicate the ${POW_DESCRIP} library */
+/* Define to 1 to indicate POW functionality. */
 #undef HAVE_POW
 
-/* Define this to indicate the ${POWL_DESCRIP} library */
+/* Define to 1 to indicate POWL functionality. */
 #undef HAVE_POWL
 
-/* Define to indicate the ${POWL_DESCRIP} library version */
+/* Define to indicate the POWL library version */
 #undef HAVE_POWL_VERSION
 
-/* Define to indicate the ${POW_DESCRIP} library version */
+/* Define to indicate the POW library version */
 #undef HAVE_POW_VERSION
 
-/* Define this to indicate the ${PRI_DESCRIP} library */
+/* Define to 1 to indicate PRI functionality. */
 #undef HAVE_PRI
 
-/* Define this to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library */
+/* Define to 1 to indicate PRI_INBANDDISCONNECT functionality. */
 #undef HAVE_PRI_INBANDDISCONNECT
 
-/* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library version */
+/* Define to indicate the PRI_INBANDDISCONNECT library version */
 #undef HAVE_PRI_INBANDDISCONNECT_VERSION
 
-/* Define this to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library */
+/* Define to 1 to indicate PRI_PROG_W_CAUSE functionality. */
 #undef HAVE_PRI_PROG_W_CAUSE
 
-/* Define to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library version */
+/* Define to indicate the PRI_PROG_W_CAUSE library version */
 #undef HAVE_PRI_PROG_W_CAUSE_VERSION
 
-/* Define this to indicate the ${PRI_REVERSE_CHARGE_DESCRIP} library */
+/* Define to 1 to indicate PRI_REVERSE_CHARGE functionality. */
 #undef HAVE_PRI_REVERSE_CHARGE
 
-/* Define to indicate the ${PRI_REVERSE_CHARGE_DESCRIP} library version */
+/* Define to indicate the PRI_REVERSE_CHARGE library version */
 #undef HAVE_PRI_REVERSE_CHARGE_VERSION
 
-/* Define this to indicate the ${PRI_SERVICE_MESSAGES_DESCRIP} library */
+/* Define to 1 to indicate PRI_SERVICE_MESSAGES functionality. */
 #undef HAVE_PRI_SERVICE_MESSAGES
 
-/* Define to indicate the ${PRI_SERVICE_MESSAGES_DESCRIP} library version */
+/* Define to indicate the PRI_SERVICE_MESSAGES library version */
 #undef HAVE_PRI_SERVICE_MESSAGES_VERSION
 
-/* Define to indicate the ${PRI_DESCRIP} library version */
+/* Define to indicate the PRI library version */
 #undef HAVE_PRI_VERSION
 
 /* Define if you have POSIX threads libraries and header files. */
@@ -758,31 +758,31 @@
 /* Define if your system has the PWLib libraries. */
 #undef HAVE_PWLIB
 
-/* Define this to indicate the ${RADIUS_DESCRIP} library */
+/* Define to 1 to indicate RADIUS functionality. */
 #undef HAVE_RADIUS
 
-/* Define to indicate the ${RADIUS_DESCRIP} library version */
+/* Define to indicate the RADIUS library version */
 #undef HAVE_RADIUS_VERSION
 
 /* Define to 1 if you have the `regcomp' function. */
 #undef HAVE_REGCOMP
 
-/* Define this to indicate the ${REMAINDER_DESCRIP} library */
+/* Define to 1 to indicate REMAINDER functionality. */
 #undef HAVE_REMAINDER
 
-/* Define this to indicate the ${REMAINDERL_DESCRIP} library */
+/* Define to 1 to indicate REMAINDERL functionality. */
 #undef HAVE_REMAINDERL
 
-/* Define to indicate the ${REMAINDERL_DESCRIP} library version */
+/* Define to indicate the REMAINDERL library version */
 #undef HAVE_REMAINDERL_VERSION
 
-/* Define to indicate the ${REMAINDER_DESCRIP} library version */
+/* Define to indicate the REMAINDER library version */
 #undef HAVE_REMAINDER_VERSION
 
-/* Define this to indicate the ${RESAMPLE_DESCRIP} library */
+/* Define to 1 to indicate RESAMPLE functionality. */
 #undef HAVE_RESAMPLE
 
-/* Define to indicate the ${RESAMPLE_DESCRIP} library version */
+/* Define to indicate the RESAMPLE library version */
 #undef HAVE_RESAMPLE_VERSION
 
 /* Define to 1 if your system has the close resolver function. */
@@ -797,28 +797,28 @@
 /* Define to 1 if you have the `re_comp' function. */
 #undef HAVE_RE_COMP
 
-/* Define this to indicate the ${RINT_DESCRIP} library */
+/* Define to 1 to indicate RINT functionality. */
 #undef HAVE_RINT
 
-/* Define this to indicate the ${RINTL_DESCRIP} library */
+/* Define to 1 to indicate RINTL functionality. */
 #undef HAVE_RINTL
 
-/* Define to indicate the ${RINTL_DESCRIP} library version */
+/* Define to indicate the RINTL library version */
 #undef HAVE_RINTL_VERSION
 
-/* Define to indicate the ${RINT_DESCRIP} library version */
+/* Define to indicate the RINT library version */
 #undef HAVE_RINT_VERSION
 
-/* Define this to indicate the ${ROUND_DESCRIP} library */
+/* Define to 1 to indicate ROUND functionality. */
 #undef HAVE_ROUND
 
-/* Define this to indicate the ${ROUNDL_DESCRIP} library */
+/* Define to 1 to indicate ROUNDL functionality. */
 #undef HAVE_ROUNDL
 
-/* Define to indicate the ${ROUNDL_DESCRIP} library version */
+/* Define to indicate the ROUNDL library version */
 #undef HAVE_ROUNDL_VERSION
 
-/* Define to indicate the ${ROUND_DESCRIP} library version */
+/* Define to indicate the ROUND library version */
 #undef HAVE_ROUND_VERSION
 
 /* Define to 1 if your system has /sbin/launchd. */
@@ -827,10 +827,10 @@
 /* Define if your system has the SDL libraries. */
 #undef HAVE_SDL
 
-/* Define this to indicate the ${SDL_IMAGE_DESCRIP} library */
+/* Define to 1 to indicate SDL_IMAGE functionality. */
 #undef HAVE_SDL_IMAGE
 
-/* Define to indicate the ${SDL_IMAGE_DESCRIP} library version */
+/* Define to indicate the SDL_IMAGE library version */
 #undef HAVE_SDL_IMAGE_VERSION
 
 /* Define to 1 if you have the `select' function. */
@@ -839,16 +839,16 @@
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define this to indicate the ${SIN_DESCRIP} library */
+/* Define to 1 to indicate SIN functionality. */
 #undef HAVE_SIN
 
-/* Define this to indicate the ${SINL_DESCRIP} library */
+/* Define to 1 to indicate SINL functionality. */
 #undef HAVE_SINL
 
-/* Define to indicate the ${SINL_DESCRIP} library version */
+/* Define to indicate the SINL library version */
 #undef HAVE_SINL_VERSION
 
-/* Define to indicate the ${SIN_DESCRIP} library version */
+/* Define to indicate the SIN library version */
 #undef HAVE_SIN_VERSION
 
 /* Define to 1 if you have the `socket' function. */
@@ -857,58 +857,58 @@
 /* Define to 1 if your system has soxmix application. */
 #undef HAVE_SOXMIX
 
-/* Define this to indicate the ${SPANDSP_DESCRIP} library */
+/* Define to 1 to indicate SPANDSP functionality. */
 #undef HAVE_SPANDSP
 
-/* Define to indicate the ${SPANDSP_DESCRIP} library version */
+/* Define to indicate the SPANDSP library version */
 #undef HAVE_SPANDSP_VERSION
 
-/* Define this to indicate the ${SPEEX_DESCRIP} library */
+/* Define to 1 to indicate SPEEX functionality. */
 #undef HAVE_SPEEX
 
-/* Define this to indicate the ${SPEEXDSP_DESCRIP} library */
+/* Define to 1 to indicate SPEEXDSP functionality. */
 #undef HAVE_SPEEXDSP
 
-/* Define to indicate the ${SPEEXDSP_DESCRIP} library version */
+/* Define to indicate the SPEEXDSP library version */
 #undef HAVE_SPEEXDSP_VERSION
 
-/* Define this to indicate the ${SPEEX_PREPROCESS_DESCRIP} library */
+/* Define to 1 to indicate SPEEX_PREPROCESS functionality. */
 #undef HAVE_SPEEX_PREPROCESS
 
-/* Define to indicate the ${SPEEX_PREPROCESS_DESCRIP} library version */
+/* Define to indicate the SPEEX_PREPROCESS library version */
 #undef HAVE_SPEEX_PREPROCESS_VERSION
 
-/* Define to indicate the ${SPEEX_DESCRIP} library version */
+/* Define to indicate the SPEEX library version */
 #undef HAVE_SPEEX_VERSION
 
-/* Define this to indicate the ${SQLITE_DESCRIP} library */
+/* Define to 1 to indicate SQLITE functionality. */
 #undef HAVE_SQLITE
 
-/* Define this to indicate the ${SQLITE3_DESCRIP} library */
+/* Define to 1 to indicate SQLITE3 functionality. */
 #undef HAVE_SQLITE3
 
-/* Define to indicate the ${SQLITE3_DESCRIP} library version */
+/* Define to indicate the SQLITE3 library version */
 #undef HAVE_SQLITE3_VERSION
 
-/* Define to indicate the ${SQLITE_DESCRIP} library version */
+/* Define to indicate the SQLITE library version */
 #undef HAVE_SQLITE_VERSION
 
-/* Define this to indicate the ${SQRT_DESCRIP} library */
+/* Define to 1 to indicate SQRT functionality. */
 #undef HAVE_SQRT
 
-/* Define this to indicate the ${SQRTL_DESCRIP} library */
+/* Define to 1 to indicate SQRTL functionality. */
 #undef HAVE_SQRTL
 
-/* Define to indicate the ${SQRTL_DESCRIP} library version */
+/* Define to indicate the SQRTL library version */
 #undef HAVE_SQRTL_VERSION
 
-/* Define to indicate the ${SQRT_DESCRIP} library version */
+/* Define to indicate the SQRT library version */
 #undef HAVE_SQRT_VERSION
 
-/* Define this to indicate the ${SS7_DESCRIP} library */
+/* Define to 1 to indicate SS7 functionality. */
 #undef HAVE_SS7
 
-/* Define to indicate the ${SS7_DESCRIP} library version */
+/* Define to indicate the SS7 library version */
 #undef HAVE_SS7_VERSION
 
 /* Define to 1 if `stat' has the bug that it succeeds when given the
@@ -985,19 +985,19 @@
 /* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define this to indicate the ${STRTOD_DESCRIP} library */
+/* Define to 1 to indicate STRTOD functionality. */
 #undef HAVE_STRTOD
 
-/* Define to indicate the ${STRTOD_DESCRIP} library version */
+/* Define to indicate the STRTOD library version */
 #undef HAVE_STRTOD_VERSION
 
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
-/* Define this to indicate the ${STRTOLD_DESCRIP} library */
+/* Define to 1 to indicate STRTOLD functionality. */
 #undef HAVE_STRTOLD
 
-/* Define to indicate the ${STRTOLD_DESCRIP} library version */
+/* Define to indicate the STRTOLD library version */
 #undef HAVE_STRTOLD_VERSION
 
 /* Define to 1 if you have the `strtoq' function. */
@@ -1006,10 +1006,10 @@
 /* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define this to indicate the ${SUPPSERV_DESCRIP} library */
+/* Define to 1 to indicate SUPPSERV functionality. */
 #undef HAVE_SUPPSERV
 
-/* Define to indicate the ${SUPPSERV_DESCRIP} library version */
+/* Define to indicate the SUPPSERV library version */
 #undef HAVE_SUPPSERV_VERSION
 
 /* Define to 1 if you have the `swapctl' function. */
@@ -1138,22 +1138,22 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define this to indicate the ${TAN_DESCRIP} library */
+/* Define to 1 to indicate TAN functionality. */
 #undef HAVE_TAN
 
-/* Define this to indicate the ${TANL_DESCRIP} library */
+/* Define to 1 to indicate TANL functionality. */
 #undef HAVE_TANL
 
-/* Define to indicate the ${TANL_DESCRIP} library version */
+/* Define to indicate the TANL library version */
 #undef HAVE_TANL_VERSION
 
-/* Define to indicate the ${TAN_DESCRIP} library version */
+/* Define to indicate the TAN library version */
 #undef HAVE_TAN_VERSION
 
-/* Define this to indicate the ${TERMCAP_DESCRIP} library */
+/* Define to 1 to indicate TERMCAP functionality. */
 #undef HAVE_TERMCAP
 
-/* Define to indicate the ${TERMCAP_DESCRIP} library version */
+/* Define to indicate the TERMCAP library version */
 #undef HAVE_TERMCAP_VERSION
 
 /* Define to 1 if you have the <termios.h> header file. */
@@ -1168,46 +1168,46 @@
 /* Define to 1 if your system defines timersub. */
 #undef HAVE_TIMERSUB
 
-/* Define this to indicate the ${TINFO_DESCRIP} library */
+/* Define to 1 to indicate TINFO functionality. */
 #undef HAVE_TINFO
 
-/* Define to indicate the ${TINFO_DESCRIP} library version */
+/* Define to indicate the TINFO library version */
 #undef HAVE_TINFO_VERSION
 
-/* Define this to indicate the ${TONEZONE_DESCRIP} library */
+/* Define to 1 to indicate TONEZONE functionality. */
 #undef HAVE_TONEZONE
 
-/* Define to indicate the ${TONEZONE_DESCRIP} library version */
+/* Define to indicate the TONEZONE library version */
 #undef HAVE_TONEZONE_VERSION
 
-/* Define this to indicate the ${TRUNC_DESCRIP} library */
+/* Define to 1 to indicate TRUNC functionality. */
 #undef HAVE_TRUNC
 
-/* Define this to indicate the ${TRUNCL_DESCRIP} library */
+/* Define to 1 to indicate TRUNCL functionality. */
 #undef HAVE_TRUNCL
 
-/* Define to indicate the ${TRUNCL_DESCRIP} library version */
+/* Define to indicate the TRUNCL library version */
 #undef HAVE_TRUNCL_VERSION
 
-/* Define to indicate the ${TRUNC_DESCRIP} library version */
+/* Define to indicate the TRUNC library version */
 #undef HAVE_TRUNC_VERSION
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define this to indicate the ${UNIXODBC_DESCRIP} library */
+/* Define to 1 to indicate UNIXODBC functionality. */
 #undef HAVE_UNIXODBC
 
-/* Define to indicate the ${UNIXODBC_DESCRIP} library version */
+/* Define to indicate the UNIXODBC library version */
 #undef HAVE_UNIXODBC_VERSION
 
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define this to indicate the ${USB_DESCRIP} library */
+/* Define to 1 to indicate USB functionality. */
 #undef HAVE_USB
 
-/* Define to indicate the ${USB_DESCRIP} library version */
+/* Define to indicate the USB library version */
 #undef HAVE_USB_VERSION
 
 /* Define to 1 if you have the `utime' function. */
@@ -1231,10 +1231,10 @@
 /* Define to 1 if your system has linux/videodev.h. */
 #undef HAVE_VIDEODEV_H
 
-/* Define this to indicate the ${VORBIS_DESCRIP} library */
+/* Define to 1 to indicate VORBIS functionality. */
 #undef HAVE_VORBIS
 
-/* Define to indicate the ${VORBIS_DESCRIP} library version */
+/* Define to indicate the VORBIS library version */
 #undef HAVE_VORBIS_VERSION
 
 /* Define if your system has the VoiceTronix API libraries. */
@@ -1255,16 +1255,16 @@
 /* Define to 1 if `vfork' works. */
 #undef HAVE_WORKING_VFORK
 
-/* Define this to indicate the ${X11_DESCRIP} library */
+/* Define to 1 to indicate X11 functionality. */
 #undef HAVE_X11
 
-/* Define to indicate the ${X11_DESCRIP} library version */
+/* Define to indicate the X11 library version */
 #undef HAVE_X11_VERSION
 
-/* Define this to indicate the ${ZLIB_DESCRIP} library */
+/* Define to 1 to indicate ZLIB functionality. */
 #undef HAVE_ZLIB
 
-/* Define to indicate the ${ZLIB_DESCRIP} library version */
+/* Define to indicate the ZLIB library version */
 #undef HAVE_ZLIB_VERSION
 
 /* Define to 1 if the system has the type `_Bool'. */