when --without-<foo> is passed to the configure script, explicitly inform menuselect...

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

diff --git a/autoconf/ast_ext_lib.m4 b/autoconf/ast_ext_lib.m4
index 57d83a5d1d23ca282d7799d38beccf29925f5c95..35be41ffa7d6a787c3ff37ef9411a048104c5d96 100644 (file)
--- a/autoconf/ast_ext_lib.m4
+++ b/autoconf/ast_ext_lib.m4
@@ -10,11 +10,15 @@ AC_DEFUN([AST_EXT_LIB_SETUP],
 [
     $1_DESCRIP="$2"
     $1_OPTION="$3"
+    PBX_$1=0
     AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),
     [
        case ${withval} in
        n|no)
        USE_$1=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_$1=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} $1"
@@ -25,7 +29,6 @@ AC_DEFUN([AST_EXT_LIB_SETUP],
        ;;
        esac
     ])
-    PBX_$1=0
     AC_SUBST([$1_LIB])
     AC_SUBST([$1_INCLUDE])
     AC_SUBST([$1_DIR])

diff --git a/configure b/configure
index 5a9a37f56fda6dcdefb460feb6e32df38d55bafe..3e1b904c327d2c4afd6de12a565b361f45b615b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 153578 .
+# From configure.ac Revision: 153709 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -7973,6 +7973,7 @@ fi
 
     ALSA_DESCRIP="Advanced Linux Sound Architecture"
     ALSA_OPTION="asound"
+    PBX_ALSA=0
 
 # Check whether --with-asound was given.
 if test "${with_asound+set}" = set; then
@@ -7980,6 +7981,9 @@ if test "${with_asound+set}" = set; then
        case ${withval} in
        n|no)
        USE_ALSA=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_ALSA=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} ALSA"
@@ -7992,7 +7996,6 @@ if test "${with_asound+set}" = set; then
 
 fi
 
-    PBX_ALSA=0
 
 
 
@@ -8004,6 +8007,7 @@ fi
 
     BKTR_DESCRIP="Stack Backtrace support"
     BKTR_OPTION="execinfo"
+    PBX_BKTR=0
 
 # Check whether --with-execinfo was given.
 if test "${with_execinfo+set}" = set; then
@@ -8011,6 +8015,9 @@ if test "${with_execinfo+set}" = set; then
        case ${withval} in
        n|no)
        USE_BKTR=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_BKTR=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} BKTR"
@@ -8023,7 +8030,6 @@ if test "${with_execinfo+set}" = set; then
 
 fi
 
-    PBX_BKTR=0
 
 
 
@@ -8032,6 +8038,7 @@ fi
 
     CAP_DESCRIP="POSIX 1.e capabilities"
     CAP_OPTION="cap"
+    PBX_CAP=0
 
 # Check whether --with-cap was given.
 if test "${with_cap+set}" = set; then
@@ -8039,6 +8046,9 @@ if test "${with_cap+set}" = set; then
        case ${withval} in
        n|no)
        USE_CAP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_CAP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} CAP"
@@ -8051,7 +8061,6 @@ if test "${with_cap+set}" = set; then
 
 fi
 
-    PBX_CAP=0
 
 
 
@@ -8060,6 +8069,7 @@ fi
 
     CURL_DESCRIP="cURL"
     CURL_OPTION="curl"
+    PBX_CURL=0
 
 # Check whether --with-curl was given.
 if test "${with_curl+set}" = set; then
@@ -8067,6 +8077,9 @@ if test "${with_curl+set}" = set; then
        case ${withval} in
        n|no)
        USE_CURL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_CURL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} CURL"
@@ -8079,7 +8092,6 @@ if test "${with_curl+set}" = set; then
 
 fi
 
-    PBX_CURL=0
 
 
 
@@ -8088,6 +8100,7 @@ fi
 
     CURSES_DESCRIP="curses"
     CURSES_OPTION="curses"
+    PBX_CURSES=0
 
 # Check whether --with-curses was given.
 if test "${with_curses+set}" = set; then
@@ -8095,6 +8108,9 @@ if test "${with_curses+set}" = set; then
        case ${withval} in
        n|no)
        USE_CURSES=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_CURSES=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} CURSES"
@@ -8107,7 +8123,6 @@ if test "${with_curses+set}" = set; then
 
 fi
 
-    PBX_CURSES=0
 
 
 
@@ -8116,6 +8131,7 @@ fi
 
     CRYPTO_DESCRIP="OpenSSL Cryptography support"
     CRYPTO_OPTION="crypto"
+    PBX_CRYPTO=0
 
 # Check whether --with-crypto was given.
 if test "${with_crypto+set}" = set; then
@@ -8123,6 +8139,9 @@ if test "${with_crypto+set}" = set; then
        case ${withval} in
        n|no)
        USE_CRYPTO=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_CRYPTO=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} CRYPTO"
@@ -8135,7 +8154,6 @@ if test "${with_crypto+set}" = set; then
 
 fi
 
