Conflict kqueue on OS X, since it doesn't work there yet, anyway.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
d4bbf88e96
commit
e3873889b8
|
@ -45,6 +45,7 @@ OPENR2=@PBX_OPENR2@
|
|||
RESAMPLE=@PBX_RESAMPLE@
|
||||
AIS=@PBX_AIS@
|
||||
RADIUS=@PBX_RADIUS@
|
||||
LAUNCHD=@PBX_LAUNCHD@
|
||||
SPANDSP=@PBX_SPANDSP@
|
||||
SPEEX=@PBX_SPEEX@
|
||||
SPEEXDSP=@PBX_SPEEXDSP@
|
||||
|
|
|
@ -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],, [-I/usr/X11R6/include], [X11R6])
|
||||
|
||||
PBX_LAUNCHD=0
|
||||
if test "${cross_compiling}" = "no";
|
||||
then
|
||||
AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.]))
|
||||
PBX_LAUNCHD=1
|
||||
fi
|
||||
AC_SUBST(PBX_LAUNCHD)
|
||||
|
||||
PBX_GTK2=0
|
||||
AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
/*** MODULEINFO
|
||||
<depend>kqueue</depend>
|
||||
<conflict>launchd</conflict>
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
|
Loading…
Reference in New Issue