[svn-commits] file: trunk r103813 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: file
Date: Tue Feb 19 11:33:55 2008
New Revision: 103813

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103813
Log:
Merged revisions 103812 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103812 | file | 2008-02-19 13:31:32 -0400 (Tue, 19 Feb 2008) | 4 lines

Don't look for launchd when cross compiling.
(closes issue #12029)
Reported by: ovi

........

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

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

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=103813&r1=103812&r2=103813
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Feb 19 11:33:55 2008
@@ -1485,7 +1485,10 @@
 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])
 
-AC_CHECK_FILE(/sbin/launchd, AC_DEFINE([HAVE_SBIN_LAUNCHD], 1, [Define to 1 if your system has /sbin/launchd.]))
+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_GTK=0
 AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])