summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2005-09-10 12:34:55 +0000
committerDaniel Veillard <veillard@src.gnome.org>2005-09-10 12:34:55 +0000
commitbcd03705542ece1c18cd89acd84b60b9b06ba05e (patch)
tree0fdec5c507e3a2155615d24473518a2bc378dfb3
parent66cff3ae234b204a235c0c02575d6c2fc31161b0 (diff)
downloadlibxslt-bcd03705542ece1c18cd89acd84b60b9b06ba05e.tar.gz
libxslt-bcd03705542ece1c18cd89acd84b60b9b06ba05e.tar.bz2
libxslt-bcd03705542ece1c18cd89acd84b60b9b06ba05e.zip
check environment for PYTHON, fixes #315367 Daniel
* configure.in: check environment for PYTHON, fixes #315367 Daniel
-rw-r--r--ChangeLog4
-rw-r--r--configure.in8
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 446c3b44..c7f4975f 100644
--- 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 22f7fe7c..0163dd54 100644
--- 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" != ""