-    PBX_CRYPTO=0
 
 
 
@@ -8144,6 +8162,7 @@ fi
 
     DAHDI_DESCRIP="DAHDI"
     DAHDI_OPTION="dahdi"
+    PBX_DAHDI=0
 
 # Check whether --with-dahdi was given.
 if test "${with_dahdi+set}" = set; then
@@ -8151,6 +8170,9 @@ if test "${with_dahdi+set}" = set; then
        case ${withval} in
        n|no)
        USE_DAHDI=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_DAHDI=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} DAHDI"
@@ -8163,7 +8185,6 @@ if test "${with_dahdi+set}" = set; then
 
 fi
 
-    PBX_DAHDI=0
 
 
 
@@ -8172,6 +8193,7 @@ fi
 
     FFMPEG_DESCRIP="Ffmpeg and avcodec library"
     FFMPEG_OPTION="avcodec"
+    PBX_FFMPEG=0
 
 # Check whether --with-avcodec was given.
 if test "${with_avcodec+set}" = set; then
@@ -8179,6 +8201,9 @@ if test "${with_avcodec+set}" = set; then
        case ${withval} in
        n|no)
        USE_FFMPEG=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_FFMPEG=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} FFMPEG"
@@ -8191,7 +8216,6 @@ if test "${with_avcodec+set}" = set; then
 
 fi
 
-    PBX_FFMPEG=0
 
 
 
@@ -8200,6 +8224,7 @@ fi
 
     GSM_DESCRIP="External GSM library"
     GSM_OPTION="gsm"
+    PBX_GSM=0
 
 # Check whether --with-gsm was given.
 if test "${with_gsm+set}" = set; then
@@ -8207,6 +8232,9 @@ if test "${with_gsm+set}" = set; then
        case ${withval} in
        n|no)
        USE_GSM=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_GSM=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} GSM"
@@ -8219,7 +8247,6 @@ if test "${with_gsm+set}" = set; then
 
 fi
 
-    PBX_GSM=0
 
 
 
@@ -8228,6 +8255,7 @@ fi
 
     GTK_DESCRIP="gtk libraries"
     GTK_OPTION="gtk"
+    PBX_GTK=0
 
 # Check whether --with-gtk was given.
 if test "${with_gtk+set}" = set; then
@@ -8235,6 +8263,9 @@ if test "${with_gtk+set}" = set; then
        case ${withval} in
        n|no)
        USE_GTK=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_GTK=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} GTK"
@@ -8247,7 +8278,6 @@ if test "${with_gtk+set}" = set; then
 
 fi
 
-    PBX_GTK=0
 
 
 
@@ -8256,6 +8286,7 @@ fi
 
     GTK2_DESCRIP="gtk2 libraries"
     GTK2_OPTION="gtk2"
+    PBX_GTK2=0
 
 # Check whether --with-gtk2 was given.
 if test "${with_gtk2+set}" = set; then
@@ -8263,6 +8294,9 @@ if test "${with_gtk2+set}" = set; then
        case ${withval} in
        n|no)
        USE_GTK2=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_GTK2=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} GTK2"
@@ -8275,7 +8309,6 @@ if test "${with_gtk2+set}" = set; then
 
 fi
 
-    PBX_GTK2=0
 
 
 
@@ -8284,6 +8317,7 @@ fi
 
     GMIME_DESCRIP="GMime library"
     GMIME_OPTION="gmime"
+    PBX_GMIME=0
 
 # Check whether --with-gmime was given.
 if test "${with_gmime+set}" = set; then
@@ -8291,6 +8325,9 @@ if test "${with_gmime+set}" = set; then
        case ${withval} in
        n|no)
        USE_GMIME=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_GMIME=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} GMIME"
@@ -8303,7 +8340,6 @@ if test "${with_gmime+set}" = set; then
 
 fi
 
-    PBX_GMIME=0
 
 
 
@@ -8312,6 +8348,7 @@ fi
 
     HOARD_DESCRIP="Hoard Memory Allocator"
     HOARD_OPTION="hoard"
+    PBX_HOARD=0
 
 # Check whether --with-hoard was given.
 if test "${with_hoard+set}" = set; then
@@ -8319,6 +8356,9 @@ if test "${with_hoard+set}" = set; then
        case ${withval} in
        n|no)
        USE_HOARD=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_HOARD=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} HOARD"
@@ -8331,7 +8371,6 @@ if test "${with_hoard+set}" = set; then
 
 fi
 
-    PBX_HOARD=0
 
 
 
@@ -8340,6 +8379,7 @@ fi
 
     ICONV_DESCRIP="Iconv Library"
     ICONV_OPTION="iconv"
+    PBX_ICONV=0
 
 # Check whether --with-iconv was given.
 if test "${with_iconv+set}" = set; then
@@ -8347,6 +8387,9 @@ if test "${with_iconv+set}" = set; then
        case ${withval} in
        n|no)
        USE_ICONV=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_ICONV=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} ICONV"
