diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 253b63a..6951b3d 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=23 +LIBXML_MICRO_VERSION=24 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -624,6 +624,17 @@ case ${host} in hppa*-hp-mpeix) NEED_TRIO=1 ;; + *-*-mingw* | *-*-cygwin* | *-*-msvc* ) + # If the host is Windows, and shared libraries are disabled, we + # need to add -DLIBXML_STATIC to CFLAGS in order for linking to + # work properly (without it, xmlexports.h would force the use of + # DLL imports, which obviously aren't present in a static + # library). + if test "x$enable_shared" = "xno"; then + XML_CFLAGS="$XML_CFLAGS -DLIBXML_STATIC" + CFLAGS="$CFLAGS -DLIBXML_STATIC" + fi + ;; esac @@ -650,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 @@ -666,11 +678,11 @@ 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_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 @@ -689,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= |