[asterisk-commits] qwell: branch 1.4 r304464 - in /branches/1.4: configure configure.ac

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jan 27 10:57:46 2011
New Revision: 304464

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304464
Log:
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.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configure.ac?view=diff&rev=304464&r1=304463&r2=304464
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Jan 27 10:57:46 2011
@@ -23,17 +23,17 @@
 
 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
      ;;
      darwin*)
-     AC_PREFIX_DEFAULT([/usr/local])
+     ac_default_prefix=/usr/local
      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.])
      ;;
      *)
-     AC_PREFIX_DEFAULT([/usr])
+     ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            sysconfdir=/etc