[svn-commits] mjordan: trunk r381869 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Feb 21 19:52:14 2013
New Revision: 381869

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381869
Log:
Properly detect launchd

Asterisk was a little too pro-active in claiming that it found launchd. On
systems without launchd - such as FreeBSD - this resulted in certain items
in Asterisk that conflict with launchd to not be selectable, such as
res_timing_kqueue.

(closes issue ASTERISK-20749)
Reported by: Oleg Baranov
........

Merged revisions 381847 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 381848 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=381869&r1=381868&r2=381869
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Feb 21 19:52:14 2013
@@ -2296,7 +2296,9 @@
 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
+  if test "${HAVE_SBIN_LAUNCHD}" = 1; then
+    PBX_LAUNCHD=1
+  fi
 fi
 AC_SUBST(PBX_LAUNCHD)