r3196 - in trunk/varnish-cache: . lib/libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2008-09-17 09:49:28 +0200 (Wed, 17 Sep 2008)
New Revision: 3196

Modified:
   trunk/varnish-cache/configure.ac
   trunk/varnish-cache/lib/libvcl/Makefile.am
Log:
Regenerate generated .c files if we have tclsh installed

As well as the above, add .tcl files to EXTRA_DIST so we can
regenerate them and make distcheck works.


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2008-09-16 19:32:01 UTC (rev 3195)
+++ trunk/varnish-cache/configure.ac	2008-09-17 07:49:28 UTC (rev 3196)
@@ -218,6 +218,12 @@
 	ac_cv_func_port_create=no
 fi
 
+AM_MISSING_HAS_RUN
+AC_CHECK_PROGS(TCLSH, [tclsh tclsh8.4 tclsh8.5], false)
+if test "$TCLSH" = :; then
+  TCLSH=${am_missing_run}tclsh
+fi
+
 # Solaris defines SO_{RCV,SND}TIMEO, but does not implement them.
 # Varnish will build and run without these, but connections will not
 # time out, which may leave Varnish vulnerable to denail-of-service

Modified: trunk/varnish-cache/lib/libvcl/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvcl/Makefile.am	2008-09-16 19:32:01 UTC (rev 3195)
+++ trunk/varnish-cache/lib/libvcl/Makefile.am	2008-09-17 07:49:28 UTC (rev 3196)
@@ -24,3 +24,15 @@
 	vcc_token.c \
 	vcc_var.c \
 	vcc_xref.c
+
+EXTRA_DIST = vcc_gen_obj.tcl \
+	vcc_gen_fixed_token.tcl
+
+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
+	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl
+
+vcc_token_defs.h: $(srcdir)/vcc_gen_fixed_token.tcl
+	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl