r2117 - in branches/1.2: . bin/varnishd lib/libvarnishapi

[des at projects.linpro.no]

Author: des
Date: 2007-10-18 17:40:31 +0200 (Thu, 18 Oct 2007)
New Revision: 2117

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/Makefile.am
   branches/1.2/configure.ac
   branches/1.2/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.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107
   + /trunk/varnish-cache:1-2101,2104-2107,2116

Modified: branches/1.2/bin/varnishd/Makefile.am
===================================================================
--- branches/1.2/bin/varnishd/Makefile.am	2007-10-18 15:18:42 UTC (rev 2116)
+++ branches/1.2/bin/varnishd/Makefile.am	2007-10-18 15:40:31 UTC (rev 2117)
@@ -64,7 +64,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.2/configure.ac
===================================================================
--- branches/1.2/configure.ac	2007-10-18 15:18:42 UTC (rev 2116)
+++ branches/1.2/configure.ac	2007-10-18 15:40:31 UTC (rev 2117)
@@ -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.2/lib/libvarnishapi/Makefile.am
===================================================================
--- branches/1.2/lib/libvarnishapi/Makefile.am	2007-10-18 15:18:42 UTC (rev 2116)
+++ branches/1.2/lib/libvarnishapi/Makefile.am	2007-10-18 15:40:31 UTC (rev 2117)
@@ -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}"'