Have auto* look for a python3 instead of tclsh and use the python

version of the VCC generator script



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4733 d4fa192b-c00b-0410-8231-f00ffab90ce4

configure.ac

@@ -291,9 +291,9 @@ else
 fi
 
 AM_MISSING_HAS_RUN
-AC_CHECK_PROGS(TCLSH, [tclsh tclsh8.4 tclsh8.5], :)
-if test "$TCLSH" = :; then
-  TCLSH="${am_missing_run}tclsh"
+AC_CHECK_PROGS(PYTHON3, [python3 python3.1 python3.2], :)
+if test "$PYTHON3" = :; then
+  PYTHON3="${am_missing_run}python3"
 fi
 
 # Solaris defines SO_{RCV,SND}TIMEO, but does not implement them.

lib/libvcl/Makefile.am

@@ -27,13 +27,13 @@ libvcl_la_SOURCES = \
 	vcc_xref.c
 
 EXTRA_DIST = \
-	vcc_gen_fixed_token.tcl
+	generate.py
 
-$(srcdir)/vcc_obj.c: $(srcdir)/vcc_gen_fixed_token.tcl
-	cd $(srcdir) && @TCLSH@ vcc_gen_fixed_token.tcl || true
+$(srcdir)/vcc_obj.c: $(srcdir)/generate.py
+	cd $(srcdir) && @PYTHON3@ generate.py || 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 || true
+$(srcdir)/vcc_fixed_token.c: $(srcdir)/generate.py $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
+	cd $(srcdir) && @PYTHON3@ generate.py || 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 || true
+$(srcdir)/vcc_token_defs.h: $(srcdir)/generate.py $(top_srcdir)/include/vcl.h $(top_srcdir)/include/vrt.h $(top_srcdir)/include/vrt_obj.h
+	cd $(srcdir) && @PYTHON3@ generate.py || true