r2150 - in branches/1.1: . bin/varnishd lib/libvarnishapi

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 14:01:19 +0200 (Fri, 19 Oct 2007)
New Revision: 2150

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/Makefile.am
   branches/1.1/configure.ac
   branches/1.1/lib/libvarnishapi/Makefile.am
Log:
Merged revisions 2116 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2116 | des | 2007-10-18 17:18:42 +0200 (Thu, 18 Oct 2007) | 2 lines
  
  Make VARNISH_STATE_DIR work correctly when using the default prefix.
........



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,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

Modified: branches/1.1/bin/varnishd/Makefile.am
===================================================================
--- branches/1.1/bin/varnishd/Makefile.am	2007-10-19 11:46:03 UTC (rev 2149)
+++ branches/1.1/bin/varnishd/Makefile.am	2007-10-19 12:01:19 UTC (rev 2150)
@@ -60,7 +60,8 @@
 	steps.h \
 	stevedore.h
 
-varnishd_CFLAGS = -include config.h
+varnishd_CFLAGS = -include config.h \
+        -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
 varnishd_LDFLAGS = -export-dynamic
 

Modified: branches/1.1/configure.ac
===================================================================
--- branches/1.1/configure.ac	2007-10-19 11:46:03 UTC (rev 2149)
+++ branches/1.1/configure.ac	2007-10-19 12:01:19 UTC (rev 2150)
@@ -115,9 +115,8 @@
 AC_CHECK_FUNCS([poll])
 
 # Run-time directory
-VARNISH_STATE_DIR=`eval "echo $localstatedir/varnish"`
-AC_DEFINE_UNQUOTED(VARNISH_STATE_DIR, "$VARNISH_STATE_DIR",
-  [Base directory for run-time state])
+VARNISH_STATE_DIR="${localstatedir}/varnish"
+AC_SUBST(VARNISH_STATE_DIR)
 
 # Now that we're done using the compiler to look for functions and
 # libraries, set CFLAGS to what we want them to be for our own code

Modified: branches/1.1/lib/libvarnishapi/Makefile.am
===================================================================
--- branches/1.1/lib/libvarnishapi/Makefile.am	2007-10-19 11:46:03 UTC (rev 2149)
+++ branches/1.1/lib/libvarnishapi/Makefile.am	2007-10-19 12:01:19 UTC (rev 2150)
@@ -9,4 +9,5 @@
 	instance.c \
 	shmlog.c
 
-libvarnishapi_la_CFLAGS = -include config.h
+libvarnishapi_la_CFLAGS = -include config.h \
+	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'