sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Joshua Colp 2008-02-19 17:33:55 +00:00
parent 66d01d0009
commit c3a1ec6d98
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -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

5
configure.ac
View File

@ -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])