[asterisk-commits] jpeeler: branch jpeeler/chan_dahdi r118608 - in /team/jpeeler/chan_dahdi: ./ ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue May 27 15:40:14 CDT 2008
Author: jpeeler
Date: Tue May 27 15:40:14 2008
New Revision: 118608
URL: http://svn.digium.com/view/asterisk?view=rev&rev=118608
Log:
remove unneccessary checks from configure script leftover from old zaptel version checking
Modified:
team/jpeeler/chan_dahdi/apps/app_page.c
team/jpeeler/chan_dahdi/build_tools/menuselect-deps.in
team/jpeeler/chan_dahdi/channels/chan_dahdi.c
team/jpeeler/chan_dahdi/configure
team/jpeeler/chan_dahdi/configure.ac
team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in
team/jpeeler/chan_dahdi/makeopts.in
Modified: team/jpeeler/chan_dahdi/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_page.c?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_page.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_page.c Tue May 27 15:40:14 2008
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>dahdi</depend>
<depend>app_meetme</depend>
***/
Modified: team/jpeeler/chan_dahdi/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/build_tools/menuselect-deps.in?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/build_tools/menuselect-deps.in (original)
+++ team/jpeeler/chan_dahdi/build_tools/menuselect-deps.in Tue May 27 15:40:14 2008
@@ -1,6 +1,7 @@
ASOUND=@PBX_ALSA@
CRYPTO=@PBX_CRYPTO@
CURL=@PBX_CURL@
+DAHDI=@PBX_DAHDI@
FREETDS=@PBX_FREETDS@
GMIME=@PBX_GMIME@
GNU_LD=@GNU_LD@
@@ -44,7 +45,4 @@
VORBIS=@PBX_VORBIS@
VPBAPI=@PBX_VPB@
WINARCH=@WINARCH@
-ZAPTEL=@PBX_ZAPTEL@
-ZAPTEL_TRANSCODE=@PBX_ZAPTEL_TRANSCODE@
-ZAPTEL_VLDTMF=@PBX_ZAPTEL_VLDTMF@
ZLIB=@PBX_ZLIB@
Modified: team/jpeeler/chan_dahdi/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/channels/chan_dahdi.c?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/channels/chan_dahdi.c (original)
+++ team/jpeeler/chan_dahdi/channels/chan_dahdi.c Tue May 27 15:40:14 2008
@@ -39,7 +39,6 @@
/*** MODULEINFO
<depend>res_smdi</depend>
- <depend>dahdi_vldtmf</depend>
<depend>dahdi</depend>
<depend>tonezone</depend>
<use>pri</use>
Modified: team/jpeeler/chan_dahdi/configure.ac
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/configure.ac?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/configure.ac (original)
+++ team/jpeeler/chan_dahdi/configure.ac Tue May 27 15:40:14 2008
@@ -548,6 +548,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])
@@ -1405,7 +1407,7 @@
fi
# new tonezone, version 1.4.0
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}], [], [140])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
@@ -1457,36 +1459,6 @@
AST_EXT_LIB_CHECK([ZLIB], [z], [compress], [zlib.h])
-# Check for various dahdi features and locations.
-# The version number, which goes into HAVE_DAHDI_VERSION,
-# will be used in the system headers to determine the location
-# of the kernel.h header.
-
-
-AST_C_DEFINE_CHECK([DAHDI], [DAHDI_TONE_DTMF_BASE], [dahdi/kernel.h], [140])
-AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DIAL_OP_CANCEL], [dahdi/kernel.h], [90])
-
-# Check for VLDTMF support
-AST_C_DEFINE_CHECK([DAHDI_VLDTMF], [DAHDI_EVENT_REMOVED], [dahdi/kernel.h])
-
-# Check for echo canceler parameters support
-AST_C_DEFINE_CHECK([DAHDI_ECHOCANPARAMS], [DAHDI_ECHOCANCEL_PARAMS], [dahdi/kernel.h])
-
-# Check for transcoder support
-AST_C_DEFINE_CHECK([DAHDI_TRANSCODE], [DAHDI_TCOP_ALLOCATE], [dahdi/kernel.h])
-
-# Check for hwgain support
-AST_C_DEFINE_CHECK([DAHDI_HWGAIN], [DAHDI_SET_HWGAIN], [dahdi/kernel.h])
-
-# Check for neon mwi support
-AST_C_DEFINE_CHECK([DAHDI_NEONMWI], [DAHDI_EVENT_NEONMWI_ACTIVE], [dahdi/kernel.h])
-
-# Check for channel alarm support
-AST_C_COMPILE_CHECK([DAHDI_CHANALARMS], [size_t foo = sizeof(struct dahdi_params)], [dahdi/kernel.h])
-
-# Check for DAHDI_SIG_MTP2
-AST_C_DEFINE_CHECK([DAHDI_SIG_MTP2], [DAHDI_SIG_MTP2], [dahdi/kernel.h])
-
EDITLINE_LIB=""
if test "x$TERMCAP_LIB" != "x" ; then
EDITLINE_LIB="$TERMCAP_LIB"
Modified: team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in (original)
+++ team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in Tue May 27 15:40:14 2008
@@ -176,50 +176,8 @@
/* Define if your system has the DAHDI headers. */
#undef HAVE_DAHDI
-/* Define if your system has the DAHDI_CHANALARMS headers. */
-#undef HAVE_DAHDI_CHANALARMS
-
-/* Define DAHDI_CHANALARMS headers version */
-#undef HAVE_DAHDI_CHANALARMS_VERSION
-
-/* Define if your system has the DAHDI_ECHOCANPARAMS headers. */
-#undef HAVE_DAHDI_ECHOCANPARAMS
-
-/* Define DAHDI_ECHOCANPARAMS headers version */
-#undef HAVE_DAHDI_ECHOCANPARAMS_VERSION
-
-/* Define if your system has the DAHDI_HWGAIN headers. */
-#undef HAVE_DAHDI_HWGAIN
-
-/* Define DAHDI_HWGAIN headers version */
-#undef HAVE_DAHDI_HWGAIN_VERSION
-
-/* Define if your system has the DAHDI_NEONMWI headers. */
-#undef HAVE_DAHDI_NEONMWI
-
-/* Define DAHDI_NEONMWI headers version */
-#undef HAVE_DAHDI_NEONMWI_VERSION
-
-/* Define if your system has the DAHDI_SIG_MTP2 headers. */
-#undef HAVE_DAHDI_SIG_MTP2
-
-/* Define DAHDI_SIG_MTP2 headers version */
-#undef HAVE_DAHDI_SIG_MTP2_VERSION
-
-/* Define if your system has the DAHDI_TRANSCODE headers. */
-#undef HAVE_DAHDI_TRANSCODE
-
-/* Define DAHDI_TRANSCODE headers version */
-#undef HAVE_DAHDI_TRANSCODE_VERSION
-
/* Define DAHDI headers version */
#undef HAVE_DAHDI_VERSION
-
-/* Define if your system has the DAHDI_VLDTMF headers. */
-#undef HAVE_DAHDI_VLDTMF
-
-/* Define DAHDI_VLDTMF headers version */
-#undef HAVE_DAHDI_VLDTMF_VERSION
/* Define to 1 if your system has /dev/urandom. */
#undef HAVE_DEV_URANDOM
Modified: team/jpeeler/chan_dahdi/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/makeopts.in?view=diff&rev=118608&r1=118607&r2=118608
==============================================================================
--- team/jpeeler/chan_dahdi/makeopts.in (original)
+++ team/jpeeler/chan_dahdi/makeopts.in Tue May 27 15:40:14 2008
@@ -202,7 +202,7 @@
VPBAPI_INCLUDE=@VPB_INCLUDE@
VPBAPI_LIB=@VPB_LIB@
-ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
+DAHDI_INCLUDE=@DAHDI_INCLUDE@
ZLIB_INCLUDE=@ZLIB_INCLUDE@
ZLIB_LIB=@ZLIB_LIB@
More information about the asterisk-commits
mailing list