From ef3b21472889eff8e88f7e83afb2251ef54722ce Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 12 Jun 2008 17:27:55 +0000 Subject: Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@122234 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure.ac | 49 ++++--------------------------------------------- 1 file changed, 4 insertions(+), 45 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0a68c8e72..c07a03d6e 100644 --- a/configure.ac +++ b/configure.ac @@ -207,6 +207,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap]) AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto]) +AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi]) AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec]) AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise]) AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk]) @@ -257,7 +258,6 @@ AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis]) AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb]) AST_EXT_LIB_SETUP([X11], [X11 support], [x11]) AST_EXT_LIB_SETUP([ZLIB], [zlib], [z]) -AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel]) # check for basic system features and functionality before # checking for package libraries @@ -552,6 +552,8 @@ if test "x${host_os}" = "xlinux-gnu" ; then AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h]) fi +AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h]) + # BSD might not have exp2, and/or log2 AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l]) AST_EXT_LIB_CHECK([LOG2L], [m], [log2l]) @@ -1424,9 +1426,7 @@ if test "${host_os}" != "linux-gnu" ; then fi # new tonezone, version 1.4.0 -AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/tonezone.h], [${tonezone_extra}], [], [140]) -# other case, old tonezone (0.80) -AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel/zaptel.h], [${tonezone_extra}], [], [80]) +AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}]) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) @@ -1478,47 +1478,6 @@ AC_LANG_POP AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h]) -# Check for various zaptel features and locations. -# The version number, which goes into HAVE_ZAPTEL_VERSION, -# will be used in the system headers to determine the location -# of the zaptel.h header. - -AST_C_DEFINE_CHECK([ZAPTEL], [ZT_TONE_DTMF_BASE], [zaptel/zaptel.h], [140]) -AST_C_DEFINE_CHECK([ZAPTEL], [ZT_DIAL_OP_CANCEL], [zaptel/zaptel.h], [90]) - -# Check for VLDTMF support -AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h]) - -# Check for echo canceler parameters support -AST_C_DEFINE_CHECK([ZAPTEL_ECHOCANPARAMS], [ZT_ECHOCANCEL_PARAMS], [zaptel/zaptel.h]) - -# Check for transcoder support -AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h]) - -# Check for hwgain support -AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [ZT_SET_HWGAIN], [zaptel/zaptel.h]) - -# Check for neon mwi support -AST_C_DEFINE_CHECK([ZAPTEL_NEONMWI], [ZT_EVENT_NEONMWI_ACTIVE], [zaptel/zaptel.h]) - -# Check for channel alarm support -AST_C_COMPILE_CHECK([ZAPTEL_CHANALARMS], [size_t foo = sizeof(struct zt_params_v1)], [zaptel/zaptel.h]) - -# Check for ZT_SIG_MTP2 -AST_C_DEFINE_CHECK([ZAPTEL_SIG_MTP2], [ZT_SIG_MTP2], [zaptel/zaptel.h]) - -# On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf -case "${host_os}" in - freebsd*) - AST_EXT_LIB_CHECK([ZAPTEL], [zaptel],, [zaptel.h],,, [80]) - AST_EXT_LIB_CHECK([ZAPTEL_VLDTMF], [zaptel],, [zaptel/zaptel.h],,, [90]) - AST_EXT_LIB_CHECK([ZAPTEL_VLDTMF], [zaptel],, [zaptel.h],,, [80]) - - # other case, old tonezone (0.80) - AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [zaptel.h], [${tonezone_extra}],, [80]) - ;; -esac - EDITLINE_LIB="" if test "x$TERMCAP_LIB" != "x" ; then EDITLINE_LIB="$TERMCAP_LIB" -- cgit v1.2.3