kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 125132 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines

allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places

don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it

get app_rpt building again after the DAHDI changes

(closes issue #12911)
Reported by: tzafrir


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-06-25 23:05:28 +00:00
parent 14e78bbc6d
commit fd4a60c459
16 changed files with 25 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 122234 .
# From configure.ac Revision: 123988 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -45875,7 +45875,10 @@ if test "${host_os}" != "linux-gnu" ; then
tonezone_extra="-lm"
fi
# new tonezone, version 1.4.0
if test "x${DAHDI_DIR}" != "x"; then
tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
fi
if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then
pbxlibdir=""