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

Conflict kqueue on OS X, since it doesn't work there yet, anyway.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-06-21 22:41:00 +00:00
parent d4bbf88e96
commit e3873889b8
4 changed files with 30987 additions and 7518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_tools/menuselect-deps.in
View File

@@ -45,6 +45,7 @@ OPENR2=@PBX_OPENR2@
RESAMPLE=@PBX_RESAMPLE@ RESAMPLE=@PBX_RESAMPLE@
AIS=@PBX_AIS@ AIS=@PBX_AIS@
RADIUS=@PBX_RADIUS@ RADIUS=@PBX_RADIUS@
LAUNCHD=@PBX_LAUNCHD@
SPANDSP=@PBX_SPANDSP@ SPANDSP=@PBX_SPANDSP@
SPEEX=@PBX_SPEEX@ SPEEX=@PBX_SPEEX@
SPEEXDSP=@PBX_SPEEXDSP@ SPEEXDSP=@PBX_SPEEXDSP@

37342
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
configure.ac
View File

@@ -1898,10 +1898,13 @@ AC_CHECK_HEADER([linux/videodev.h],
AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path]) AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],,, [standard_path])
AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6]) AST_EXT_LIB_CHECK([X11], [X11], [XOpenDisplay], [X11/Xlib.h],, [-I/usr/X11R6/include], [X11R6])
PBX_LAUNCHD=0
if test "${cross_compiling}" = "no"; if test "${cross_compiling}" = "no";
then then
AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.])) AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.]))
PBX_LAUNCHD=1
fi fi
AC_SUBST(PBX_LAUNCHD)
PBX_GTK2=0 PBX_GTK2=0
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No) AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)

1
res/res_timing_kqueue.c
View File

@@ -25,6 +25,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>kqueue</depend> <depend>kqueue</depend>
<conflict>launchd</conflict>
***/ ***/
#include "asterisk.h" #include "asterisk.h"