@@ -8359,7 +8402,6 @@ if test "${with_iconv+set}" = set; then
 
 fi
 
-    PBX_ICONV=0
 
 
 
@@ -8368,6 +8410,7 @@ fi
 
     IKSEMEL_DESCRIP="Iksemel Jabber Library"
     IKSEMEL_OPTION="iksemel"
+    PBX_IKSEMEL=0
 
 # Check whether --with-iksemel was given.
 if test "${with_iksemel+set}" = set; then
@@ -8375,6 +8418,9 @@ if test "${with_iksemel+set}" = set; then
        case ${withval} in
        n|no)
        USE_IKSEMEL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_IKSEMEL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
@@ -8387,7 +8433,6 @@ if test "${with_iksemel+set}" = set; then
 
 fi
 
-    PBX_IKSEMEL=0
 
 
 
@@ -8396,6 +8441,7 @@ fi
 
     IMAP_TK_DESCRIP="UW IMAP Toolkit"
     IMAP_TK_OPTION="imap"
+    PBX_IMAP_TK=0
 
 # Check whether --with-imap was given.
 if test "${with_imap+set}" = set; then
@@ -8403,6 +8449,9 @@ if test "${with_imap+set}" = set; then
        case ${withval} in
        n|no)
        USE_IMAP_TK=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_IMAP_TK=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
@@ -8415,7 +8464,6 @@ if test "${with_imap+set}" = set; then
 
 fi
 
-    PBX_IMAP_TK=0
 
 
 
@@ -8424,6 +8472,7 @@ fi
 
     IODBC_DESCRIP="iODBC"
     IODBC_OPTION="iodbc"
+    PBX_IODBC=0
 
 # Check whether --with-iodbc was given.
 if test "${with_iodbc+set}" = set; then
@@ -8431,6 +8480,9 @@ if test "${with_iodbc+set}" = set; then
        case ${withval} in
        n|no)
        USE_IODBC=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_IODBC=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} IODBC"
@@ -8443,7 +8495,6 @@ if test "${with_iodbc+set}" = set; then
 
 fi
 
-    PBX_IODBC=0
 
 
 
@@ -8452,6 +8503,7 @@ fi
 
     ISDNNET_DESCRIP="ISDN4Linux Library"
     ISDNNET_OPTION="isdnnet"
+    PBX_ISDNNET=0
 
 # Check whether --with-isdnnet was given.
 if test "${with_isdnnet+set}" = set; then
@@ -8459,6 +8511,9 @@ if test "${with_isdnnet+set}" = set; then
        case ${withval} in
        n|no)
        USE_ISDNNET=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_ISDNNET=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} ISDNNET"
@@ -8471,7 +8526,6 @@ if test "${with_isdnnet+set}" = set; then
 
 fi
 
-    PBX_ISDNNET=0
 
 
 
@@ -8480,6 +8534,7 @@ fi
 
     JACK_DESCRIP="Jack Audio Connection Kit"
     JACK_OPTION="jack"
+    PBX_JACK=0
 
 # Check whether --with-jack was given.
 if test "${with_jack+set}" = set; then
@@ -8487,6 +8542,9 @@ if test "${with_jack+set}" = set; then
        case ${withval} in
        n|no)
        USE_JACK=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_JACK=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} JACK"
@@ -8499,7 +8557,6 @@ if test "${with_jack+set}" = set; then
 
 fi
 
-    PBX_JACK=0
 
 
 
@@ -8508,6 +8565,7 @@ fi
 
     LDAP_DESCRIP="OpenLDAP"
     LDAP_OPTION="ldap"
+    PBX_LDAP=0
 
 # Check whether --with-ldap was given.
 if test "${with_ldap+set}" = set; then
@@ -8515,6 +8573,9 @@ if test "${with_ldap+set}" = set; then
        case ${withval} in
        n|no)
        USE_LDAP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_LDAP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} LDAP"
@@ -8527,7 +8588,6 @@ if test "${with_ldap+set}" = set; then
 
 fi
 
-    PBX_LDAP=0
 
 
 
@@ -8536,6 +8596,7 @@ fi
 
     LIBXML2_DESCRIP="LibXML2"
     LIBXML2_OPTION="libxml2"
+    PBX_LIBXML2=0
 
 # Check whether --with-libxml2 was given.
 if test "${with_libxml2+set}" = set; then
@@ -8543,6 +8604,9 @@ if test "${with_libxml2+set}" = set; then
        case ${withval} in
        n|no)
        USE_LIBXML2=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_LIBXML2=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} LIBXML2"
@@ -8555,7 +8619,6 @@ if test "${with_libxml2+set}" = set; then
 
 fi
 
-    PBX_LIBXML2=0
 
 
 
@@ -8564,6 +8627,7 @@ fi
 
     LTDL_DESCRIP="libtool"
     LTDL_OPTION="ltdl"
