kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 102323 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102323 | tilghman | 2008-02-04 15:06:09 -0600 (Mon, 04 Feb 2008) | 7 lines

Cross-platform fix:  OS X now deprecates the use of the daemon(3) API.
(closes issue #11908)
 Reported by: oej
 Patches: 
       20080204__bug11908.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-02-04 21:15:18 +00:00
parent 668cecbafc
commit 1dc86caf30
5 changed files with 9188 additions and 2554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11722
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.ac
View File

@@ -1128,6 +1128,8 @@ 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.]))
PBX_GTK=0
AST_EXT_TOOL_CHECK([GTK], [gtk], [--cflags gthread], [--libs gthread])

6
include/asterisk/autoconfig.h.in
View File

@@ -679,6 +679,9 @@
/* Define RTLD_NOLOAD headers version */
#undef HAVE_RTLD_NOLOAD_VERSION
/* Define to 1 if your system has /sbin/launchd. */
#undef HAVE_SBIN_LAUNCHD
/* Define if your system has the SDL libraries. */
#undef HAVE_SDL
@@ -1172,9 +1175,6 @@
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES

4
main/asterisk.c
View File

@@ -3070,6 +3070,7 @@ int main(int argc, char *argv[])
#if HAVE_WORKING_FORK
if (ast_opt_always_fork || !ast_opt_no_fork) {
#ifndef HAVE_SBIN_LAUNCHD
daemon(1, 0);
ast_mainpid = getpid();
/* Blindly re-write pid file since we are forking */
@@ -3080,6 +3081,9 @@ int main(int argc, char *argv[])
fclose(f);
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
#else
ast_log(LOG_WARNING, "Mac OS X detected. Use '/sbin/launchd -d' to launch with the nofork option.\n");
#endif
}
#endif

8
utils/muted.c
View File

@@ -680,8 +680,14 @@ int main(int argc, char *argv[])
fclose(astf);
exit(1);
}
if (needfork)
if (needfork) {
#ifndef HAVE_SBIN_LAUNCHD
daemon(0,0);
#else
fprintf(stderr, "Mac OS X detected. Use 'launchd -d muted -f' to launch.\n");
exit(1);
#endif
}
for(;;) {
if (wait_event()) {
fclose(astf);