[asterisk-commits] qwell: trunk r181444 - in /trunk: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Mar 11 17:20:13 2009
New Revision: 181444

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181444
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/trunk/configure.ac?view=diff&rev=181444&r1=181443&r2=181444
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Mar 11 17:20:13 2009
@@ -57,8 +57,10 @@
      ;;
 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}