Commit 8492ba1c authored by Daniel Veillard's avatar Daniel Veillard

applied patch from Joseph Sacco changing slightly the python detection

* configure.in: applied patch from Joseph Sacco changing slightly
  the python detection scheme should fix bug #338526
Daniel
parent 3b1478b7
Tue Apr 25 14:52:15 CEST 2006 Daniel Veillard <daniel@veillard.com>
* configure.in: applied patch from Joseph Sacco changing slightly
the python detection scheme should fix bug #338526
Mon Apr 24 10:50:19 CEST 2006 Daniel Veillard <daniel@veillard.com>
* parser.c: fix the error message for invalid code point in content
......
......@@ -661,6 +661,7 @@ if test "$with_python" != "no" ; then
if test -x "$PYTHON"
then
echo Found python in environment PYTHON=$PYTHON
with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
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
......@@ -677,17 +678,17 @@ if test "$with_python" != "no" ; then
-d $with_python/lib/python$PYTHON_VERSION/site-packages
then
PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
PYTHON_SITE_PACKAGES=$libdir/lib/python$PYTHON_VERSION/site-packages
else
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
then
PYTHON_INCLUDES='$(prefix)/include/python$(PYTHON_VERSION)'
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
else
if test -r /usr/include/python$PYTHON_VERSION/Python.h
then
PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
PYTHON_SITE_PACKAGES=$(libdir)/python$(PYTHON_VERSION)/site-packages
else
echo could not find python$PYTHON_VERSION/Python.h
fi
......@@ -700,9 +701,9 @@ if test "$with_python" != "no" ; then
fi
if test "$with_python" != ""
then
pythondir='$(PYTHON_SITE_PACKAGES)'
pythondir=$PYTHON_SITE_PACKAGES
else
pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages'
pythondir=$libdir/python$PYTHON_VERSION/site-packages
fi
else
PYTHON=
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment