Mailing List Archive

Author: tfheen
Date: 2008-11-06 12:45:45 +0100 (Thu, 06 Nov 2008)
New Revision: 3360

Modified:
trunk/varnish-cache/configure.ac
trunk/varnish-cache/lib/libvcl/Makefile.am
Log:
Fix up tclsh invocation (again)

Move the || true bit of invoking tclsh to the Makefile, since
missing would otherwise not pass the file name to tclsh.

Thanks to des for spotting this.


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2008-11-05 12:51:51 UTC (rev 3359)
+++ trunk/varnish-cache/configure.ac 2008-11-06 11:45:45 UTC (rev 3360)
@@ -232,7 +232,7 @@
AM_MISSING_HAS_RUN
AC_CHECK_PROGS(TCLSH, [tclsh tclsh8.4 tclsh8.5], :)
if test "$TCLSH" = :; then
- TCLSH="${am_missing_run}tclsh || true"
+ TCLSH="${am_missing_run}tclsh"
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-11-05 12:51:51 UTC (rev 3359)
+++ trunk/varnish-cache/lib/libvcl/Makefile.am 2008-11-06 11:45:45 UTC (rev 3360)
@@ -29,10 +29,10 @@
vcc_gen_fixed_token.tcl

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

$(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
+ cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl || true

$(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
+ cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl || true