aboutsummaryrefslogtreecommitdiffstats
path: root/makeopts.in
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 19:37:32 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 19:37:32 +0000
commit0478a270edbafd279431f1c77f3bc2b6c8994006 (patch)
tree776ed3fe91e9a1fa35269d40568d1528bda8e481 /makeopts.in
parentf93ebdba02a7563314d5417a63a7e2de516663c1 (diff)
Merge the changes from the res_timing_timerfd branch.
This provides a new timing interface. In order to use it, you must be running a Linux with a kernel version of 2.6.25 or newer and glibc 2.8 or newer. This timing interface is a good alternative if a timing source is necessary (e.g. for IAX trunking) but DAHDI is otherwise unnecessary for the system. For now, this commit contains the actual work done in the res_timing_timerfd branch. There are no notices in the README or CHANGES files yet, but they will be added in my next commit. The timing API of Asterisk also needs to have a bit of work done with regards to choosing which timing interface to use. This commit makes the choice a build-time decision, by only allowing one of the timer interfaces to be chosen in menuselect. It would be preferable if the choice could be made at run-time, however. The preferred timing interface could be loaded and tested, and if it does not work, choice number two may be used instead. That sort of thing. That is beyond the scope of work in this branch though. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@157820 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
-rw-r--r--makeopts.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in
index a264940e4..0c0ee3327 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -252,3 +252,4 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
+TIMERFD_INCLUDE=@TIMERFD_INCLUDE@