summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2009-07-18 00:33:23 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2009-07-18 00:33:23 (GMT)
commitb89910f42152c14b8c627dc2d3dd6b338b9531b0 (patch)
treead6911a093c33deb29c2d8f923f5db1a9a0a5d79
parent8094660f119b4cc4ea7692a6b8bbe2a9f0bf04e8 (diff)
downloadcpython-b89910f42152c14b8c627dc2d3dd6b338b9531b0.zip
cpython-b89910f42152c14b8c627dc2d3dd6b338b9531b0.tar.gz
cpython-b89910f42152c14b8c627dc2d3dd6b338b9531b0.tar.bz2
Merged revisions 74072 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74072 | alexandre.vassalotti | 2009-07-17 20:31:06 -0400 (Fri, 17 Jul 2009) | 5 lines Add a check to ensure the correct autoconf version is used for generating the configure script. Original idea by Martin von Löwis. ........
-rw-r--r--configure.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 2876eb9..f503a09 100644
--- a/configure.in
+++ b/configure.in
@@ -6,8 +6,16 @@ dnl NOTE: autoconf 2.64 doesn't seem to work (use 2.61).
# Set VERSION so we only need to edit in one place (i.e., here)
m4_define(PYTHON_VERSION, 3.2)
+dnl Some m4 magic to ensure that the configure script is generated
+dnl by the correct autoconf version.
+m4_define([version_required],
+[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), 0,
+ [],
+ [m4_fatal([Autoconf version $1 is required for Python], 63)])
+])
+version_required(2.61)
+
AC_REVISION($Revision$)
-AC_PREREQ(2.61)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
AC_CONFIG_SRCDIR([Include/object.h])
AC_CONFIG_HEADER(pyconfig.h)