r2116 - in trunk/varnish-cache: . bin/varnishd lib/libvarnishapi
des at projects.linpro.no
des at projects.linpro.no
Thu Oct 18 17:18:43 CEST 2007
Author: des
Date: 2007-10-18 17:18:42 +0200 (Thu, 18 Oct 2007)
New Revision: 2116
Modified:
trunk/varnish-cache/bin/varnishd/Makefile.am
trunk/varnish-cache/configure.ac
trunk/varnish-cache/lib/libvarnishapi/Makefile.am
Log:
Make VARNISH_STATE_DIR work correctly when using the default prefix.
Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am 2007-10-18 13:38:45 UTC (rev 2115)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am 2007-10-18 15:18:42 UTC (rev 2116)
@@ -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: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2007-10-18 13:38:45 UTC (rev 2115)
+++ trunk/varnish-cache/configure.ac 2007-10-18 15:18:42 UTC (rev 2116)
@@ -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: trunk/varnish-cache/lib/libvarnishapi/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/Makefile.am 2007-10-18 13:38:45 UTC (rev 2115)
+++ trunk/varnish-cache/lib/libvarnishapi/Makefile.am 2007-10-18 15:18:42 UTC (rev 2116)
@@ -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}"'
More information about the varnish-commit
mailing list