[Python-checkins] cpython: disable ASDLGEN if hg won't work, or if python is not installed.
benjamin.peterson
python-checkins at python.org
Wed Jun 1 00:11:25 CEST 2011
http://hg.python.org/cpython/rev/435eec7b41f0
changeset: 70552:435eec7b41f0
user: Ralf Schmitt <ralf at systemexit.de>
date: Tue May 31 17:10:03 2011 -0500
summary:
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
files:
Makefile.pre.in | 2 +-
configure.in | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -274,7 +274,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= $(srcdir)/Parser/asdl_c.py
+ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py
##########################################################################
# Python
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -811,7 +811,13 @@
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)"
@@ -823,6 +829,15 @@
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list