+    PBX_LTDL=0
 
 # Check whether --with-ltdl was given.
 if test "${with_ltdl+set}" = set; then
@@ -8571,6 +8635,9 @@ if test "${with_ltdl+set}" = set; then
        case ${withval} in
        n|no)
        USE_LTDL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_LTDL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} LTDL"
@@ -8583,7 +8650,6 @@ if test "${with_ltdl+set}" = set; then
 
 fi
 
-    PBX_LTDL=0
 
 
 
@@ -8592,6 +8658,7 @@ fi
 
     LUA_DESCRIP="Lua"
     LUA_OPTION="lua"
+    PBX_LUA=0
 
 # Check whether --with-lua was given.
 if test "${with_lua+set}" = set; then
@@ -8599,6 +8666,9 @@ if test "${with_lua+set}" = set; then
        case ${withval} in
        n|no)
        USE_LUA=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_LUA=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} LUA"
@@ -8611,7 +8681,6 @@ if test "${with_lua+set}" = set; then
 
 fi
 
-    PBX_LUA=0
 
 
 
@@ -8620,6 +8689,7 @@ fi
 
     MISDN_DESCRIP="mISDN User Library"
     MISDN_OPTION="misdn"
+    PBX_MISDN=0
 
 # Check whether --with-misdn was given.
 if test "${with_misdn+set}" = set; then
@@ -8627,6 +8697,9 @@ if test "${with_misdn+set}" = set; then
        case ${withval} in
        n|no)
        USE_MISDN=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_MISDN=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} MISDN"
@@ -8639,7 +8712,6 @@ if test "${with_misdn+set}" = set; then
 
 fi
 
-    PBX_MISDN=0
 
 
 
@@ -8648,6 +8720,7 @@ fi
 
     NBS_DESCRIP="Network Broadcast Sound"
     NBS_OPTION="nbs"
+    PBX_NBS=0
 
 # Check whether --with-nbs was given.
 if test "${with_nbs+set}" = set; then
@@ -8655,6 +8728,9 @@ if test "${with_nbs+set}" = set; then
        case ${withval} in
        n|no)
        USE_NBS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_NBS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} NBS"
@@ -8667,7 +8743,6 @@ if test "${with_nbs+set}" = set; then
 
 fi
 
-    PBX_NBS=0
 
 
 
@@ -8676,6 +8751,7 @@ fi
 
     NCURSES_DESCRIP="ncurses"
     NCURSES_OPTION="ncurses"
+    PBX_NCURSES=0
 
 # Check whether --with-ncurses was given.
 if test "${with_ncurses+set}" = set; then
@@ -8683,6 +8759,9 @@ if test "${with_ncurses+set}" = set; then
        case ${withval} in
        n|no)
        USE_NCURSES=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_NCURSES=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} NCURSES"
@@ -8695,7 +8774,6 @@ if test "${with_ncurses+set}" = set; then
 
 fi
 
-    PBX_NCURSES=0
 
 
 
@@ -8704,6 +8782,7 @@ fi
 
     NETSNMP_DESCRIP="Net-SNMP"
     NETSNMP_OPTION="netsnmp"
+    PBX_NETSNMP=0
 
 # Check whether --with-netsnmp was given.
 if test "${with_netsnmp+set}" = set; then
@@ -8711,6 +8790,9 @@ if test "${with_netsnmp+set}" = set; then
        case ${withval} in
        n|no)
        USE_NETSNMP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_NETSNMP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} NETSNMP"
@@ -8723,7 +8805,6 @@ if test "${with_netsnmp+set}" = set; then
 
 fi
 
-    PBX_NETSNMP=0
 
 
 
@@ -8732,6 +8813,7 @@ fi
 
     NEWT_DESCRIP="newt"
     NEWT_OPTION="newt"
+    PBX_NEWT=0
 
 # Check whether --with-newt was given.
 if test "${with_newt+set}" = set; then
@@ -8739,6 +8821,9 @@ if test "${with_newt+set}" = set; then
        case ${withval} in
        n|no)
        USE_NEWT=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_NEWT=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} NEWT"
@@ -8751,7 +8836,6 @@ if test "${with_newt+set}" = set; then
 
 fi
 
-    PBX_NEWT=0
 
 
 
@@ -8760,6 +8844,7 @@ fi
 
     OGG_DESCRIP="OGG"
     OGG_OPTION="ogg"
+    PBX_OGG=0
 
 # Check whether --with-ogg was given.
 if test "${with_ogg+set}" = set; then
@@ -8767,6 +8852,9 @@ if test "${with_ogg+set}" = set; then
        case ${withval} in
        n|no)
        USE_OGG=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OGG=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OGG"
@@ -8779,7 +8867,6 @@ if test "${with_ogg+set}" = set; then
 
 fi
 
-    PBX_OGG=0
 
 
 
@@ -8788,6 +8875,7 @@ fi
 
     OSPTK_DESCRIP="OSP Toolkit"
     OSPTK_OPTION="osptk"
