Commit afe68e41 authored by Tollef Fog Heen's avatar Tollef Fog Heen

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


git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3202 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 4b786814
......@@ -221,7 +221,7 @@ fi
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.
......
......@@ -28,11 +28,11 @@ libvcl_la_SOURCES = \
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment