diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2006-04-25 13:14:09 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2006-04-25 13:14:09 +0000 |
| commit | dc61923420efe5d364f1f2b0c322adb83d319bac (patch) | |
| tree | 4212321d4c0a386c4bf242f0f98cc4ec14eee7f6 | |
| parent | c809be062c8862402d24cf3f8c249b54775b4f8a (diff) | |
| download | libxslt-dc61923420efe5d364f1f2b0c322adb83d319bac.tar.gz libxslt-dc61923420efe5d364f1f2b0c322adb83d319bac.tar.bz2 libxslt-dc61923420efe5d364f1f2b0c322adb83d319bac.zip | |
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 #338527
Daniel
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 21 |
2 files changed, 16 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Tue Apr 25 15:02:42 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * configure.in: applied patch from Joseph Sacco changing slightly + the python detection scheme should fix bug #338527 + Wed Apr 12 13:35:45 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> * libxslt/attributes.c libxslt/preproc.c libxslt/transform.c diff --git a/configure.in b/configure.in index 99ac9f69..19a16bb0 100644 --- a/configure.in +++ b/configure.in @@ -172,11 +172,12 @@ if test "$with_python" != "no" ; then echo Found python in $with_python PYTHON="$with_python" else - if test -x "$PYTHON" - then - echo Found python in environment PYTHON=$PYTHON + 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) + AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) fi fi fi @@ -199,17 +200,17 @@ except: print 0"` -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 @@ -222,9 +223,9 @@ except: print 0"` 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 fi AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") |