Merged revisions 181444 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r181444 | qwell | 2009-03-11 17:20:13 -0500 (Wed, 11 Mar 2009) | 11 lines

  Merged revisions 181436 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r181436 | qwell | 2009-03-11 17:18:42 -0500 (Wed, 11 Mar 2009) | 4 lines

    Allow prefix to set localstatedir (when used and different from the default).

    This is similar to the /etc change that was made for the non-FreeBSD case.
  ........
................

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

diff --git a/configure b/configure
index c8df5cc4588c5ef8fe3ed9e8c805c3f3682f1d4a..8f0b299f9addf348a29dea317748971a9a6e60e2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 177164 .
+# From configure.ac Revision: 180947 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -4073,8 +4073,10 @@ case "${host_os}" in
      ;;
 esac
 
-if test ${localstatedir} = '${prefix}/var'; then
-     localstatedir=/var
+if test ${prefix} = ${ac_default_prefix} || test ${prefix} = 'NONE'; then
+     if test ${localstatedir} = '${prefix}/var'; then
+        localstatedir=/var
+     fi
 fi
 
 BUILD_PLATFORM=${build}

diff --git a/configure.ac b/configure.ac
index 89d7cbfddd9f94c82b45bfb9a4fd6f0108e28de9..6c07fa4bb973dccaab1807fc8749077b48c8a451 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,10 @@ case "${host_os}" in
      ;;
 esac
 
-if test ${localstatedir} = '${prefix}/var'; then
-     localstatedir=/var
+if test ${prefix} = ${ac_default_prefix} || test ${prefix} = 'NONE'; then
+     if test ${localstatedir} = '${prefix}/var'; then
+        localstatedir=/var
+     fi
 fi
 
 BUILD_PLATFORM=${build}