r2156 - branches/1.1

[des at projects.linpro.no]

Author: des
Date: 2007-10-22 16:38:03 +0200 (Mon, 22 Oct 2007)
New Revision: 2156

Modified:
   branches/1.1/
   branches/1.1/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.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-10-22 14:37:46 UTC (rev 2155)
+++ branches/1.1/configure.ac	2007-10-22 14:38:03 UTC (rev 2156)
@@ -115,7 +115,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