Merged revisions 51262 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 18 Jan 2007 21:57:55 +0000 (21:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 18 Jan 2007 21:57:55 +0000 (21:57 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51262 | russell | 2007-01-18 15:54:23 -0600 (Thu, 18 Jan 2007) | 5 lines

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: https://origsvn.digium.com/svn/asterisk/trunk@51263 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
acinclude.m4
configure
main/Makefile
makeopts.in

index 368cff2..7767780 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,10 @@ export SOLINK
 export STRIP
 export DOWNLOAD
 export OSARCH
+export CURSES_DIR
+export NCURSES_DIR
+export TERMCAP_DIR
+export TINFO_DIR
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
index 093bfb3..26360a6 100644 (file)
@@ -34,6 +34,7 @@ esac
 PBX_$1=0
 AC_SUBST([$1_LIB])
 AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
 AC_SUBST([PBX_$1])
 ])
 
index d920faa..657bbc1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 49870 .
+# From configure.ac Revision: 50869 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -718,120 +718,159 @@ PTHREAD_CFLAGS
 AST_DEVMODE
 ALSA_LIB
 ALSA_INCLUDE
+ALSA_DIR
 PBX_ALSA
 CAP_LIB
 CAP_INCLUDE
+CAP_DIR
 PBX_CAP
 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
 SS7_LIB
 SS7_INCLUDE
+SS7_DIR
 PBX_SS7
 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
@@ -7535,6 +7574,7 @@ PBX_ALSA=0
 
 
 
+
 CAP_DESCRIP="POSIX 1.e capabilities"
 CAP_OPTION="cap"
 
@@ -7562,6 +7602,7 @@ PBX_CAP=0
 
 
 
+
 CURL_DESCRIP="cURL"
 CURL_OPTION="curl"
 
@@ -7589,6 +7630,7 @@ PBX_CURL=0
 
 
 
+
 CURSES_DESCRIP="curses"
 CURSES_OPTION="curses"
 
@@ -7616,6 +7658,7 @@ PBX_CURSES=0
 
 
 
+
 GNUTLS_DESCRIP="GNU TLS support (used for iksemel only)"
 GNUTLS_OPTION="gnutls"
 
@@ -7643,6 +7686,7 @@ PBX_GNUTLS=0
 
 
 
+
 GSM_DESCRIP="GSM"
 GSM_OPTION="gsm"
 
@@ -7670,6 +7714,7 @@ PBX_GSM=0
 
 
 
+
 IKSEMEL_DESCRIP="Iksemel Jabber Library"
 IKSEMEL_OPTION="iksemel"
 
@@ -7697,6 +7742,7 @@ PBX_IKSEMEL=0
 
 
 
+
 IMAP_TK_DESCRIP="UW IMAP Toolkit"
 IMAP_TK_OPTION="imap"
 
@@ -7724,6 +7770,7 @@ PBX_IMAP_TK=0
 
 
 
+
 ISDNNET_DESCRIP="ISDN4Linux Library"
 ISDNNET_OPTION="isdnnet"
 
@@ -7751,6 +7798,7 @@ PBX_ISDNNET=0
 
 
 
+
 KDE_DESCRIP="KDE"
 KDE_OPTION="kde"
 
@@ -7778,6 +7826,7 @@ PBX_KDE=0
 
 
 
+
 MISDN_DESCRIP="mISDN User Library"
 MISDN_OPTION="misdn"
 
@@ -7805,6 +7854,7 @@ PBX_MISDN=0
 
 
 
+
 NBS_DESCRIP="Network Broadcast Sound"
 NBS_OPTION="nbs"
 
@@ -7832,6 +7882,7 @@ PBX_NBS=0
 
 
 
+
 NCURSES_DESCRIP="ncurses"
 NCURSES_OPTION="ncurses"
 
@@ -7859,6 +7910,7 @@ PBX_NCURSES=0
 
 
 