+    PBX_OSPTK=0
 
 # Check whether --with-osptk was given.
 if test "${with_osptk+set}" = set; then
@@ -8795,6 +8883,9 @@ if test "${with_osptk+set}" = set; then
        case ${withval} in
        n|no)
        USE_OSPTK=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OSPTK=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OSPTK"
@@ -8807,7 +8898,6 @@ if test "${with_osptk+set}" = set; then
 
 fi
 
-    PBX_OSPTK=0
 
 
 
@@ -8816,6 +8906,7 @@ fi
 
     OSS_DESCRIP="Open Sound System"
     OSS_OPTION="oss"
+    PBX_OSS=0
 
 # Check whether --with-oss was given.
 if test "${with_oss+set}" = set; then
@@ -8823,6 +8914,9 @@ if test "${with_oss+set}" = set; then
        case ${withval} in
        n|no)
        USE_OSS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OSS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OSS"
@@ -8835,7 +8929,6 @@ if test "${with_oss+set}" = set; then
 
 fi
 
-    PBX_OSS=0
 
 
 
@@ -8844,6 +8937,7 @@ fi
 
     PGSQL_DESCRIP="PostgreSQL"
     PGSQL_OPTION="postgres"
+    PBX_PGSQL=0
 
 # Check whether --with-postgres was given.
 if test "${with_postgres+set}" = set; then
@@ -8851,6 +8945,9 @@ if test "${with_postgres+set}" = set; then
        case ${withval} in
        n|no)
        USE_PGSQL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_PGSQL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} PGSQL"
@@ -8863,7 +8960,6 @@ if test "${with_postgres+set}" = set; then
 
 fi
 
-    PBX_PGSQL=0
 
 
 
@@ -8872,6 +8968,7 @@ fi
 
     POPT_DESCRIP="popt"
     POPT_OPTION="popt"
+    PBX_POPT=0
 
 # Check whether --with-popt was given.
 if test "${with_popt+set}" = set; then
@@ -8879,6 +8976,9 @@ if test "${with_popt+set}" = set; then
        case ${withval} in
        n|no)
        USE_POPT=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_POPT=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} POPT"
@@ -8891,7 +8991,6 @@ if test "${with_popt+set}" = set; then
 
 fi
 
-    PBX_POPT=0
 
 
 
@@ -8900,6 +8999,7 @@ fi
 
     PORTAUDIO_DESCRIP="PortAudio"
     PORTAUDIO_OPTION="portaudio"
+    PBX_PORTAUDIO=0
 
 # Check whether --with-portaudio was given.
 if test "${with_portaudio+set}" = set; then
@@ -8907,6 +9007,9 @@ if test "${with_portaudio+set}" = set; then
        case ${withval} in
        n|no)
        USE_PORTAUDIO=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_PORTAUDIO=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} PORTAUDIO"
@@ -8919,7 +9022,6 @@ if test "${with_portaudio+set}" = set; then
 
 fi
 
-    PBX_PORTAUDIO=0
 
 
 
@@ -8928,6 +9030,7 @@ fi
 
     PRI_DESCRIP="ISDN PRI"
     PRI_OPTION="pri"
+    PBX_PRI=0
 
 # Check whether --with-pri was given.
 if test "${with_pri+set}" = set; then
@@ -8935,6 +9038,9 @@ if test "${with_pri+set}" = set; then
        case ${withval} in
        n|no)
        USE_PRI=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_PRI=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} PRI"
@@ -8947,7 +9053,6 @@ if test "${with_pri+set}" = set; then
 
 fi
 
-    PBX_PRI=0
 
 
 
@@ -8956,6 +9061,7 @@ fi
 
     RESAMPLE_DESCRIP="LIBRESAMPLE"
     RESAMPLE_OPTION="resample"
+    PBX_RESAMPLE=0
 
 # Check whether --with-resample was given.
 if test "${with_resample+set}" = set; then
@@ -8963,6 +9069,9 @@ if test "${with_resample+set}" = set; then
        case ${withval} in
        n|no)
        USE_RESAMPLE=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_RESAMPLE=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} RESAMPLE"
@@ -8975,7 +9084,6 @@ if test "${with_resample+set}" = set; then
 
 fi
 
-    PBX_RESAMPLE=0
 
 
 
@@ -8984,6 +9092,7 @@ fi
 
     SPANDSP_DESCRIP="SPANDSP"
     SPANDSP_OPTION="spandsp"
+    PBX_SPANDSP=0
 
 # Check whether --with-spandsp was given.
 if test "${with_spandsp+set}" = set; then
@@ -8991,6 +9100,9 @@ if test "${with_spandsp+set}" = set; then
        case ${withval} in
        n|no)
        USE_SPANDSP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SPANDSP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SPANDSP"
@@ -9003,7 +9115,6 @@ if test "${with_spandsp+set}" = set; then
 
 fi
 
-    PBX_SPANDSP=0
 
 
 
