From: Jason Parker <jparker@digium.com>
Date: Wed, 11 Mar 2009 22:23:48 +0000 (+0000)
Subject: Merged revisions 181444 via svnmerge from
X-Git-Tag: 1.6.1.0-rc3~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1299dc1bdfae241ece53e85e0ea4dedc4d80fd6;p=thirdparty%2Fasterisk.git

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 c8df5cc458..8f0b299f9a 100755
--- 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 89d7cbfddd..6c07fa4bb9 100644
--- 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}