[asterisk-commits] qwell: branch 1.6.2 r304465 - in /branches/1.6.2: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jan 27 11:01:24 2011
New Revision: 304465

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304465
Log:
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.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac

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

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=304465&r1=304464&r2=304465
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Thu Jan 27 11:01:24 2011
@@ -41,7 +41,7 @@
 
 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
      ;;
@@ -63,7 +63,7 @@
      AC_DEFINE([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.])
      ;;
      *)
-     AC_PREFIX_DEFAULT([/usr])
+     ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc