diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/configure.in b/configure.in index fc8d5a89..8bdf45a1 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ dnl libexslt is an extension dnl LIBXSLT_MAJOR_VERSION=1 LIBXSLT_MINOR_VERSION=1 -LIBXSLT_MICRO_VERSION=28 +LIBXSLT_MICRO_VERSION=29 PACKAGE=libxslt LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MINOR_VERSION=8 @@ -196,21 +196,21 @@ typedef locale_t xsltLocale; #endif ]],[[ xsltLocale locale; - const char *src[[2]] = { "\xc3\x84rger", "Zeppelin" }; - char *dst[[2]]; + const char *src[2] = { "\xc3\x84rger", "Zeppelin" }; + char *dst[2]; size_t len, r; int i; locale = newlocale(LC_COLLATE_MASK, "en_US.utf8", NULL); if (locale == NULL) exit(1); for (i=0; i<2; ++i) { - len = strxfrm_l(NULL, src[[i]], 0, locale) + 1; - dst[[i]] = malloc(len); - if(dst[[i]] == NULL) exit(1); - r = strxfrm_l(dst[[i]], src[[i]], len, locale); + len = strxfrm_l(NULL, src[i], 0, locale) + 1; + dst[i] = malloc(len); + if(dst[i] == NULL) exit(1); + r = strxfrm_l(dst[i], src[i], len, locale); if(r >= len) exit(1); } - if (strcmp(dst[[0]], dst[[1]]) >= 0) exit(1); + if (strcmp(dst[0], dst[1]) >= 0) exit(1); exit(0); return(0); @@ -235,6 +235,7 @@ dnl AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h ansidecl.h) AC_CHECK_HEADERS(sys/timeb.h time.h sys/stat.h sys/select.h stdarg.h) +AC_CHECK_HEADERS(errno.h) AC_CHECK_FUNCS(stat _stat) AC_CHECK_FUNC(pow, , AC_CHECK_LIB(m, pow, [M_LIBS="-lm"; AC_DEFINE([HAVE_POW],[], [Define if pow is there])])) @@ -378,6 +379,7 @@ AC_SUBST(PYTHON_LIBS) AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) WITH_CRYPTO=0 +CRYPTO_TESTDIR= if test "$with_crypto" = "no" ; then echo Disabling crypto support LIBGCRYPT_CFLAGS="" @@ -389,9 +391,10 @@ case $host in dnl TODO: to implement --with-crypto=foo to allow switch between dnl crypto libraries WITH_CRYPTO=1 + CRYPTO_TESTDIR=crypto ;; *) - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) + AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) if test "$LIBGCRYPT_CONFIG" != "no" ; then LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") @@ -404,7 +407,8 @@ case $host in LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs` AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) echo 'Crypto extensions will be available.' - WITH_CRYPTO=1 + WITH_CRYPTO=1 + CRYPTO_TESTDIR=crypto fi else LIBGCRYPT_CFLAGS="" @@ -414,6 +418,7 @@ case $host in esac fi AC_SUBST(WITH_CRYPTO) +AC_SUBST(CRYPTO_TESTDIR) AC_SUBST(LIBGCRYPT_CFLAGS) AC_SUBST(LIBGCRYPT_LIBS) @@ -427,7 +432,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ]] || \ then with_mem_debug="yes" fi - CFLAGS="-Wall -g -O -ansi -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline " + CFLAGS="-Wall -g -O -ansi -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat=2 -Wmissing-format-attribute -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline " fi AC_ARG_WITH(debug, [ --with-debug Add the debugging code (on)]) @@ -503,9 +508,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION) AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) if test "x$LIBXML_CONFIG_PREFIX" != "x" then - XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config + AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin]) else - XML_CONFIG=xml2-config + AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) fi dnl @@ -521,7 +526,7 @@ if test "${GCC}" != "yes" ; then ;; esac else - CFLAGS="${CFLAGS} -Wall" + CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-format-attribute" case "${host}" in alpha*-*-linux* ) CFLAGS="${CFLAGS} -mieee" @@ -614,9 +619,16 @@ AM_CONDITIONAL(WITH_MODULES, test "$WITH_MODULES" = "1") dnl dnl setup default module path dnl -module_prefix=$prefix -test "x$module_prefix" = xNONE && module_prefix=$ac_default_prefix -LIBXSLT_DEFAULT_PLUGINS_PATH="$module_prefix/lib/libxslt-plugins" +expanded_libdir=$( + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="$prefix" + while test "$libdir_old" != "$libdir"; do + libdir_old="$libdir" + eval libdir="$libdir" + done + echo "$libdir" +) +LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins" AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH) WIN32_EXTRA_LIBADD= @@ -705,10 +717,12 @@ 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 doc/Makefile xslt-config |