check environment for PYTHON, fixes #315367 Daniel

* configure.in: check environment for PYTHON, fixes #315367
Daniel

diff --git a/ChangeLog b/ChangeLog
index 446c3b4..c7f4975 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 10 14:35:06 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+       * configure.in: check environment for PYTHON, fixes #315367
+
 Mon Sep  5 00:44:24 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
        * configure.in NEWS doc/*: preparing release 1.1.15

diff --git a/configure.in b/configure.in
index 22f7fe7..0163dd5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -156,7 +156,6 @@ dnl
 dnl check for python
 dnl
 
-PYTHON=
 PYTHON_VERSION=
 PYTHON_INCLUDES=
 PYTHON_SITE_PACKAGES=
@@ -173,7 +172,12 @@ if test "$with_python" != "no" ; then
            echo Found python in $with_python
            PYTHON="$with_python"
        else
-           AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+           if test -x "$PYTHON"
+           then
+               echo Found python in environment PYTHON=$PYTHON
+           else
+               AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+           fi
        fi
     fi
     if test "$PYTHON" != ""