@@ -9012,6 +9123,7 @@ fi
 
     SS7_DESCRIP="ISDN SS7"
     SS7_OPTION="ss7"
+    PBX_SS7=0
 
 # Check whether --with-ss7 was given.
 if test "${with_ss7+set}" = set; then
@@ -9019,6 +9131,9 @@ if test "${with_ss7+set}" = set; then
        case ${withval} in
        n|no)
        USE_SS7=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SS7=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SS7"
@@ -9031,7 +9146,6 @@ if test "${with_ss7+set}" = set; then
 
 fi
 
-    PBX_SS7=0
 
 
 
@@ -9040,6 +9154,7 @@ fi
 
     PWLIB_DESCRIP="PWlib"
     PWLIB_OPTION="pwlib"
+    PBX_PWLIB=0
 
 # Check whether --with-pwlib was given.
 if test "${with_pwlib+set}" = set; then
@@ -9047,6 +9162,9 @@ if test "${with_pwlib+set}" = set; then
        case ${withval} in
        n|no)
        USE_PWLIB=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_PWLIB=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} PWLIB"
@@ -9059,7 +9177,6 @@ if test "${with_pwlib+set}" = set; then
 
 fi
 
-    PBX_PWLIB=0
 
 
 
@@ -9068,6 +9185,7 @@ fi
 
     OPENH323_DESCRIP="OpenH323"
     OPENH323_OPTION="h323"
+    PBX_OPENH323=0
 
 # Check whether --with-h323 was given.
 if test "${with_h323+set}" = set; then
@@ -9075,6 +9193,9 @@ if test "${with_h323+set}" = set; then
        case ${withval} in
        n|no)
        USE_OPENH323=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OPENH323=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OPENH323"
@@ -9087,7 +9208,6 @@ if test "${with_h323+set}" = set; then
 
 fi
 
-    PBX_OPENH323=0
 
 
 
@@ -9096,6 +9216,7 @@ fi
 
     RADIUS_DESCRIP="Radius Client"
     RADIUS_OPTION="radius"
+    PBX_RADIUS=0
 
 # Check whether --with-radius was given.
 if test "${with_radius+set}" = set; then
@@ -9103,6 +9224,9 @@ if test "${with_radius+set}" = set; then
        case ${withval} in
        n|no)
        USE_RADIUS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_RADIUS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} RADIUS"
@@ -9115,7 +9239,6 @@ if test "${with_radius+set}" = set; then
 
 fi
 
-    PBX_RADIUS=0
 
 
 
@@ -9124,6 +9247,7 @@ fi
 
     SDL_DESCRIP="Sdl"
     SDL_OPTION="sdl"
+    PBX_SDL=0
 
 # Check whether --with-sdl was given.
 if test "${with_sdl+set}" = set; then
@@ -9131,6 +9255,9 @@ if test "${with_sdl+set}" = set; then
        case ${withval} in
        n|no)
        USE_SDL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SDL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SDL"
@@ -9143,7 +9270,6 @@ if test "${with_sdl+set}" = set; then
 
 fi
 
-    PBX_SDL=0
 
 
 
@@ -9152,6 +9278,7 @@ fi
 
     SDL_IMAGE_DESCRIP="Sdl Image library"
     SDL_IMAGE_OPTION="SDL_image"
+    PBX_SDL_IMAGE=0
 
 # Check whether --with-SDL_image was given.
 if test "${with_SDL_image+set}" = set; then
@@ -9159,6 +9286,9 @@ if test "${with_SDL_image+set}" = set; then
        case ${withval} in
        n|no)
        USE_SDL_IMAGE=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SDL_IMAGE=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SDL_IMAGE"
@@ -9171,7 +9301,6 @@ if test "${with_SDL_image+set}" = set; then
 
 fi
 
-    PBX_SDL_IMAGE=0
 
 
 
@@ -9180,6 +9309,7 @@ fi
 
     OPENAIS_DESCRIP="OpenAIS"
     OPENAIS_OPTION="openais"
+    PBX_OPENAIS=0
 
 # Check whether --with-openais was given.
 if test "${with_openais+set}" = set; then
@@ -9187,6 +9317,9 @@ if test "${with_openais+set}" = set; then
        case ${withval} in
        n|no)
        USE_OPENAIS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OPENAIS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OPENAIS"
@@ -9199,7 +9332,6 @@ if test "${with_openais+set}" = set; then
 
 fi
 
-    PBX_OPENAIS=0
 
 
 
@@ -9208,6 +9340,7 @@ fi
 
     SPEEX_DESCRIP="Speex"
     SPEEX_OPTION="speex"
+    PBX_SPEEX=0
 
 # Check whether --with-speex was given.
 if test "${with_speex+set}" = set; then
@@ -9215,6 +9348,9 @@ if test "${with_speex+set}" = set; then
        case ${withval} in
        n|no)
        USE_SPEEX=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SPEEX=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SPEEX"
@@ -9227,7 +9363,6 @@ if test "${with_speex+set}" = set; then
 
 fi
 
