Mailing List Archive

Author: tfheen
Date: 2008-09-19 14:17:28 +0200 (Fri, 19 Sep 2008)
New Revision: 3202

Modified:
trunk/varnish-cache/configure.ac
trunk/varnish-cache/lib/libvcl/Makefile.am
Log:
Really fix TCL build dependency

Make sure we never fail even if tclsh is not installed, and make sure
to emit a message if the .c and .h files should be rebuilt.

Fixes: #323


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2008-09-18 14:05:05 UTC (rev 3201)
+++ trunk/varnish-cache/configure.ac 2008-09-19 12:17:28 UTC (rev 3202)
@@ -221,7 +221,7 @@
AM_MISSING_HAS_RUN
AC_CHECK_PROGS(TCLSH, [tclsh tclsh8.4 tclsh8.5], :)
if test "$TCLSH" = :; then
- TCLSH=${am_missing_run}tclsh
+ TCLSH="${am_missing_run}tclsh || true"
fi

# Solaris defines SO_{RCV,SND}TIMEO, but does not implement them.

Modified: trunk/varnish-cache/lib/libvcl/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvcl/Makefile.am 2008-09-18 14:05:05 UTC (rev 3201)
+++ trunk/varnish-cache/lib/libvcl/Makefile.am 2008-09-19 12:17:28 UTC (rev 3202)
@@ -28,11 +28,11 @@
EXTRA_DIST = vcc_gen_obj.tcl \
vcc_gen_fixed_token.tcl

-vcc_obj.c: $(srcdir)/vcc_gen_obj.tcl
+$(srcdir)/vcc_obj.c: $(srcdir)/vcc_gen_obj.tcl
cd $(srcdir) && @TCLSH@ vcc_gen_obj.tcl

-vcc_fixed_token.c: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
+$(srcdir)/vcc_fixed_token.c: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl

-vcc_token_defs.h: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
+$(srcdir)/vcc_token_defs.h: $(srcdir)/vcc_gen_fixed_token.tcl $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl