Commit 06945626 authored by Ralf Schmitt's avatar Ralf Schmitt

disable ASDLGEN if hg won't work, or if python is not installed.

This change makes configure check for
- the existence of a hg repository
- the hg executable itself
- the python executable

Running $(srcdir)/Parser/asdl_c.py (i.e. ASDLGEN) will fail if any of
the above prerequisites is missing, so we now disable it instead.

closes #12225
parent ac4e5abc
...@@ -274,7 +274,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl ...@@ -274,7 +274,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl
ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
# XXX Note that a build now requires Python exist before the build starts # XXX Note that a build now requires Python exist before the build starts
ASDLGEN= $(srcdir)/Parser/asdl_c.py ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py
########################################################################## ##########################################################################
# Python # Python
......
...@@ -832,7 +832,13 @@ fi ...@@ -832,7 +832,13 @@ fi
AC_SUBST(HGVERSION) AC_SUBST(HGVERSION)
AC_SUBST(HGTAG) AC_SUBST(HGTAG)
AC_SUBST(HGBRANCH) AC_SUBST(HGBRANCH)
if test -e $srcdir/.hg/00changelog.i
then
AC_CHECK_PROG(HAS_HG, hg, found, not-found) AC_CHECK_PROG(HAS_HG, hg, found, not-found)
else
HAS_HG=no-repository
fi
if test $HAS_HG = found if test $HAS_HG = found
then then
HGVERSION="hg id -i \$(srcdir)" HGVERSION="hg id -i \$(srcdir)"
...@@ -844,6 +850,15 @@ else ...@@ -844,6 +850,15 @@ else
HGBRANCH="" HGBRANCH=""
fi fi
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 #"
fi
case $MACHDEP in case $MACHDEP in
bsdos*|hp*|HP*) bsdos*|hp*|HP*)
# install -d does not work on BSDI or HP-UX # install -d does not work on BSDI or HP-UX
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment