diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-03-17 19:11:09 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-03-17 19:11:09 +0000 |
| commit | d8bdfda988a1b76a30ecd0639cef24849eac4de3 (patch) | |
| tree | f70db447cc722bbb1380f915c81915df86a2f1ad /src | |
| parent | 17d926a4ce8bc2ede57a86f23948a3e9b68266a6 (diff) | |
| download | krb5-d8bdfda988a1b76a30ecd0639cef24849eac4de3.tar.gz krb5-d8bdfda988a1b76a30ecd0639cef24849eac4de3.tar.xz krb5-d8bdfda988a1b76a30ecd0639cef24849eac4de3.zip | |
Add a version check to the Python test, so that we don't try to run
k5test in Python 2.3 or below.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23812 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/configure.in b/src/configure.in index 45c543902c..46f2a25c8a 100644 --- a/src/configure.in +++ b/src/configure.in @@ -928,10 +928,19 @@ else fi AC_SUBST(HAVE_RUNTEST) -# for Python tests +# For Python tests. AC_CHECK_PROG(PYTHON,python,python) if test x"$PYTHON" != x; then - HAVE_PYTHON=yes + # k5test.py requires python 2.4 (for the subprocess module). + pyversion=$(python --version 2>&1 | awk '{print $2}') + case $pyversion in + 1.*|2.0.*|2.1.*|2.2.*|2.3.*) + HAVE_PYTHON=no + ;; + *) + HAVE_PYTHON=yes + ;; + esac else HAVE_PYTHON=no fi |