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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@304466 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 5bb09ef6f4640229c3649359e9c8bafc49cda60b..459bdf365fdde5149e46e69e474b62a0723b2eaa 100755 (executable)
--- a/configure
+++ b/configure
@@ -597,10 +597,6 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr/local
-ac_default_prefix=/usr
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
 PBX_SYSLOG
@@ -4709,12 +4705,12 @@ esac
 
 case "${host_os}" in
      freebsd*)
-
+     ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
      openbsd*)
-
+     ac_default_prefix=/usr/local
      if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
         if test ${sysconfdir} = '${prefix}/etc'; then
            astetcdir=/etc/asterisk
@@ -4727,7 +4723,7 @@ case "${host_os}" in
      LDFLAGS=-L/usr/local/lib
      ;;
      darwin*)
-
+     ac_default_prefix=/usr/local
      if test ${prefix} = 'NONE'; then
         astlibdir='/Library/Application Support/Asterisk/Modules'
         astvarlibdir='/Library/Application Support/Asterisk'
@@ -4755,7 +4751,7 @@ $as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
      fi
      ;;
      *)
-
+     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 a17c7b7873a28ed8ce38ed24689d059b8e137c7f..889586acb5edd7435ee89968327a31e44099f383 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,12 +69,12 @@ esac
 
 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 @@ case "${host_os}" in
      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 @@ case "${host_os}" in
      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