+
 NETSNMP_DESCRIP="Net-SNMP"
 NETSNMP_OPTION="netsnmp"
 
@@ -7886,6 +7938,7 @@ PBX_NETSNMP=0
 
 
 
+
 NEWT_DESCRIP="newt"
 NEWT_OPTION="newt"
 
@@ -7913,6 +7966,7 @@ PBX_NEWT=0
 
 
 
+
 UNIXODBC_DESCRIP="unixODBC"
 UNIXODBC_OPTION="odbc"
 
@@ -7940,6 +7994,7 @@ PBX_UNIXODBC=0
 
 
 
+
 OGG_DESCRIP="OGG"
 OGG_OPTION="ogg"
 
@@ -7967,6 +8022,7 @@ PBX_OGG=0
 
 
 
+
 OSPTK_DESCRIP="OSP Toolkit"
 OSPTK_OPTION="osptk"
 
@@ -7994,6 +8050,7 @@ PBX_OSPTK=0
 
 
 
+
 OSS_DESCRIP="Open Sound System"
 OSS_OPTION="oss"
 
@@ -8021,6 +8078,7 @@ PBX_OSS=0
 
 
 
+
 POPT_DESCRIP="popt"
 POPT_OPTION="popt"
 
@@ -8048,6 +8106,7 @@ PBX_POPT=0
 
 
 
+
 PGSQL_DESCRIP="PostgreSQL"
 PGSQL_OPTION="postgres"
 
@@ -8075,6 +8134,7 @@ PBX_PGSQL=0
 
 
 
+
 PRI_DESCRIP="ISDN PRI"
 PRI_OPTION="pri"
 
@@ -8102,6 +8162,7 @@ PBX_PRI=0
 
 
 
+
 SS7_DESCRIP="ISDN SS7"
 SS7_OPTION="ss7"
 
@@ -8129,6 +8190,7 @@ PBX_SS7=0
 
 
 
+
 PWLIB_DESCRIP="PWlib"
 PWLIB_OPTION="pwlib"
 
@@ -8156,6 +8218,7 @@ PBX_PWLIB=0
 
 
 
+
 OPENH323_DESCRIP="OpenH323"
 OPENH323_OPTION="h323"
 
@@ -8183,6 +8246,7 @@ PBX_OPENH323=0
 
 
 
+
 QT_DESCRIP="Qt"
 QT_OPTION="qt"
 
@@ -8210,6 +8274,7 @@ PBX_QT=0
 
 
 
+
 RADIUS_DESCRIP="Radius Client"
 RADIUS_OPTION="radius"
 
@@ -8237,6 +8302,7 @@ PBX_RADIUS=0
 
 
 
+
 SPEEX_DESCRIP="Speex"
 SPEEX_OPTION="speex"
 
@@ -8264,6 +8330,7 @@ PBX_SPEEX=0
 
 
 
+
 SQLITE_DESCRIP="SQLite"
 SQLITE_OPTION="sqlite"
 
@@ -8291,6 +8358,7 @@ PBX_SQLITE=0
 
 
 
+
 SUPPSERV_DESCRIP="mISDN Supplemental Services"
 SUPPSERV_OPTION="suppserv"
 
@@ -8318,6 +8386,7 @@ PBX_SUPPSERV=0
 
 
 
+
 OPENSSL_DESCRIP="OpenSSL"
 OPENSSL_OPTION="ssl"
 
@@ -8345,6 +8414,7 @@ PBX_OPENSSL=0
 
 
 
+
 FREETDS_DESCRIP="FreeTDS"
 FREETDS_OPTION="tds"
 
@@ -8372,6 +8442,7 @@ PBX_FREETDS=0
 
 
 
+
 TERMCAP_DESCRIP="Termcap"
 TERMCAP_OPTION="termcap"
 
@@ -8399,6 +8470,7 @@ PBX_TERMCAP=0
 
 
 