-    PBX_SPEEX=0
 
 
 
@@ -9236,6 +9371,7 @@ fi
 
     SPEEXDSP_DESCRIP="Speexdsp"
     SPEEXDSP_OPTION="speexdsp"
+    PBX_SPEEXDSP=0
 
 # Check whether --with-speexdsp was given.
 if test "${with_speexdsp+set}" = set; then
@@ -9243,6 +9379,9 @@ if test "${with_speexdsp+set}" = set; then
        case ${withval} in
        n|no)
        USE_SPEEXDSP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SPEEXDSP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SPEEXDSP"
@@ -9255,7 +9394,6 @@ if test "${with_speexdsp+set}" = set; then
 
 fi
 
-    PBX_SPEEXDSP=0
 
 
 
@@ -9264,6 +9402,7 @@ fi
 
     SQLITE_DESCRIP="SQLite"
     SQLITE_OPTION="sqlite"
+    PBX_SQLITE=0
 
 # Check whether --with-sqlite was given.
 if test "${with_sqlite+set}" = set; then
@@ -9271,6 +9410,9 @@ if test "${with_sqlite+set}" = set; then
        case ${withval} in
        n|no)
        USE_SQLITE=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SQLITE=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SQLITE"
@@ -9283,7 +9425,6 @@ if test "${with_sqlite+set}" = set; then
 
 fi
 
-    PBX_SQLITE=0
 
 
 
@@ -9292,6 +9433,7 @@ fi
 
     SQLITE3_DESCRIP="SQLite"
     SQLITE3_OPTION="sqlite3"
+    PBX_SQLITE3=0
 
 # Check whether --with-sqlite3 was given.
 if test "${with_sqlite3+set}" = set; then
@@ -9299,6 +9441,9 @@ if test "${with_sqlite3+set}" = set; then
        case ${withval} in
        n|no)
        USE_SQLITE3=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SQLITE3=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SQLITE3"
@@ -9311,7 +9456,6 @@ if test "${with_sqlite3+set}" = set; then
 
 fi
 
-    PBX_SQLITE3=0
 
 
 
@@ -9320,6 +9464,7 @@ fi
 
     SUPPSERV_DESCRIP="mISDN Supplemental Services"
     SUPPSERV_OPTION="suppserv"
+    PBX_SUPPSERV=0
 
 # Check whether --with-suppserv was given.
 if test "${with_suppserv+set}" = set; then
@@ -9327,6 +9472,9 @@ if test "${with_suppserv+set}" = set; then
        case ${withval} in
        n|no)
        USE_SUPPSERV=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_SUPPSERV=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
@@ -9339,7 +9487,6 @@ if test "${with_suppserv+set}" = set; then
 
 fi
 
-    PBX_SUPPSERV=0
 
 
 
@@ -9348,6 +9495,7 @@ fi
 
     OPENSSL_DESCRIP="OpenSSL Secure Sockets Layer support"
     OPENSSL_OPTION="ssl"
+    PBX_OPENSSL=0
 
 # Check whether --with-ssl was given.
 if test "${with_ssl+set}" = set; then
@@ -9355,6 +9503,9 @@ if test "${with_ssl+set}" = set; then
        case ${withval} in
        n|no)
        USE_OPENSSL=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_OPENSSL=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} OPENSSL"
@@ -9367,7 +9518,6 @@ if test "${with_ssl+set}" = set; then
 
 fi
 
-    PBX_OPENSSL=0
 
 
 
@@ -9376,6 +9526,7 @@ fi
 
     FREETDS_DESCRIP="FreeTDS"
     FREETDS_OPTION="tds"
+    PBX_FREETDS=0
 
 # Check whether --with-tds was given.
 if test "${with_tds+set}" = set; then
@@ -9383,6 +9534,9 @@ if test "${with_tds+set}" = set; then
        case ${withval} in
        n|no)
        USE_FREETDS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_FREETDS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} FREETDS"
@@ -9395,7 +9549,6 @@ if test "${with_tds+set}" = set; then
 
 fi
 
-    PBX_FREETDS=0
 
 
 
@@ -9404,6 +9557,7 @@ fi
 
     TERMCAP_DESCRIP="Termcap"
     TERMCAP_OPTION="termcap"
+    PBX_TERMCAP=0
 
 # Check whether --with-termcap was given.
 if test "${with_termcap+set}" = set; then
@@ -9411,6 +9565,9 @@ if test "${with_termcap+set}" = set; then
        case ${withval} in
        n|no)
        USE_TERMCAP=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_TERMCAP=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} TERMCAP"
@@ -9423,7 +9580,6 @@ if test "${with_termcap+set}" = set; then
 
 fi
 
-    PBX_TERMCAP=0
 
 
 
@@ -9432,6 +9588,7 @@ fi
 
     TINFO_DESCRIP="Term Info"
     TINFO_OPTION="tinfo"
+    PBX_TINFO=0
 
 # Check whether --with-tinfo was given.
 if test "${with_tinfo+set}" = set; then
