aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-18 21:54:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-18 21:54:23 +0000
commit0b18c72ed2cec22b08ee8afb0ed6cbb36f31a5a7 (patch)
treef7cc59334edc4c9d64c48dcbf9c16e4cec19dfc9 /configure
parent628965af9875225aebf3b620680fc8eaafadb8fd (diff)
Ensure that the locations given to the Asterisk configure script for ncurses,
curses, termcap, or tinfo are further passed along to the editline configure script. This fixes some cross-compilation environments. (issue #8637, reported by ovi, patch by me) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51262 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure163
1 files changed, 137 insertions, 26 deletions
diff --git a/configure b/configure
index 9273a4657..86f65566d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 49866 .
+# From configure.ac Revision: 51239 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -718,114 +718,151 @@ PTHREAD_CFLAGS
AST_DEVMODE
ALSA_LIB
ALSA_INCLUDE
+ALSA_DIR
PBX_ALSA
CURL_LIB
CURL_INCLUDE
+CURL_DIR
PBX_CURL
CURSES_LIB
CURSES_INCLUDE
+CURSES_DIR
PBX_CURSES
GNUTLS_LIB
GNUTLS_INCLUDE
+GNUTLS_DIR
PBX_GNUTLS
GSM_LIB
GSM_INCLUDE
+GSM_DIR
PBX_GSM
IKSEMEL_LIB
IKSEMEL_INCLUDE
+IKSEMEL_DIR
PBX_IKSEMEL
IMAP_TK_LIB
IMAP_TK_INCLUDE
+IMAP_TK_DIR
PBX_IMAP_TK
ISDNNET_LIB
ISDNNET_INCLUDE
+ISDNNET_DIR
PBX_ISDNNET
KDE_LIB
KDE_INCLUDE
+KDE_DIR
PBX_KDE
MISDN_LIB
MISDN_INCLUDE
+MISDN_DIR
PBX_MISDN
NBS_LIB
NBS_INCLUDE
+NBS_DIR
PBX_NBS
NCURSES_LIB
NCURSES_INCLUDE
+NCURSES_DIR
PBX_NCURSES
NETSNMP_LIB
NETSNMP_INCLUDE
+NETSNMP_DIR
PBX_NETSNMP
NEWT_LIB
NEWT_INCLUDE
+NEWT_DIR
PBX_NEWT
UNIXODBC_LIB
UNIXODBC_INCLUDE
+UNIXODBC_DIR
PBX_UNIXODBC
OGG_LIB
OGG_INCLUDE
+OGG_DIR
PBX_OGG
OSPTK_LIB
OSPTK_INCLUDE
+OSPTK_DIR
PBX_OSPTK
OSS_LIB
OSS_INCLUDE
+OSS_DIR
PBX_OSS
POPT_LIB
POPT_INCLUDE
+POPT_DIR
PBX_POPT
PGSQL_LIB
PGSQL_INCLUDE
+PGSQL_DIR
PBX_PGSQL
PRI_LIB
PRI_INCLUDE
+PRI_DIR
PBX_PRI
PWLIB_LIB
PWLIB_INCLUDE
+PWLIB_DIR
PBX_PWLIB
OPENH323_LIB
OPENH323_INCLUDE
+OPENH323_DIR
PBX_OPENH323
QT_LIB
QT_INCLUDE
+QT_DIR
PBX_QT
RADIUS_LIB
RADIUS_INCLUDE
+RADIUS_DIR
PBX_RADIUS
SPEEX_LIB
SPEEX_INCLUDE
+SPEEX_DIR
PBX_SPEEX
SQLITE_LIB
SQLITE_INCLUDE
+SQLITE_DIR
PBX_SQLITE
SUPPSERV_LIB
SUPPSERV_INCLUDE
+SUPPSERV_DIR
PBX_SUPPSERV
OPENSSL_LIB
OPENSSL_INCLUDE
+OPENSSL_DIR
PBX_OPENSSL
FREETDS_LIB
FREETDS_INCLUDE
+FREETDS_DIR
PBX_FREETDS
TERMCAP_LIB
TERMCAP_INCLUDE
+TERMCAP_DIR
PBX_TERMCAP
TINFO_LIB
TINFO_INCLUDE
+TINFO_DIR
PBX_TINFO
TONEZONE_LIB
TONEZONE_INCLUDE
+TONEZONE_DIR
PBX_TONEZONE
VORBIS_LIB
VORBIS_INCLUDE
+VORBIS_DIR
PBX_VORBIS
VPB_LIB
VPB_INCLUDE
+VPB_DIR
PBX_VPB
ZLIB_LIB
ZLIB_INCLUDE
+ZLIB_DIR
PBX_ZLIB
ZAPTEL_LIB
ZAPTEL_INCLUDE
+ZAPTEL_DIR
PBX_ZAPTEL
ALLOCA
LIBOBJS
@@ -7527,6 +7564,7 @@ PBX_ALSA=0
+
CURL_DESCRIP="cURL"
CURL_OPTION="curl"
@@ -7554,6 +7592,7 @@ PBX_CURL=0
+
CURSES_DESCRIP="curses"
CURSES_OPTION="curses"
@@ -7581,6 +7620,7 @@ PBX_CURSES=0
+
GNUTLS_DESCRIP="GNU TLS support (used for iksemel only)"
GNUTLS_OPTION="gnutls"
@@ -7608,6 +7648,7 @@ PBX_GNUTLS=0
+
GSM_DESCRIP="GSM"
GSM_OPTION="gsm"
@@ -7635,6 +7676,7 @@ PBX_GSM=0
+
IKSEMEL_DESCRIP="Iksemel Jabber Library"
IKSEMEL_OPTION="iksemel"
@@ -7662,6 +7704,7 @@ PBX_IKSEMEL=0
+
IMAP_TK_DESCRIP="UW IMAP Toolkit"
IMAP_TK_OPTION="imap"
@@ -7689,6 +7732,7 @@ PBX_IMAP_TK=0
+
ISDNNET_DESCRIP="ISDN4Linux Library"
ISDNNET_OPTION="isdnnet"
@@ -7716,6 +7760,7 @@ PBX_ISDNNET=0
+
KDE_DESCRIP="KDE"
KDE_OPTION="kde"
@@ -7743,6 +7788,7 @@ PBX_KDE=0
+
MISDN_DESCRIP="mISDN User Library"
MISDN_OPTION="misdn"
@@ -7770,6 +7816,7 @@ PBX_MISDN=0
+
NBS_DESCRIP="Network Broadcast Sound"
NBS_OPTION="nbs"
@@ -7797,6 +7844,7 @@ PBX_NBS=0
+
NCURSES_DESCRIP="ncurses"
NCURSES_OPTION="ncurses"
@@ -7824,6 +7872,7 @@ PBX_NCURSES=0
+
NETSNMP_DESCRIP="Net-SNMP"
NETSNMP_OPTION="netsnmp"
@@ -7851,6 +7900,7 @@ PBX_NETSNMP=0
+
NEWT_DESCRIP="newt"
NEWT_OPTION="newt"
@@ -7878,6 +7928,7 @@ PBX_NEWT=0
+
UNIXODBC_DESCRIP="unixODBC"
UNIXODBC_OPTION="odbc"
@@ -7905,6 +7956,7 @@ PBX_UNIXODBC=0
+
OGG_DESCRIP="OGG"
OGG_OPTION="ogg"
@@ -7932,6 +7984,7 @@ PBX_OGG=0
+
OSPTK_DESCRIP="OSP Toolkit"
OSPTK_OPTION="osptk"
@@ -7959,6 +8012,7 @@ PBX_OSPTK=0
+
OSS_DESCRIP="Open Sound System"
OSS_OPTION="oss"
@@ -7986,6 +8040,7 @@ PBX_OSS=0
+
POPT_DESCRIP="popt"
POPT_OPTION="popt"
@@ -8013,6 +8068,7 @@ PBX_POPT=0
+
PGSQL_DESCRIP="PostgreSQL"
PGSQL_OPTION="postgres"
@@ -8040,6 +8096,7 @@ PBX_PGSQL=0
+
PRI_DESCRIP="ISDN PRI"
PRI_OPTION="pri"
@@ -8067,6 +8124,7 @@ PBX_PRI=0
+
PWLIB_DESCRIP="PWlib"
PWLIB_OPTION="pwlib"
@@ -8094,6 +8152,7 @@ PBX_PWLIB=0
+
OPENH323_DESCRIP="OpenH323"
OPENH323_OPTION="h323"
@@ -8121,6 +8180,7 @@ PBX_OPENH323=0
+
QT_DESCRIP="Qt"
QT_OPTION="qt"
@@ -8148,6 +8208,7 @@ PBX_QT=0
+
RADIUS_DESCRIP="Radius Client"
RADIUS_OPTION="radius"
@@ -8175,6 +8236,7 @@ PBX_RADIUS=0
+
SPEEX_DESCRIP="Speex"
SPEEX_OPTION="speex"
@@ -8202,6 +8264,7 @@ PBX_SPEEX=0
+
SQLITE_DESCRIP="SQLite"
SQLITE_OPTION="sqlite"
@@ -8229,6 +8292,7 @@ PBX_SQLITE=0
+
SUPPSERV_DESCRIP="mISDN Supplemental Services"
SUPPSERV_OPTION="suppserv"
@@ -8256,6 +8320,7 @@ PBX_SUPPSERV=0
+
OPENSSL_DESCRIP="OpenSSL"
OPENSSL_OPTION="ssl"
@@ -8283,6 +8348,7 @@ PBX_OPENSSL=0
+
FREETDS_DESCRIP="FreeTDS"
FREETDS_OPTION="tds"
@@ -8310,6 +8376,7 @@ PBX_FREETDS=0
+
TERMCAP_DESCRIP="Termcap"
TERMCAP_OPTION="termcap"
@@ -8337,6 +8404,7 @@ PBX_TERMCAP=0
+
TINFO_DESCRIP="Term Info"
TINFO_OPTION="tinfo"
@@ -8364,6 +8432,7 @@ PBX_TINFO=0
+
TONEZONE_DESCRIP="tonezone"
TONEZONE_OPTION="tonezone"
@@ -8391,6 +8460,7 @@ PBX_TONEZONE=0
+
VORBIS_DESCRIP="Vorbis"
VORBIS_OPTION="vorbis"
@@ -8418,6 +8488,7 @@ PBX_VORBIS=0
+
VPB_DESCRIP="Voicetronix API"
VPB_OPTION="vpb"
@@ -8445,6 +8516,7 @@ PBX_VPB=0
+
ZLIB_DESCRIP="zlib"
ZLIB_OPTION="z"
@@ -8472,6 +8544,7 @@ PBX_ZLIB=0
+
ZAPTEL_DESCRIP="Zaptel"
ZAPTEL_OPTION="zaptel"
@@ -8499,6 +8572,7 @@ PBX_ZAPTEL=0
+
# check for basic system features and functionality before
# checking for package libraries
@@ -30273,101 +30347,101 @@ for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
ALSA_LIB!$ALSA_LIB$ac_delim
ALSA_INCLUDE!$ALSA_INCLUDE$ac_delim
+ALSA_DIR!$ALSA_DIR$ac_delim
PBX_ALSA!$PBX_ALSA$ac_delim
CURL_LIB!$CURL_LIB$ac_delim
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
+CURL_DIR!$CURL_DIR$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
+CURSES_DIR!$CURSES_DIR$ac_delim
PBX_CURSES!$PBX_CURSES$ac_delim
GNUTLS_LIB!$GNUTLS_LIB$ac_delim
GNUTLS_INCLUDE!$GNUTLS_INCLUDE$ac_delim
+GNUTLS_DIR!$GNUTLS_DIR$ac_delim
PBX_GNUTLS!$PBX_GNUTLS$ac_delim
GSM_LIB!$GSM_LIB$ac_delim
GSM_INCLUDE!$GSM_INCLUDE$ac_delim
+GSM_DIR!$GSM_DIR$ac_delim
PBX_GSM!$PBX_GSM$ac_delim
IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim
IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim
+IKSEMEL_DIR!$IKSEMEL_DIR$ac_delim
PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim
IMAP_TK_LIB!$IMAP_TK_LIB$ac_delim
IMAP_TK_INCLUDE!$IMAP_TK_INCLUDE$ac_delim
+IMAP_TK_DIR!$IMAP_TK_DIR$ac_delim
PBX_IMAP_TK!$PBX_IMAP_TK$ac_delim
ISDNNET_LIB!$ISDNNET_LIB$ac_delim
ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim
+ISDNNET_DIR!$ISDNNET_DIR$ac_delim
PBX_ISDNNET!$PBX_ISDNNET$ac_delim
KDE_LIB!$KDE_LIB$ac_delim
KDE_INCLUDE!$KDE_INCLUDE$ac_delim
+KDE_DIR!$KDE_DIR$ac_delim
PBX_KDE!$PBX_KDE$ac_delim
MISDN_LIB!$MISDN_LIB$ac_delim
MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim
+MISDN_DIR!$MISDN_DIR$ac_delim
PBX_MISDN!$PBX_MISDN$ac_delim
NBS_LIB!$NBS_LIB$ac_delim
NBS_INCLUDE!$NBS_INCLUDE$ac_delim
+NBS_DIR!$NBS_DIR$ac_delim
PBX_NBS!$PBX_NBS$ac_delim
NCURSES_LIB!$NCURSES_LIB$ac_delim
NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
+NCURSES_DIR!$NCURSES_DIR$ac_delim
PBX_NCURSES!$PBX_NCURSES$ac_delim
NETSNMP_LIB!$NETSNMP_LIB$ac_delim
NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim
+NETSNMP_DIR!$NETSNMP_DIR$ac_delim
PBX_NETSNMP!$PBX_NETSNMP$ac_delim
NEWT_LIB!$NEWT_LIB$ac_delim
NEWT_INCLUDE!$NEWT_INCLUDE$ac_delim
+NEWT_DIR!$NEWT_DIR$ac_delim
PBX_NEWT!$PBX_NEWT$ac_delim
UNIXODBC_LIB!$UNIXODBC_LIB$ac_delim
UNIXODBC_INCLUDE!$UNIXODBC_INCLUDE$ac_delim
+UNIXODBC_DIR!$UNIXODBC_DIR$ac_delim
PBX_UNIXODBC!$PBX_UNIXODBC$ac_delim
OGG_LIB!$OGG_LIB$ac_delim
OGG_INCLUDE!$OGG_INCLUDE$ac_delim
+OGG_DIR!$OGG_DIR$ac_delim
PBX_OGG!$PBX_OGG$ac_delim
OSPTK_LIB!$OSPTK_LIB$ac_delim
OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim
+OSPTK_DIR!$OSPTK_DIR$ac_delim
PBX_OSPTK!$PBX_OSPTK$ac_delim
OSS_LIB!$OSS_LIB$ac_delim
OSS_INCLUDE!$OSS_INCLUDE$ac_delim
+OSS_DIR!$OSS_DIR$ac_delim
PBX_OSS!$PBX_OSS$ac_delim
POPT_LIB!$POPT_LIB$ac_delim
POPT_INCLUDE!$POPT_INCLUDE$ac_delim
+POPT_DIR!$POPT_DIR$ac_delim
PBX_POPT!$PBX_POPT$ac_delim
PGSQL_LIB!$PGSQL_LIB$ac_delim
PGSQL_INCLUDE!$PGSQL_INCLUDE$ac_delim
+PGSQL_DIR!$PGSQL_DIR$ac_delim
PBX_PGSQL!$PBX_PGSQL$ac_delim
PRI_LIB!$PRI_LIB$ac_delim
PRI_INCLUDE!$PRI_INCLUDE$ac_delim
+PRI_DIR!$PRI_DIR$ac_delim
PBX_PRI!$PBX_PRI$ac_delim
PWLIB_LIB!$PWLIB_LIB$ac_delim
PWLIB_INCLUDE!$PWLIB_INCLUDE$ac_delim
+PWLIB_DIR!$PWLIB_DIR$ac_delim
PBX_PWLIB!$PBX_PWLIB$ac_delim
OPENH323_LIB!$OPENH323_LIB$ac_delim
OPENH323_INCLUDE!$OPENH323_INCLUDE$ac_delim
+OPENH323_DIR!$OPENH323_DIR$ac_delim
PBX_OPENH323!$PBX_OPENH323$ac_delim
QT_LIB!$QT_LIB$ac_delim
QT_INCLUDE!$QT_INCLUDE$ac_delim
+QT_DIR!$QT_DIR$ac_delim
PBX_QT!$PBX_QT$ac_delim
RADIUS_LIB!$RADIUS_LIB$ac_delim
-RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
-PBX_RADIUS!$PBX_RADIUS$ac_delim
-SPEEX_LIB!$SPEEX_LIB$ac_delim
-SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
-PBX_SPEEX!$PBX_SPEEX$ac_delim
-SQLITE_LIB!$SQLITE_LIB$ac_delim
-SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
-PBX_SQLITE!$PBX_SQLITE$ac_delim
-SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
-SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
-PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
-OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
-PBX_OPENSSL!$PBX_OPENSSL$ac_delim
-FREETDS_LIB!$FREETDS_LIB$ac_delim
-FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
-PBX_FREETDS!$PBX_FREETDS$ac_delim
-TERMCAP_LIB!$TERMCAP_LIB$ac_delim
-TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
-PBX_TERMCAP!$PBX_TERMCAP$ac_delim
-TINFO_LIB!$TINFO_LIB$ac_delim
-TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim
-PBX_TINFO!$PBX_TINFO$ac_delim
-TONEZONE_LIB!$TONEZONE_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30409,19 +30483,56 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
+RADIUS_DIR!$RADIUS_DIR$ac_delim
+PBX_RADIUS!$PBX_RADIUS$ac_delim
+SPEEX_LIB!$SPEEX_LIB$ac_delim
+SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
+SPEEX_DIR!$SPEEX_DIR$ac_delim
+PBX_SPEEX!$PBX_SPEEX$ac_delim
+SQLITE_LIB!$SQLITE_LIB$ac_delim
+SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
+SQLITE_DIR!$SQLITE_DIR$ac_delim
+PBX_SQLITE!$PBX_SQLITE$ac_delim
+SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
+SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
+SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
+PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
+OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
+OPENSSL_DIR!$OPENSSL_DIR$ac_delim
+PBX_OPENSSL!$PBX_OPENSSL$ac_delim
+FREETDS_LIB!$FREETDS_LIB$ac_delim
+FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
+FREETDS_DIR!$FREETDS_DIR$ac_delim
+PBX_FREETDS!$PBX_FREETDS$ac_delim
+TERMCAP_LIB!$TERMCAP_LIB$ac_delim
+TERMCAP_INCLUDE!$TERMCAP_INCLUDE$ac_delim
+TERMCAP_DIR!$TERMCAP_DIR$ac_delim
+PBX_TERMCAP!$PBX_TERMCAP$ac_delim
+TINFO_LIB!$TINFO_LIB$ac_delim
+TINFO_INCLUDE!$TINFO_INCLUDE$ac_delim
+TINFO_DIR!$TINFO_DIR$ac_delim
+PBX_TINFO!$PBX_TINFO$ac_delim
+TONEZONE_LIB!$TONEZONE_LIB$ac_delim
TONEZONE_INCLUDE!$TONEZONE_INCLUDE$ac_delim
+TONEZONE_DIR!$TONEZONE_DIR$ac_delim
PBX_TONEZONE!$PBX_TONEZONE$ac_delim
VORBIS_LIB!$VORBIS_LIB$ac_delim
VORBIS_INCLUDE!$VORBIS_INCLUDE$ac_delim
+VORBIS_DIR!$VORBIS_DIR$ac_delim
PBX_VORBIS!$PBX_VORBIS$ac_delim
VPB_LIB!$VPB_LIB$ac_delim
VPB_INCLUDE!$VPB_INCLUDE$ac_delim
+VPB_DIR!$VPB_DIR$ac_delim
PBX_VPB!$PBX_VPB$ac_delim
ZLIB_LIB!$ZLIB_LIB$ac_delim
ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
+ZLIB_DIR!$ZLIB_DIR$ac_delim
PBX_ZLIB!$PBX_ZLIB$ac_delim
ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
+ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim
PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
ALLOCA!$ALLOCA$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
@@ -30457,7 +30568,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5