diff options
| author | Mike Hommey <glandium@debian.org> | 2010-03-18 07:40:32 +0100 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2010-03-18 07:40:32 +0100 |
| commit | eb5d521a2df72fa829a7f8196b957c696e7ccc58 (patch) | |
| tree | 224599e18a48f87e82aa8a32456563277c68ae58 /configure.in | |
| parent | 8a10e02b2f4971d3fdacab7dc7baecced34056fb (diff) | |
| download | libxml2-eb5d521a2df72fa829a7f8196b957c696e7ccc58.tar.gz | |
Import upstream version 2.7.7upstream/2.7.7.dfsg
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 237846f..17c11cd 100644 --- a/configure.in +++ b/configure.in @@ -1,11 +1,12 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(entities.c) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=7 -LIBXML_MICRO_VERSION=6 +LIBXML_MICRO_VERSION=7 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 @@ -72,10 +73,14 @@ dnl if the system support linker version scripts for symbol versioning dnl then add it dnl VERSION_SCRIPT_FLAGS= -$(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= -test "`uname`" == "SunOS" && \ - VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," +# lt_cv_prog_gnu_ld is from libtool 2.+ +if test "$lt_cv_prog_gnu_ld" = yes; then + VERSION_SCRIPT_FLAGS=-Wl,--version-script= +else + case $host in + *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";; + esac +fi AC_SUBST(VERSION_SCRIPT_FLAGS) AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) @@ -742,7 +747,7 @@ if test "$with_python" != "no" ; then PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` fi fi - PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` + PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` fi if test "$with_python" != "" then @@ -778,6 +783,10 @@ if test "$with_modules" != "no" ; then AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso]) ]) ;; + *-*-mingw*) + MODULE_EXTENSION=".dll" + WITH_MODULES=1 + ;; *) AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [ AC_CHECK_LIB(dld, shl_load, [ |