diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 72 |
1 files changed, 30 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index baeee600..0131754f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.63) m4_define([MAJOR_VERSION], [1]) m4_define([MINOR_VERSION], [1]) -m4_define([MICRO_VERSION], [37]) +m4_define([MICRO_VERSION], [39]) AC_INIT([libxslt], [MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION]) AC_CONFIG_SRCDIR([libxslt/xslt.c]) @@ -21,7 +21,7 @@ LIBXSLT_MINOR_VERSION=MINOR_VERSION LIBXSLT_MICRO_VERSION=MICRO_VERSION LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MINOR_VERSION=8 -LIBEXSLT_MICRO_VERSION=20 +LIBEXSLT_MICRO_VERSION=21 LIBXML_REQUIRED_VERSION=2.6.27 @@ -95,7 +95,11 @@ dnl AC_MSG_CHECKING([how to pass version script to the linker ($LD)]) VERSION_SCRIPT_FLAGS=none if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then - VERSION_SCRIPT_FLAGS=-Wl,--version-script= + dnl lld 16 defaults to --no-undefined-version but the version script + dnl can contain symbols disabled by configuration options. + VERSION_SCRIPT_FLAGS='' + AX_APPEND_LINK_FLAGS([-Wl,--undefined-version], [VERSION_SCRIPT_FLAGS]) + AX_APPEND_FLAG([-Wl,--version-script=], [VERSION_SCRIPT_FLAGS]) elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," fi @@ -186,7 +190,13 @@ AC_ARG_WITH(python, AS_IF([test "x$with_python" != "xno"], [ AM_PATH_PYTHON PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-msys* ) + PYTHON_LDFLAGS="-no-undefined -shrext .pyd" + ;; + esac ]) +AC_SUBST(PYTHON_LDFLAGS) AM_CONDITIONAL([WITH_PYTHON], [test "x$with_python" != "xno"]) AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) @@ -331,20 +341,20 @@ dnl if test "${GCC}" != "yes" ; then case "${host}" in *-*-hpux* ) - CFLAGS="${CFLAGS} -Wp,-H30000" + AM_CFLAGS="${AM_CFLAGS} -Wp,-H30000" ;; *-dec-osf* ) - CFLAGS="${CFLAGS} -ieee" + AM_CFLAGS="${AM_CFLAGS} -ieee" ;; esac else - CFLAGS="${CFLAGS} -Wall -Wextra -Wformat=2 -Wmissing-format-attribute -Wshadow" + AM_CFLAGS="${AM_CFLAGS} -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls" case "${host}" in alpha*-*-linux* ) - CFLAGS="${CFLAGS} -mieee" + AM_CFLAGS="${AM_CFLAGS} -mieee" ;; alpha*-*-osf* ) - CFLAGS="${CFLAGS} -mieee" + AM_CFLAGS="${AM_CFLAGS} -mieee" ;; esac fi @@ -437,6 +447,8 @@ then AC_MSG_ERROR([Could not find libxml2 anywhere.]) fi +AM_CFLAGS="$AM_CFLAGS $LIBXML_CFLAGS" + AC_ARG_WITH(plugins, [ --with-plugins Add plugin extension support (on)]) @@ -485,13 +497,6 @@ expanded_libdir=$( LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins" AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH) -case "$host" in - *-*-cygwin*|*-*-mingw*) - LDFLAGS="$LDFLAGS -no-undefined" - ;; -esac - - AC_SUBST(XML_CONFIG) AC_SUBST(LIBXML_LIBS) AC_SUBST(LIBXML_CFLAGS) @@ -506,19 +511,25 @@ AC_SUBST(XSLT_LIBS) AC_SUBST(XSLT_PRIVATE_LIBS) LIBXSLT_CFLAGS="" +LIBEXSLT_CFLAGS="" case ${host} in *-*-mingw* | *-*-cygwin* | *-*-msvc* ) # If the host is Windows, and shared libraries are disabled, we - # need to add -DLIBXML_STATIC to EXTRA_CFLAGS in order for linking to + # need to add -DLIBXML_STATIC to AM_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 - LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC" + LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS -DLIBXSLT_STATIC" + LIBEXSLT_CFLAGS="$LIBEXSLT_CFLAGS -DLIBEXSLT_STATIC" + AM_CFLAGS="$AM_CFLAGS -DLIBXSLT_STATIC -DLIBEXSLT_STATIC" fi ;; esac AC_SUBST(LIBXSLT_CFLAGS) +AC_SUBST(LIBEXSLT_CFLAGS) + +AC_SUBST(AM_CFLAGS) EXSLT_LIBDIR='-L${libdir}' EXSLT_INCLUDEDIR='-I${includedir}' @@ -545,43 +556,20 @@ libexslt/Makefile libexslt/exsltconfig.h xsltproc/Makefile python/Makefile +python/setup.py python/tests/Makefile tests/Makefile -tests/docs/Makefile -tests/REC1/Makefile -tests/REC2/Makefile -tests/REC/Makefile -tests/general/Makefile -tests/reports/Makefile -tests/extensions/Makefile -tests/namespaces/Makefile -tests/keys/Makefile -tests/numbers/Makefile -tests/documents/Makefile tests/xmlspec/Makefile tests/multiple/Makefile tests/xinclude/Makefile tests/XSLTMark/Makefile tests/docbook/Makefile -tests/exslt/Makefile -tests/exslt/common/Makefile -tests/exslt/functions/Makefile -tests/exslt/math/Makefile -tests/exslt/saxon/Makefile -tests/exslt/sets/Makefile -tests/exslt/strings/Makefile -tests/exslt/date/Makefile -tests/exslt/dynamic/Makefile -tests/exslt/crypto/Makefile -tests/plugins/Makefile tests/fuzz/Makefile doc/Makefile doc/devhelp/Makefile doc/EXSLT/devhelp/Makefile -xslt-config libxslt.spec ]) -AC_CONFIG_LINKS([tests/fuzz/xpath.xml:tests/fuzz/xpath.xml]) -AC_CONFIG_LINKS([tests/fuzz/xslt.xml:tests/fuzz/xslt.xml]) +AC_CONFIG_FILES([xslt-config], [chmod +x xslt-config]) AC_OUTPUT |