diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 14:15:46 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 14:15:46 +0000 |
| commit | bd17e241eeb7dacbfb055c384afa326f591add71 (patch) | |
| tree | 366a8c741debd659e85da44133879535333ccb75 | |
| parent | 913c7bcb4f078808d88d58cdff46caa891271615 (diff) | |
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/branches/1.8@290289 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 290102 . +# From configure.ac Revision: 290209 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk trunk. # @@ -620,6 +620,7 @@ ac_includes_default="\ ac_default_prefix=/usr/local ac_default_prefix=/usr/local +ac_default_prefix=/usr/local ac_default_prefix=/usr ac_header_list= ac_subst_vars='SHELL @@ -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 diff --git a/configure.ac b/configure.ac index 6365b1557..bacef335b 100644 --- a/configure.ac +++ b/configure.ac @@ -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.]) ;; |