summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/Makefile.am2
-rw-r--r--python/Makefile.in3
-rwxr-xr-xpython/setup.py4
-rw-r--r--python/tests/Makefile.in1
4 files changed, 6 insertions, 4 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 23898fa..8f148b1 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -31,7 +31,7 @@ python_LTLIBRARIES = libxml2mod.la
libxml2mod_la_SOURCES = libxml.c types.c
nodist_libxml2mod_la_SOURCES = libxml2-py.c
-libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
+libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@
libxml.c: libxml2-py.h # to generate before to compile
diff --git a/python/Makefile.in b/python/Makefile.in
index 7417c02..4868b5e 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -222,6 +222,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PYTHON = @PYTHON@
PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
PYTHON_SUBDIR = @PYTHON_SUBDIR@
PYTHON_TESTS = @PYTHON_TESTS@
@@ -387,7 +388,7 @@ libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -av
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c
@WITH_PYTHON_TRUE@nodist_libxml2mod_la_SOURCES = libxml2-py.c
-@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
+@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@
@WITH_PYTHON_TRUE@python_DATA = \
@WITH_PYTHON_TRUE@ libxml2.py
diff --git a/python/setup.py b/python/setup.py
index 9f0aaa0..7bd6165 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -11,7 +11,7 @@ from distutils.core import setup, Extension
ROOT = r'/usr'
# Thread-enabled libxml2
-with_threads = 1
+with_threads = 0
# If this flag is set (windows only),
# a private copy of the dlls are included in the package.
@@ -226,7 +226,7 @@ else:
setup (name = "libxml2-python",
# On *nix, the version number is created from setup.py.in
# On windows, it is set by configure.js
- version = "2.7.4",
+ version = "2.7.5",
description = descr,
author = "Daniel Veillard",
author_email = "veillard@redhat.com",
diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in
index ab41539..4aa2248 100644
--- a/python/tests/Makefile.in
+++ b/python/tests/Makefile.in
@@ -154,6 +154,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PYTHON = @PYTHON@
PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
PYTHON_SUBDIR = @PYTHON_SUBDIR@
PYTHON_TESTS = @PYTHON_TESTS@