diff options
author | Joshua Colp <jcolp@digium.com> | 2008-02-19 17:33:55 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2008-02-19 17:33:55 +0000 |
commit | c3a1ec6d98511911485683c69cf743dffce7f24a (patch) | |
tree | 13ecfea77c33e1305983d2c0df47494516a30286 | |
parent | 66d01d0009ee5b4cf4ab39a1b7b694c027184040 (diff) |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | configure | 7 | ||||
-rw-r--r-- | configure.ac | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 103715 . +# From configure.ac Revision: 103725 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -49274,7 +49274,9 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for /sbin/launchd" >&5 +if test "${cross_compiling}" = "no"; +then + { echo "$as_me:$LINENO: checking for /sbin/launchd" >&5 echo $ECHO_N "checking for /sbin/launchd... $ECHO_C" >&6; } if test "${ac_cv_file__sbin_launchd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -49299,6 +49301,7 @@ _ACEOF fi +fi PBX_GTK=0 diff --git a/configure.ac b/configure.ac index 950886aee..883198f1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1485,7 +1485,10 @@ 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]) -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]) |