diff options
author | Ralf Schmitt <ralf@systemexit.de> | 2011-05-31 17:10:03 -0500 |
---|---|---|
committer | Ralf Schmitt <ralf@systemexit.de> | 2011-05-31 17:10:03 -0500 |
commit | 069456267e96c359ec7b4bd4073c3a027629d79a (patch) | |
tree | ed732a1ba6380997a99245439f7d05c828a58536 | |
parent | ac4e5abc788dfd10474fe3b0a6c5c802d3159763 (diff) | |
download | cpython-git-069456267e96c359ec7b4bd4073c3a027629d79a.tar.gz |
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
-rw-r--r-- | Makefile.pre.in | 2 | ||||
-rw-r--r-- | configure.in | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index b93e482b07..694faadbfc 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -274,7 +274,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl 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= $(srcdir)/Parser/asdl_c.py +ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py ########################################################################## # Python diff --git a/configure.in b/configure.in index 524282fd53..8e89c8fc36 100644 --- a/configure.in +++ b/configure.in @@ -832,7 +832,13 @@ fi AC_SUBST(HGVERSION) AC_SUBST(HGTAG) AC_SUBST(HGBRANCH) + +if test -e $srcdir/.hg/00changelog.i +then AC_CHECK_PROG(HAS_HG, hg, found, not-found) +else +HAS_HG=no-repository +fi if test $HAS_HG = found then HGVERSION="hg id -i \$(srcdir)" @@ -844,6 +850,15 @@ else HGBRANCH="" 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 bsdos*|hp*|HP*) # install -d does not work on BSDI or HP-UX |