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/branches/1.4@304464 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 79ff65fea03394dd86f32d0a6141766734265186..914e7bcafa0b6b1e41669f018c6d0a272b174835 100755 (executable)
--- a/configure
+++ b/configure
@@ -597,9 +597,6 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
 GTK2_LIB
@@ -4394,12 +4391,12 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 case "${host_os}" in
      freebsd*)
-
+     ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
      darwin*)
-
+     ac_default_prefix=/usr/local
 
 $as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h
 
@@ -4408,7 +4405,7 @@ $as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
 
      ;;
      *)
-
+     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 fac7a880b5ee48b1e9f4296fa486e7034fcb14a1..9df5a46393ec401028e5c2611cc853cf1293f755 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,17 +23,17 @@ AC_USE_SYSTEM_EXTENSIONS    # note- does not work on FreeBSD
 
 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