+
 TINFO_DESCRIP="Term Info"
 TINFO_OPTION="tinfo"
 
@@ -8426,6 +8498,7 @@ PBX_TINFO=0
 
 
 
+
 TONEZONE_DESCRIP="tonezone"
 TONEZONE_OPTION="tonezone"
 
@@ -8453,6 +8526,7 @@ PBX_TONEZONE=0
 
 
 
+
 VORBIS_DESCRIP="Vorbis"
 VORBIS_OPTION="vorbis"
 
@@ -8480,6 +8554,7 @@ PBX_VORBIS=0
 
 
 
+
 VPB_DESCRIP="Voicetronix API"
 VPB_OPTION="vpb"
 
@@ -8507,6 +8582,7 @@ PBX_VPB=0
 
 
 
+
 ZLIB_DESCRIP="zlib"
 ZLIB_OPTION="z"
 
@@ -8534,6 +8610,7 @@ PBX_ZLIB=0
 
 
 
+
 ZAPTEL_DESCRIP="Zaptel"
 ZAPTEL_OPTION="zaptel"
 
@@ -8561,6 +8638,7 @@ PBX_ZAPTEL=0
 
 
 
+
 # check for basic system features and functionality before
 # checking for package libraries
 
@@ -31988,101 +32066,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
 CAP_LIB!$CAP_LIB$ac_delim
 CAP_INCLUDE!$CAP_INCLUDE$ac_delim
+CAP_DIR!$CAP_DIR$ac_delim
 PBX_CAP!$PBX_CAP$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
 SS7_LIB!$SS7_LIB$ac_delim
 SS7_INCLUDE!$SS7_INCLUDE$ac_delim
+SS7_DIR!$SS7_DIR$ac_delim
 PBX_SS7!$PBX_SS7$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
-PBX_OPENH323!$PBX_OPENH323$ac_delim
-QT_LIB!$QT_LIB$ac_delim
-QT_INCLUDE!$QT_INCLUDE$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
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -32124,25 +32202,64 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+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
+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
@@ -32178,7 +32295,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` = 52; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
index db2aba0..a6529e9 100644 (file)
@@ -100,7 +100,7 @@ ifeq ($(OSARCH),SunOS)
 endif
 
 editline/libedit.a:
-       cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+       cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
        $(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a:
@@ -141,6 +141,6 @@ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 clean::
        rm -f asterisk
        rm -f db1-ast/.*.d
-       @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
+       @if [ -f editline/Makefile ]; then $(MAKE) -C editline clean ; fi
        @$(MAKE) -C db1-ast clean
        @$(MAKE) -C stdtime clean
index 706565b..5db8846 100644 (file)
@@ -69,6 +69,7 @@ CURL_LIB=@CURL_LIB@
 
 CURSES_INCLUDE=@CURSES_INCLUDE@
 CURSES_LIB=@CURSES_LIB@
+CURSES_DIR=@CURSES_DIR@
 
 EDITLINE_LIB=@EDITLINE_LIB@
 
@@ -97,6 +98,7 @@ NBS_LIB=@NBS_LIB@
 
 NCURSES_INCLUDE=@NCURSES_INCLUDE@
 NCURSES_LIB=@NCURSES_LIB@
+NCURSES_DIR=@NCURSES_DIR@
 
 NETSNMP_LIB=@NETSNMP_LIB@
 
@@ -170,3 +172,11 @@ SUPPSERV_LIB=@SUPPSERV_LIB@
 
 CAP_LIB=@CAP_LIB@
 CAP_INCLUDE=@CAP_INCLUDE@
+
+TERMCAP_INCLUDE=@TERMCAP_INCLUDE@
+TERMCAP_LIB=@TERMCAP_LIB@
+TERMCAP_DIR=@TERMCAP_DIR@
+
+TINFO_INCLUDE=@TINFO_INCLUDE@
+TINFO_LIB=@TINFO_LIB@
+TINFO_DIR=@TINFO_DIR@