Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/configure.in

 dnl Process this file with autoconf to produce a configuration script.
 AC_PREREQ(2.59)
 AC_INIT(libxslt/xslt.c)
 AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS
 
 dnl
 dnl libxslt is the main part of the package
 dnl libexslt is an extension
@@ skipping 178 matching lines @@
 typedef locale_t xsltLocale;
 #endif
 #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2
 #define newlocale __newlocale
 #define freelocale __freelocale
 #define strxfrm_l __strxfrm_l
 #define LC_COLLATE_MASK (1 << LC_COLLATE)
 #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);
 ]])],
   [AC_MSG_RESULT(yes); XSLT_LOCALE_XLOCALE=1],
   [AC_MSG_RESULT(no)]
 )
 else
   case "$host" in
     *-*-mingw*)
@@ skipping 147 matching lines @@
     PYTHON_SUBDIR=python
 else
     PYTHON_SUBDIR=
 fi
 AC_SUBST(pythondir)
 AC_SUBST(PYTHON_SUBDIR)
 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=""
     LIBGCRYPT_LIBS=""
 else
 case $host in
   *-mingw*)
     dnl Use only native crypto-API for mingw* hosts
     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")
       then
         LIBGCRYPT_CFLAGS=""
         LIBGCRYPT_LIBS=""
         echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.'
       else
         LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
         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=""
       LIBGCRYPT_LIBS=""
       echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.'
     fi
 esac
 fi
 AC_SUBST(WITH_CRYPTO)
+AC_SUBST(CRYPTO_TESTDIR)
 AC_SUBST(LIBGCRYPT_CFLAGS)
 AC_SUBST(LIBGCRYPT_LIBS)
 
 dnl
 dnl Debug for DV (-Wunreachable-code)
 dnl
 if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ]] || \
    [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomesvn/libxslt" ]]
    then
     if test "${with_mem_debug}" = "" ;
     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)])
 if test "$with_debug" = "no" ; then
     echo Disabling debug support
     WITH_XSLT_DEBUG=0
 else    
     WITH_XSLT_DEBUG=1
 fi
 AC_SUBST(WITH_XSLT_DEBUG)
@@ skipping 55 matching lines @@
 AC_SUBST(LIBXML_SRC)
 
 dnl
 dnl where is xml2-config
 dnl
 
 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
 dnl imported from libxml2, c.f. #77827 
 dnl
 if test "${GCC}" != "yes" ; then
     case "${host}" in
           *-*-hpux* )
                CFLAGS="${CFLAGS} -Wp,-H30000"
                ;;
           *-dec-osf* )
                CFLAGS="${CFLAGS} -ieee"
                ;;
     esac
 else
-    CFLAGS="${CFLAGS} -Wall"
+    CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-format-attribute"
     case "${host}" in
           alpha*-*-linux* )
                CFLAGS="${CFLAGS} -mieee"
                ;;
           alpha*-*-osf* )
                CFLAGS="${CFLAGS} -mieee"
                ;;
     esac
 fi
 
@@ skipping 72 matching lines @@
 else
   WITH_MODULES="0"
 fi
 
 AC_SUBST(WITH_MODULES)
 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=
 WIN32_EXTRA_LDFLAGS=
 case "$host" in
  *-*-cygwin*)
  WIN32_EXTRA_LDFLAGS="-no-undefined"
  ;;
  *-*-mingw*)
  WIN32_EXTRA_LIBADD="-lwsock32"
@@ skipping 72 matching lines @@
 tests/XSLTMark/Makefile
 tests/docbook/Makefile
 tests/exslt/Makefile
 tests/exslt/common/Makefile
 tests/exslt/functions/Makefile
 tests/exslt/math/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
 libxslt.spec
 ])
 
 AC_OUTPUT