[svn-commits] tilghman: trunk r271657 - in /trunk: ./ build_tools/ res/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jun 21 17:41:00 2010
New Revision: 271657

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=271657
Log:
Conflict kqueue on OS X, since it doesn't work there yet, anyway.

Modified:
    trunk/build_tools/menuselect-deps.in
    trunk/configure
    trunk/configure.ac
    trunk/res/res_timing_kqueue.c

Modified: trunk/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=271657&r1=271656&r2=271657
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Mon Jun 21 17:41:00 2010
@@ -45,6 +45,7 @@
 RESAMPLE=@PBX_RESAMPLE@
 AIS=@PBX_AIS@
 RADIUS=@PBX_RADIUS@
+LAUNCHD=@PBX_LAUNCHD@
 SPANDSP=@PBX_SPANDSP@
 SPEEX=@PBX_SPEEX@
 SPEEXDSP=@PBX_SPEEXDSP@

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=271657&r1=271656&r2=271657
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jun 21 17:41:00 2010
@@ -1898,10 +1898,13 @@
 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.]))
-fi
+  PBX_LAUNCHD=1
+fi
+AC_SUBST(PBX_LAUNCHD)
 
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)

Modified: trunk/res/res_timing_kqueue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_timing_kqueue.c?view=diff&rev=271657&r1=271656&r2=271657
==============================================================================
--- trunk/res/res_timing_kqueue.c (original)
+++ trunk/res/res_timing_kqueue.c Mon Jun 21 17:41:00 2010
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>kqueue</depend>
+	<conflict>launchd</conflict>
  ***/
 
 #include "asterisk.h"