diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-25 23:05:28 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-25 23:05:28 +0000 |
| commit | fd4a60c4599189c2022f31bab18d03df39d3ea3e (patch) | |
| tree | 4b50cc41540b7c5350a214a536d63dd9f03dd95e /configure | |
| parent | 14e78bbc6df085815869c8fc1555cfd33ad7540e (diff) | |
Merged revisions 125132 via svnmerge from
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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="" |