Merged revisions 290289 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@290291 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
39e66d0089
commit
a9098a73de
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 290103 .
|
||||
# From configure.ac Revision: 290218 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk trunk.
|
||||
#
|
||||
|
@ -618,6 +618,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_default_prefix=/usr/local
|
||||
ac_default_prefix=/usr/local
|
||||
ac_default_prefix=/usr/local
|
||||
ac_default_prefix=/usr
|
||||
|
@ -4321,6 +4322,13 @@ case "${host_os}" in
|
|||
;;
|
||||
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
|
||||
#define AST_POLL_COMPAT 1
|
||||
_ACEOF
|
||||
|
|
|
@ -87,6 +87,13 @@ case "${host_os}" in
|
|||
LDFLAGS=-L/usr/local/lib
|
||||
;;
|
||||
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([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.])
|
||||
;;
|
||||
|
|
Reference in New Issue