@@ -9439,6 +9596,9 @@ if test "${with_tinfo+set}" = set; then
        case ${withval} in
        n|no)
        USE_TINFO=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_TINFO=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} TINFO"
@@ -9451,7 +9611,6 @@ if test "${with_tinfo+set}" = set; then
 
 fi
 
-    PBX_TINFO=0
 
 
 
@@ -9460,6 +9619,7 @@ fi
 
     TONEZONE_DESCRIP="tonezone"
     TONEZONE_OPTION="tonezone"
+    PBX_TONEZONE=0
 
 # Check whether --with-tonezone was given.
 if test "${with_tonezone+set}" = set; then
@@ -9467,6 +9627,9 @@ if test "${with_tonezone+set}" = set; then
        case ${withval} in
        n|no)
        USE_TONEZONE=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_TONEZONE=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} TONEZONE"
@@ -9479,7 +9642,6 @@ if test "${with_tonezone+set}" = set; then
 
 fi
 
-    PBX_TONEZONE=0
 
 
 
@@ -9488,6 +9650,7 @@ fi
 
     UNIXODBC_DESCRIP="unixODBC"
     UNIXODBC_OPTION="unixodbc"
+    PBX_UNIXODBC=0
 
 # Check whether --with-unixodbc was given.
 if test "${with_unixodbc+set}" = set; then
@@ -9495,6 +9658,9 @@ if test "${with_unixodbc+set}" = set; then
        case ${withval} in
        n|no)
        USE_UNIXODBC=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_UNIXODBC=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
@@ -9507,7 +9673,6 @@ if test "${with_unixodbc+set}" = set; then
 
 fi
 
-    PBX_UNIXODBC=0
 
 
 
@@ -9516,6 +9681,7 @@ fi
 
     USB_DESCRIP="usb"
     USB_OPTION="usb"
+    PBX_USB=0
 
 # Check whether --with-usb was given.
 if test "${with_usb+set}" = set; then
@@ -9523,6 +9689,9 @@ if test "${with_usb+set}" = set; then
        case ${withval} in
        n|no)
        USE_USB=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_USB=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} USB"
@@ -9535,7 +9704,6 @@ if test "${with_usb+set}" = set; then
 
 fi
 
-    PBX_USB=0
 
 
 
@@ -9544,6 +9712,7 @@ fi
 
     VORBIS_DESCRIP="Vorbis"
     VORBIS_OPTION="vorbis"
+    PBX_VORBIS=0
 
 # Check whether --with-vorbis was given.
 if test "${with_vorbis+set}" = set; then
@@ -9551,6 +9720,9 @@ if test "${with_vorbis+set}" = set; then
        case ${withval} in
        n|no)
        USE_VORBIS=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_VORBIS=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} VORBIS"
@@ -9563,7 +9735,6 @@ if test "${with_vorbis+set}" = set; then
 
 fi
 
-    PBX_VORBIS=0
 
 
 
@@ -9572,6 +9743,7 @@ fi
 
     VPB_DESCRIP="Voicetronix API"
     VPB_OPTION="vpb"
+    PBX_VPB=0
 
 # Check whether --with-vpb was given.
 if test "${with_vpb+set}" = set; then
@@ -9579,6 +9751,9 @@ if test "${with_vpb+set}" = set; then
        case ${withval} in
        n|no)
        USE_VPB=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_VPB=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} VPB"
@@ -9591,7 +9766,6 @@ if test "${with_vpb+set}" = set; then
 
 fi
 
-    PBX_VPB=0
 
 
 
@@ -9600,6 +9774,7 @@ fi
 
     X11_DESCRIP="X11 support"
     X11_OPTION="x11"
+    PBX_X11=0
 
 # Check whether --with-x11 was given.
 if test "${with_x11+set}" = set; then
@@ -9607,6 +9782,9 @@ if test "${with_x11+set}" = set; then
        case ${withval} in
        n|no)
        USE_X11=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_X11=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} X11"
@@ -9619,7 +9797,6 @@ if test "${with_x11+set}" = set; then
 
 fi
 
-    PBX_X11=0
 
 
 
@@ -9628,6 +9805,7 @@ fi
 
     ZLIB_DESCRIP="zlib"
     ZLIB_OPTION="z"
+    PBX_ZLIB=0
 
 # Check whether --with-z was given.
 if test "${with_z+set}" = set; then
@@ -9635,6 +9813,9 @@ if test "${with_z+set}" = set; then
        case ${withval} in
        n|no)
        USE_ZLIB=no
+       # -1 is a magic value used by menuselect to know that the package
+       # was disabled, other than 'not found'
+       PBX_ZLIB=-1
        ;;
        y|ye|yes)
        ac_mandatory_list="${ac_mandatory_list} ZLIB"
@@ -9647,7 +9828,6 @@ if test "${with_z+set}" = set; then
 
 fi
 
-    PBX_ZLIB=0