[asterisk-commits] qwell: branch 1.8 r304466 - in /branches/1.8: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jan 27 11:03:01 2011
New Revision: 304466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304466
Log:
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
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/configure
    branches/1.8/configure.ac

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configure.ac?view=diff&rev=304466&r1=304465&r2=304466
==============================================================================
--- branches/1.8/configure.ac (original)
+++ branches/1.8/configure.ac Thu Jan 27 11:03:01 2011
@@ -69,12 +69,12 @@
 
 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
@@ -87,7 +87,7 @@
      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'
@@ -111,7 +111,7 @@
      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