r2155 - branches/1.2

[des at projects.linpro.no]

Author: des
Date: 2007-10-22 16:37:46 +0200 (Mon, 22 Oct 2007)
New Revision: 2155

Modified:
   branches/1.2/
   branches/1.2/configure.ac
Log:
Merged revisions 2154 via svnmerge from 
file:///var/lib/svn/varnish/trunk/varnish-cache

........
  r2154 | des | 2007-10-22 16:37:19 +0200 (Mon, 22 Oct 2007) | 2 lines
  
  Evaluate ${localstatedir} later.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2154

Modified: branches/1.2/configure.ac
===================================================================
--- branches/1.2/configure.ac	2007-10-22 14:37:19 UTC (rev 2154)
+++ branches/1.2/configure.ac	2007-10-22 14:37:46 UTC (rev 2155)
@@ -116,7 +116,7 @@
 AC_CHECK_FUNCS([poll])
 
 # Run-time directory
-VARNISH_STATE_DIR="${localstatedir}/varnish"
+VARNISH_STATE_DIR='${localstatedir}/varnish'
 AC_SUBST(VARNISH_STATE_DIR)
 
 # Now that we're done using the compiler to look for functions and