diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-25 23:20:35 +0000 |
commit | a9d05ec703ba688539f4978bc47dea878220defe (patch) | |
tree | 32eaaa9ed24c66cfb82e690bc0af19d72068f2b4 /configure.ac | |
parent | e9d29f7eafbbbd5cbc4ab207be70ff3f96bfaf36 (diff) |
Merged revisions 125138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@125146 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f417ace05..514b07ada 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,7 +1419,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 + AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}]) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) |