python: Always run with the same version of Python as we build against.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 16:02:08 +0000 (17:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 16:02:08 +0000 (17:02 +0100)
m4/check_python.m4

index 7e56af76f73d9cf1c58c8c5ee92a2989cac97e56..94537663137c647f50d49ebe632265b1335c2a74 100644 (file)
@@ -41,7 +41,11 @@ dnl $PYTHON_CFLAGS
 dnl $PYTHON_LDFLAGS
 AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
 [
 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])
        if test -z "$PYTHON"; then
                working_python=no
                AC_MSG_WARN([No python found])