From: tfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 19 Sep 2008 12:17:28 +0000 (+0000)
Subject: Really fix TCL build dependency
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e443b219c8ece70d089fc051fcc254bbe29f31e5;p=varnish

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: svn+ssh://projects.linpro.no/svn/varnish/trunk@3202 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 58dce5f6..a8d01ee4 100644
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -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.
diff --git a/varnish-cache/lib/libvcl/Makefile.am b/varnish-cache/lib/libvcl/Makefile.am
index dfda4cd9..3d5b475c 100644
--- a/varnish-cache/lib/libvcl/Makefile.am
+++ b/varnish-cache/lib/libvcl/Makefile.am
@@ -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