kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 290289 via svnmerge from

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

........
  r290289 | tilghman | 2010-10-05 09:15:46 -0500 (Tue, 05 Oct 2010) | 2 lines
  
  Restore run directory for OS X, as well as standardizing some other paths to Mac OS X.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-10-05 14:17:37 +00:00
parent bddb242d72
commit d275217c58
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 290103 . # From configure.ac Revision: 290218 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk trunk. # Generated by GNU Autoconf 2.61 for asterisk trunk.
# #
@@ -618,6 +618,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_default_prefix=/usr/local
ac_default_prefix=/usr/local ac_default_prefix=/usr/local
ac_default_prefix=/usr/local ac_default_prefix=/usr/local
ac_default_prefix=/usr ac_default_prefix=/usr
@@ -4321,6 +4322,13 @@ case "${host_os}" in
;; ;;
darwin*) darwin*)
if test ${prefix} = 'NONE'; then
astlibdir=/Library/Application Support/Asterisk/Modules
astvarlibdir=/Library/Application Support/Asterisk
astlogdir=/Library/Logs/Asterisk
astvarrundir=/Library/Application Support/Asterisk/Run
fi
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define AST_POLL_COMPAT 1 #define AST_POLL_COMPAT 1
_ACEOF _ACEOF

7
configure.ac
View File

@@ -87,6 +87,13 @@ case "${host_os}" in
LDFLAGS=-L/usr/local/lib LDFLAGS=-L/usr/local/lib
;; ;;
darwin*) darwin*)
AC_PREFIX_DEFAULT([/usr/local])
if test ${prefix} = 'NONE'; then
astlibdir=/Library/Application Support/Asterisk/Modules
astvarlibdir=/Library/Application Support/Asterisk
astlogdir=/Library/Logs/Asterisk
astvarrundir=/Library/Application Support/Asterisk/Run
fi
AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]) AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.])
AC_DEFINE([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.]) AC_DEFINE([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.])
;; ;;