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

[phk at varnish-cache.org]

Author: phk
Date: 2010-04-27 17:24:38 +0200 (Tue, 27 Apr 2010)
New Revision: 4736

Modified:
   trunk/varnish-cache/configure.ac
   trunk/varnish-cache/lib/libvcl/Makefile.am
Log:
We can run the VCC generator script with python 2.5..3.2, look for anything
that looks like that.



Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2010-04-27 15:19:41 UTC (rev 4735)
+++ trunk/varnish-cache/configure.ac	2010-04-27 15:24:38 UTC (rev 4736)
@@ -291,9 +291,9 @@
 fi
 
 AM_MISSING_HAS_RUN
-AC_CHECK_PROGS(PYTHON3, [python3 python3.1 python3.2], :)
-if test "$PYTHON3" = :; then
-  PYTHON3="${am_missing_run}python3"
+AC_CHECK_PROGS(PYTHON, [python python2 python2.5 python2.6 python3 python3.1 python3.2], :)
+if test "$PYTHON" = :; then
+  PYTHON="${am_missing_run}python"
 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	2010-04-27 15:19:41 UTC (rev 4735)
+++ trunk/varnish-cache/lib/libvcl/Makefile.am	2010-04-27 15:24:38 UTC (rev 4736)
@@ -30,10 +30,10 @@
 	generate.py
 
 $(srcdir)/vcc_obj.c: $(srcdir)/generate.py
-	cd $(srcdir) && @PYTHON3@ generate.py || true
+	cd $(srcdir) && @PYTHON@ generate.py || 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
+	cd $(srcdir) && @PYTHON@ generate.py || 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
+	cd $(srcdir) && @PYTHON@ generate.py || true