Restore run directory for OS X, as well as standardizing some other paths to Mac...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@290289 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 85a9a5565a23c64ebe1ce13370da6a248bf70350..42dd59f0655a92bf328c1c0d5181f4aba61b6b7c 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.
 #
@@ -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

diff --git a/configure.ac b/configure.ac
index 6365b1557d382baeb16cd9d067e391d59ed91ab4..bacef335bdcade118f19264ebcd99ed64ee0b9ef 100644 (file)
--- 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.])
      ;;