[asterisk-commits] qwell: trunk r304467 - in /trunk: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jan 27 11:03:44 2011
New Revision: 304467

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

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

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

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=304467&r1=304466&r2=304467
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jan 27 11:03:44 2011
@@ -73,12 +73,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
@@ -91,7 +91,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'
@@ -115,7 +115,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