[svn-commits] jpeeler: branch jpeeler/chan_dahdi r118463 - in /team/jpeeler/chan_dahdi: ./ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue May 27 12:47:35 CDT 2008
Author: jpeeler
Date: Tue May 27 12:47:35 2008
New Revision: 118463
URL: http://svn.digium.com/view/asterisk?view=rev&rev=118463
Log:
update configure script to check for DAHDI instead of Zaptel
Modified:
team/jpeeler/chan_dahdi/configure
team/jpeeler/chan_dahdi/configure.ac
team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in
Modified: team/jpeeler/chan_dahdi/configure.ac
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/configure.ac?view=diff&rev=118463&r1=118462&r2=118463
==============================================================================
--- team/jpeeler/chan_dahdi/configure.ac (original)
+++ team/jpeeler/chan_dahdi/configure.ac Tue May 27 12:47:35 2008
@@ -207,6 +207,7 @@
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])
@@ -254,7 +255,6 @@
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
@@ -1405,9 +1405,7 @@
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}], [], [140])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
@@ -1459,46 +1457,35 @@
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,
+# 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 zaptel.h header.
-
-AST_C_DEFINE_CHECK([ZAPTEL], [DAHDI_TONE_DTMF_BASE], [zaptel/zaptel.h], [140])
-AST_C_DEFINE_CHECK([ZAPTEL], [DAHDI_DIAL_OP_CANCEL], [zaptel/zaptel.h], [90])
+# 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([ZAPTEL_VLDTMF], [DAHDI_EVENT_REMOVED], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([DAHDI_VLDTMF], [DAHDI_EVENT_REMOVED], [dahdi/kernel.h])
# Check for echo canceler parameters support
-AST_C_DEFINE_CHECK([ZAPTEL_ECHOCANPARAMS], [DAHDI_ECHOCANCEL_PARAMS], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([DAHDI_ECHOCANPARAMS], [DAHDI_ECHOCANCEL_PARAMS], [dahdi/kernel.h])
# Check for transcoder support
-AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [DAHDI_TCOP_ALLOCATE], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([DAHDI_TRANSCODE], [DAHDI_TCOP_ALLOCATE], [dahdi/kernel.h])
# Check for hwgain support
-AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [DAHDI_SET_HWGAIN], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([DAHDI_HWGAIN], [DAHDI_SET_HWGAIN], [dahdi/kernel.h])
# Check for neon mwi support
-AST_C_DEFINE_CHECK([ZAPTEL_NEONMWI], [DAHDI_EVENT_NEONMWI_ACTIVE], [zaptel/zaptel.h])
+AST_C_DEFINE_CHECK([DAHDI_NEONMWI], [DAHDI_EVENT_NEONMWI_ACTIVE], [dahdi/kernel.h])
# Check for channel alarm support
-AST_C_COMPILE_CHECK([ZAPTEL_CHANALARMS], [size_t foo = sizeof(struct zt_params_v1)], [zaptel/zaptel.h])
+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([ZAPTEL_SIG_MTP2], [DAHDI_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
+AST_C_DEFINE_CHECK([DAHDI_SIG_MTP2], [DAHDI_SIG_MTP2], [dahdi/kernel.h])
EDITLINE_LIB=""
if test "x$TERMCAP_LIB" != "x" ; then
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=118463&r1=118462&r2=118463
==============================================================================
--- team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in (original)
+++ team/jpeeler/chan_dahdi/include/asterisk/autoconfig.h.in Tue May 27 12:47:35 2008
@@ -173,6 +173,54 @@
/* Define to indicate the ${CURSES_DESCRIP} library version */
#undef HAVE_CURSES_VERSION
+/* 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
@@ -1034,54 +1082,6 @@
/* Define to indicate the ${X11_DESCRIP} library version */
#undef HAVE_X11_VERSION
-
-/* Define this to indicate the ${DAHDI_DESCRIP} library */
-#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 to indicate the ${DAHDI_DESCRIP} library version */
-#undef HAVE_DAHDI_VERSION
-
-/* Define this to indicate the ${DAHDI_VLDTMF_DESCRIP} library */
-#undef HAVE_DAHDI_VLDTMF
-
-/* Define to indicate the ${DAHDI_VLDTMF_DESCRIP} library version */
-#undef HAVE_DAHDI_VLDTMF_VERSION
/* Define this to indicate the ${ZLIB_DESCRIP} library */
#undef HAVE_ZLIB
More information about the svn-commits
mailing list