Merged revisions 304466 via svnmerge from

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

................
  r304466 | qwell | 2011-01-27 11:03:01 -0600 (Thu, 27 Jan 2011) | 23 lines
  
  Merged revisions 304465 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r304465 | qwell | 2011-01-27 11:01:24 -0600 (Thu, 27 Jan 2011) | 16 lines
    
    Merged revisions 304464 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r304464 | qwell | 2011-01-27 10:57:46 -0600 (Thu, 27 Jan 2011) | 9 lines
      
      Fix default prefix=/usr regression on non-Linux systems.
      
      This partially reverts a change made in branches/1.4/ r267759, which will
      cause issue #17013 to be reopened.  This issue was pointed out by a user
      on #asterisk, who helpfully discovered that paths were being set incorrectly.
      
      To truly understand what was wrong, one should run:
          svn diff --force -c<this revision> configure
    ........
  ................
................


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

2 files changed, 8 insertions, 12 deletions

diff --git a/configure b/configure
index 9f010d7f3..24f0ef737 100755
--- a/configure
+++ b/configure
@@ -597,10 +597,6 @@ 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
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
 PBX_SYSLOG
@@ -4520,12 +4516,12 @@ esac
 
 case "${host_os}" in
      freebsd*)
-
+     ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
      openbsd*)
-
+     ac_default_prefix=/usr/local
      if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            astetcdir=/etc/asterisk
@@ -4538,7 +4534,7 @@ case "${host_os}" in
      LDFLAGS=-L/usr/local/lib
      ;;
      darwin*)
-
+     ac_default_prefix=/usr/local
      if test ${prefix} = 'NONE'; then
         astlibdir='/Library/Application Support/Asterisk/Modules'
         astvarlibdir='/Library/Application Support/Asterisk'
@@ -4566,7 +4562,7 @@ $as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
      fi
      ;;
      *)
-
+     ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc
diff --git a/configure.ac b/configure.ac
index a10465965..3c8710f17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,12 +73,12 @@ esac
 
 case "${host_os}" in
      freebsd*)
-     AC_PREFIX_DEFAULT([/usr/local])
+     ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
      openbsd*)
-     AC_PREFIX_DEFAULT([/usr/local])
+     ac_default_prefix=/usr/local
      if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            astetcdir=/etc/asterisk
@@ -91,7 +91,7 @@ case "${host_os}" in
      LDFLAGS=-L/usr/local/lib
      ;;
      darwin*)
-     AC_PREFIX_DEFAULT([/usr/local])
+     ac_default_prefix=/usr/local
      if test ${prefix} = 'NONE'; then
         astlibdir='/Library/Application Support/Asterisk/Modules'
         astvarlibdir='/Library/Application Support/Asterisk'
@@ -115,7 +115,7 @@ case "${host_os}" in
      fi
      ;;
      *)
-     AC_PREFIX_DEFAULT([/usr])
+     ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc