diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-26 21:17:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-26 21:17:02 +0000 |
| commit | ecf3c1a322b407e24ebb2aadd74c25aaad3bf36a (patch) | |
| tree | de7100056298a19111c63df9193b4158e00e3b35 | |
| parent | 5504173bf8e95ebdfbe86774b76abf7946dbbaa6 (diff) | |
Merged revisions 299752 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r299752 | tilghman | 2010-12-26 15:15:58 -0600 (Sun, 26 Dec 2010) | 2 lines
Properly quote path on Darwin.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 298819 . +# From configure.ac Revision: 298961 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for asterisk trunk. # @@ -4721,10 +4721,10 @@ case "${host_os}" in darwin*) if test ${prefix} = 'NONE'; then - astlibdir=/Library/Application Support/Asterisk/Modules - astvarlibdir=/Library/Application Support/Asterisk + astlibdir='/Library/Application Support/Asterisk/Modules' + astvarlibdir='/Library/Application Support/Asterisk' astlogdir=/Library/Logs/Asterisk - astvarrundir=/Library/Application Support/Asterisk/Run + astvarrundir='/Library/Application Support/Asterisk/Run' fi $as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h diff --git a/configure.ac b/configure.ac index 593b5c747..447580f4d 100644 --- a/configure.ac +++ b/configure.ac @@ -89,10 +89,10 @@ case "${host_os}" in darwin*) AC_PREFIX_DEFAULT([/usr/local]) if test ${prefix} = 'NONE'; then - astlibdir=/Library/Application Support/Asterisk/Modules - astvarlibdir=/Library/Application Support/Asterisk + astlibdir='/Library/Application Support/Asterisk/Modules' + astvarlibdir='/Library/Application Support/Asterisk' astlogdir=/Library/Logs/Asterisk - astvarrundir=/Library/Application Support/Asterisk/Run + 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.]) |