Make VARNISH_STATE_DIR work correctly when using the default prefix.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2116 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/Makefile.am

@@ -64,7 +64,8 @@ noinst_HEADERS = \
 	steps.h \
 	stevedore.h
 
-varnishd_CFLAGS = -include config.h
+varnishd_CFLAGS = -include config.h \
+        -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
 varnishd_LDFLAGS = -export-dynamic
 

configure.ac

@@ -115,9 +115,8 @@ AC_CHECK_FUNCS([epoll_ctl])
 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

lib/libvarnishapi/Makefile.am

@@ -9,4 +9,5 @@ libvarnishapi_la_SOURCES = \
 	instance.c \
 	shmlog.c
 
-libvarnishapi_la_CFLAGS = -include config.h
+libvarnishapi_la_CFLAGS = -include config.h \
+	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'