--- ./Makefile.pre.in~	2012-10-17 10:46:19.036110666 +0200
+++ ./Makefile.pre.in	2012-10-17 12:05:03.915540068 +0200
@@ -310,7 +310,7 @@
 
 ASDLGEN_FILES=	$(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
 # XXX Note that a build now requires Python exist before the build starts
-ASDLGEN=	@DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py
+ASDLGEN=	@ASDLGEN@ $(srcdir)/Parser/asdl_c.py
 
 ##########################################################################
 # Python
--- ./configure.ac~	2012-10-17 10:46:19.048110725 +0200
+++ ./configure.ac	2012-10-17 12:06:29.519964633 +0200
@@ -1005,12 +1005,12 @@
 fi
 AC_SUBST(READELF)
 
-AC_SUBST(DISABLE_ASDLGEN)
-DISABLE_ASDLGEN=""
-AC_CHECK_PROG(HAS_PYTHON, python, found, not-found)
-if test $HAS_HG != found -o $HAS_PYTHON != found
-then
-    DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #"
+AC_SUBST(ASDLGEN)
+AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found)
+if $PYTHON = not-found; then
+    ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #"
+else
+    ASDLGEN="$PYTHON"
 fi
 
 
--- ./Parser/asdl_c.py~	2012-10-17 10:46:18.280106914 +0200
+++ ./Parser/asdl_c.py	2012-10-17 11:56:20.452944370 +0200
@@ -5,7 +5,6 @@
 # handle fields that have a type but no name
 
 import os, sys
-import subprocess
 
 import asdl