summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-15 17:02:08 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-15 17:02:08 +0100
commit05a9d0266f9da163b84b830532fb9755a19874da (patch)
tree68f63e38ad64b8de7d78a749cf6b9f6894c611e5 /m4
parent693221cfdff655dd78199c9d25a47db8783160a9 (diff)
downloadsamba-05a9d0266f9da163b84b830532fb9755a19874da.tar.gz
samba-05a9d0266f9da163b84b830532fb9755a19874da.tar.bz2
samba-05a9d0266f9da163b84b830532fb9755a19874da.zip
python: Always run with the same version of Python as we build against.
Diffstat (limited to 'm4')
-rw-r--r--m4/check_python.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 7e56af76f7..9453766313 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -41,7 +41,11 @@ dnl $PYTHON_CFLAGS
dnl $PYTHON_LDFLAGS
AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
[
- AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+ if test -z "$PYTHON_VERSION"; then
+ AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
+ else
+ AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+ fi
if test -z "$PYTHON"; then
working_python=no
AC_MSG_WARN([No python found])