diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 01:30:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 01:30:36 +0100 |
| commit | 5fe2b28f45289dc5578cdd536600f0d30a14d820 (patch) | |
| tree | 4bdf36d0d4d8bdddcb3d618b4b01839370ed57c3 /m4/check_python.m4 | |
| parent | ec9aeeab00584f4d3dfe9afb83dc1a77b8463b81 (diff) | |
| parent | 3a4638db0351368d3b148bf547546f28fa0b1479 (diff) | |
| download | samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.tar.gz samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.tar.bz2 samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.zip | |
Merge branch 'master' of git://git.samba.org/samba into minschema
Diffstat (limited to 'm4/check_python.m4')
| -rw-r--r-- | m4/check_python.m4 | 6 |
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]) |