diff options
author | Mike Hommey <glandium@debian.org> | 2006-06-08 22:38:16 +0200 |
---|---|---|
committer | Mike Hommey <glandium@debian.org> | 2006-06-08 22:38:16 +0200 |
commit | ef381f99921ea9fe00a07836b93f2a2bf865ca17 (patch) | |
tree | 62ec8494b6ba15713636b2731dd2f39cda762bc6 | |
parent | 6b7b7b4a4490d2cde163e9d5fe7c04ce540022b0 (diff) | |
parent | a7e9d3f37d5e9fba4b9acaa43e7c12b6d9a669ae (diff) | |
download | libxml2-debian/2.6.26.dfsg-1.tar.gz |
* New upstream release.debian/2.6.26.dfsg-1
* debian/rules:
+ Added -fno-strict-aliasing to the CFLAGS.
+ Use dpkg-architecture to feed configure.
+ Bumped shlibs to current version, since new symbol for XPath cache has
been added.
* debian/control: Bumped Standards-Version to 3.7.2.0. No changes required.
88 files changed, 15960 insertions, 10685 deletions
@@ -1,3 +1,244 @@ +Tue Jun 6 17:50:43 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * configure.ini NEWS doc//* libxml.spec.in : preparing release of 2.6.26 + +Tue Jun 6 17:25:23 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Fixed self-invented a segfault in xmlXPathCtxtCompile(), + when the expression was not valid and @comp was NULL and I + tried to do the d-o-s rewrite. + +Tue Jun 6 15:19:57 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * configure.ini NEWS doc//* libxml.spec.in : preparing release of 2.6.25 + +Tue Jun 6 11:28:15 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Enabled the compound traversal again; I added a + check to use this only if the have an expression starting + with the document node; so in the case of "//foo", we + already know at compilation-time, that there will be only + 1 initial context node. Added the rewrite also to + xmlXPathEvalExpr(). + +Tue Jun 6 10:23:10 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * xinclude.c: fix bug #343968, include='text' can't lead to a + recursion. + +Fri Jun 2 22:47:08 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Disabled the compound traversal for the release; + I need first to assure that this is done only if we have + 1 initial node. + +Wed May 31 13:53:41 PST 2006 Aleksey Sanin <aleksey@aleksey.com> + + * xpath.c: fixed memory leak in xpath error reporting + +Wed May 31 15:30:16 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * libxml.h triodef.h: applied patch from Olli Savia for LynxOS + +Wed May 31 14:33:00 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c include/libxml/xpath.h runsuite.c: + Changed the name of the recently added public function + xmlXPathContextSetObjectCache() to + xmlXPathContextSetCache(); so a more generic one, in + case we decide to cache more things than only XPath + objects. + +Tue May 30 21:36:16 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Optimized xmlXPathNodeCollectAndTest() and + xmlXPathNodeCollectAndTestNth() to evaluate a compound + traversal of 2 axes when we have a "//foo" expression. + This is done with a rewrite of the XPath AST in + xmlXPathRewriteDOSExpression(); I added an additional field + to xmlXPathStepOp for this (but the field's name should be + changed). The mechanism: the embracing descendant-or-self + axis traversal (also optimized to return only nodes which + can hold elements), will produce context nodes for the + inner traversal of the child axis. This way we avoid a full + node-collecting traversal of the descendant-or-self axis. + Some tests indicate that this can reduce execution time of + "//foo" to 50%. Together with the XPath object cache this + all significantly speeds up libxslt. + +Tue May 30 11:38:47 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xmlschemas.c: A warning will now be reported in the value of + the XSD attribute 'schemaLocation' does not consist of tuples + (namespace-name, document-URI). A warning will be reported + if a schema document could not be found at the specified + location (via 'schemaLocation' or + 'noNamespaceSchemaLocation'). + * include/libxml/xmlerror.h: Added XML_SCHEMAV_MISC to + xmlParserErrors. + +Tue May 30 11:21:34 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Enhanced xmlXPathNodeCollectAndTest() to avoid + recreation (if possible) of the node-set which is used to + collect the nodes in the current axis for the currect context + node. Especially for "//foo" this will decrease dramatically + the number of created node-sets, since for each node in the + result node-set of the evaluation of descendant-or-self::node() + a new temporary node-set was created. Added node iterator + xmlXPathNextChildElement() as a tiny optimization for + child::foo. + +Mon May 29 18:06:17 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c include/libxml/xpath.h: Added an XPath object cache. + It sits on an xmlXPathContext and need to be explicitely + activated (or deactivated again) with + xmlXPathContextSetObjectCache(). The cache consists of 5 + lists for node-set, string, number, boolean and misc XPath + objects. Internally the xpath.c module will use object- + deposition and -acquisition functions which will try to reuse + as many XPath objects as possible, and fallback to normal + free/create behaviour if no cache is available or if the cache + is full. + * runsuite.c: Adjusted to deactivate the cache for XML Schema + tests if a cache-creation is turned on by default for the whole + library, e.g. for testing purposes of the cache. It is + deactivated here in order to avoid confusion of the memory leak + detection in runsuite.c. + +Wed May 24 10:54:25 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Removed a memcpy if xmlXPathNodeSetMerge(); it + seems we really need to walk the whole list, since those + nastly namespace nodes need to be added with + xmlXPathNodeSetDupNs(); thus a pure memcpy is not possible. + A flag on the node-set indicating if namespace nodes are in + the set would help here; this is the 3rd flag which would + be usefull with node-sets. The current flags I have in mind: + 1) Is a node-set already sorted? + This would allow for rebust and optimizable sorting + behaviour. + 2) Of what type are the nodes in the set (or of mixed type)? + This would allow for faster merging of node-sets. + 3) Are namespace nodes in the set? + This would allow to skipp all the namespace node specific + special handling. Faster node-set merging if the first + set is empty; just memcpy the set. + +Mon May 22 17:14:00 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Optimization of count(): eliminated sorting + (see bug #165547). Optimization of XPATH_OP_FILTER if the + predicate is a [1] (disable with XP_OPTIMIZED_FILTER_FIRST if + it produces trouble). Tiny opt in xmlXPathNodeSetMerge(). + +Mon May 22 13:33:12 CEST 2006 Rob Richards <rrichards@ctindustries.net> + + * tree.c: Revert behavior change in xmlSetProp to handle attributes + with colons in name and no namespace. + +Fri May 19 21:56:43 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Substituted all remaining calls to xmlXPathCmpNodes() + for xmlXPathCmpNodesExt(). Tiny further enhancement of + xmlXPathCmpNodesExt(). Added additional checks in various code + parts to avoid calling sorting or merging functions if the + node-set(s) don't need them; i.e., if they are empty or contain + just one node. + +Fri May 19 13:16:58 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Optimized the comparison for non-element nodes + in xmlXPathCmpNodesExt(); the comparison is used for sorting + of node-sets. This enhancement is related to bug #165547. + There are other places where the old comparison function + xmlXPathCmpNodes() is still called, but I currently don't + know exactly what those calls are for; thus if they can be + substituted (if it makes sense) for the new function. + +Tue May 16 16:55:13 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xpath.c: Applied patch from Rob Richards, fixing a potential + memory leak in xmlXPathTryStreamCompile(), when a list of + namespaces was assigned to the XPath compilation context; + here a new namespace list was created and passed to + xmlPatterncompile(); but this list was not freed afterwards. + Additionally we avoid now in xmlXPathTryStreamCompile() to + compile the expression, if it has a colon - indicating + prefixed name tests - and no namespace list was given. The + streaming XPath mechanism needs a namespace list at + compilation time (unlike normal XPath, where we can bind + namespace names to prefixes at execution time). + * pattern.c: Enhanced to use a string dict for local-names, + ns-prefixes and and namespace-names. + Fixed xmlStreamPushInternal() not to use string-pointer + comparison if a dict is available; this won't work, since + one does not know it the given strings originate from the + same dict - and they normally don't do, since e.g. + namespaces are hold on xmlNs->href. I think this would be + worth an investigation: if we can add a @doc field to xmlNs + and put the @href in to a additionan namespace dict hold + in xmlDoc. Daniel will surely not like this idea :-) But + evaluation of tons of elements/attributes in namespaces + with xmlStrEqual() isn't the way we should go forever. + +Thu May 11 18:03:49 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xmlschemas.c: Fixed bug #341337, reported by David Grohmann. + The code expected a node (xmlNodePtr) on the info for a + non-existent default attribute, which clearly cannot be + expected, since the attribute does not exist. I can only + guess that this sneaked trying to eliminate the query + for the owner-element, which is unavoidable actually. + Note that creation of default attributes won't have an + effect if validating via SAX/XMLReader; i.e., the processor + won't fire additional start-attribute events (I'm not even + sure if Libxml2 has such a SAX-event; I think it hands them + all over in the start-element event). + +Tue May 9 21:47:58 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xmlschemas.c: Fixed bug #341150, reported by Michael Romer. + In xmlSchemaBuildContentModelForSubstGroup(), + xmlAutomataNewOnceTrans2() was incorrectly used instead of + xmlAutomataNewTransition2() to mimic a xs:choice for + substitution-groups. + * test/schemas/subst-group-1_1.xsd + test/schemas/subst-group-1_0.xml + result/schemas/subst-group-1_0_1 + result/schemas/subst-group-1_0_1.err: Added regression test + supplied by Michael Romer for bug #341150. + +Sat May 6 11:05:24 HKT 2006 William M. Brack <wbrack@mmm.com.hk> + + * relaxng.c: Fixed compilation error with patch supplied by + Graham Bennett. + +Thu May 4 19:14:03 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> + + * xmlschemas.c: We'll raise an internal error and stop + validation now when an entity is found in the instance + document, since we don't support automatic entity + substitution by the schema processor (yet?) - + see bug #340316, reported by Nick Wellnhofer. + +Wed May 3 15:16:00 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * configure.in: applied another Python detection patch from Joseph Sacco + * libxml.spec.in: cleanup the changelog section, asciifies the spec file + too + +Tue May 2 22:34:54 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * xmlIO.c: fix a mix of code and declarations showing up on Windows + patch from Kjartan Maraas, fixing #340404 + +Tue May 2 14:24:40 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * encoding.c: fixing bug #340398 xmlCharEncOutFunc writing to + input buffer + Fri Apr 28 18:29:22 CEST 2006 Daniel Veillard <daniel@veillard.com> * NEWS configure.in doc//*: preparing 2.6.24 release, fixed Python diff --git a/Makefile.in b/Makefile.in index a0805b2..97d424c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -253,6 +253,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -380,15 +381,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -405,23 +400,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59e. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -16,11 +17,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -29,8 +54,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +104,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +124,386 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells which exist, to save several forks. + if test -f "$as_shell" && + { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +512,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +533,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -395,29 +688,26 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 </dev/null 6>&1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -454,17 +744,247 @@ ac_includes_default="\ #endif #if HAVE_INTTYPES_H # include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif +#endif +#if HAVE_STDINT_H +# include <stdint.h> #endif #if HAVE_UNISTD_H # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXML_MAJOR_VERSION LIBXML_MINOR_VERSION LIBXML_MICRO_VERSION LIBXML_VERSION LIBXML_VERSION_INFO LIBXML_VERSION_NUMBER LIBXML_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR PERL XMLLINT XSLTPROC EGREP U ANSI2KNR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT HTML_DIR Z_CFLAGS Z_LIBS PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR WITH_MODULES MODULE_PLATFORM_LIBS MODULE_EXTENSION TEST_MODULES STATIC_BINARIES WITH_TRIO_SOURCES_TRUE WITH_TRIO_SOURCES_FALSE WITH_TRIO THREAD_LIBS BASE_THREAD_LIBS WITH_THREADS THREAD_CFLAGS TEST_THREADS THREADS_W32 WITH_TREE WITH_FTP FTP_OBJ WITH_HTTP HTTP_OBJ WITH_LEGACY WITH_READER READER_TEST WITH_WRITER WITH_PATTERN TEST_PATTERN WITH_SAX1 TEST_SAX WITH_PUSH TEST_PUSH WITH_HTML HTML_OBJ TEST_HTML TEST_PHTML WITH_VALID TEST_VALID TEST_VTIME WITH_CATALOG CATALOG_OBJ TEST_CATALOG WITH_DOCB DOCB_OBJ WITH_XPTR XPTR_OBJ TEST_XPTR WITH_C14N C14N_OBJ TEST_C14N WITH_XINCLUDE XINCLUDE_OBJ TEST_XINCLUDE WITH_XPATH XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV WITH_ISO8859X WITH_SCHEMATRON TEST_SCHEMATRON WITH_SCHEMAS TEST_SCHEMAS WITH_REGEXPS TEST_REGEXPS WITH_DEBUG DEBUG_OBJ TEST_DEBUG WITH_MEM_DEBUG WITH_RUN_DEBUG WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS CYGWIN_EXTRA_LDFLAGS CYGWIN_EXTRA_PYTHON_LIBADD XML_CFLAGS XML_LIBDIR XML_LIBS XML_LIBTOOLLIBS ICONV_LIBS XML_INCLUDEDIR HAVE_ISNAN HAVE_ISINF PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES M_LIBS RDL_LIBS RELDATE PYTHON_TESTS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +LIBXML_MAJOR_VERSION +LIBXML_MINOR_VERSION +LIBXML_MICRO_VERSION +LIBXML_VERSION +LIBXML_VERSION_INFO +LIBXML_VERSION_NUMBER +LIBXML_VERSION_EXTRA +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +RM +MV +TAR +PERL +XMLLINT +XSLTPROC +GREP +EGREP +U +ANSI2KNR +LN_S +ECHO +AR +RANLIB +DLLTOOL +AS +OBJDUMP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +HTML_DIR +Z_CFLAGS +Z_LIBS +PYTHON +WITH_PYTHON_TRUE +WITH_PYTHON_FALSE +pythondir +PYTHON_SUBDIR +WITH_MODULES +MODULE_PLATFORM_LIBS +MODULE_EXTENSION +TEST_MODULES +STATIC_BINARIES +WITH_TRIO_SOURCES_TRUE +WITH_TRIO_SOURCES_FALSE +WITH_TRIO +THREAD_LIBS +BASE_THREAD_LIBS +WITH_THREADS +THREAD_CFLAGS +TEST_THREADS +THREADS_W32 +WITH_TREE +WITH_FTP +FTP_OBJ +WITH_HTTP +HTTP_OBJ +WITH_LEGACY +WITH_READER +READER_TEST +WITH_WRITER +WITH_PATTERN +TEST_PATTERN +WITH_SAX1 +TEST_SAX +WITH_PUSH +TEST_PUSH +WITH_HTML +HTML_OBJ +TEST_HTML +TEST_PHTML +WITH_VALID +TEST_VALID +TEST_VTIME +WITH_CATALOG +CATALOG_OBJ +TEST_CATALOG +WITH_DOCB +DOCB_OBJ +WITH_XPTR +XPTR_OBJ +TEST_XPTR +WITH_C14N +C14N_OBJ +TEST_C14N +WITH_XINCLUDE +XINCLUDE_OBJ +TEST_XINCLUDE +WITH_XPATH +XPATH_OBJ +TEST_XPATH +WITH_OUTPUT +WITH_ICONV +WITH_ISO8859X +WITH_SCHEMATRON +TEST_SCHEMATRON +WITH_SCHEMAS +TEST_SCHEMAS +WITH_REGEXPS +TEST_REGEXPS +WITH_DEBUG +DEBUG_OBJ +TEST_DEBUG +WITH_MEM_DEBUG +WITH_RUN_DEBUG +WIN32_EXTRA_LIBADD +WIN32_EXTRA_LDFLAGS +CYGWIN_EXTRA_LDFLAGS +CYGWIN_EXTRA_PYTHON_LIBADD +XML_CFLAGS +XML_LIBDIR +XML_LIBS +XML_LIBTOOLLIBS +ICONV_LIBS +XML_INCLUDEDIR +HAVE_ISNAN +HAVE_ISINF +PYTHON_VERSION +PYTHON_INCLUDES +PYTHON_SITE_PACKAGES +M_LIBS +RDL_LIBS +RELDATE +PYTHON_TESTS +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS' + # Initialize some variables set by options. ac_init_help= @@ -491,34 +1011,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -540,12 +1074,18 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -553,7 +1093,17 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` @@ -562,11 +1112,7 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -593,6 +1139,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -617,13 +1169,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -688,6 +1243,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -744,11 +1309,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -757,7 +1318,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -788,8 +1349,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -809,27 +1369,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -856,94 +1408,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -972,9 +1506,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -992,15 +1523,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1025,10 +1563,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1042,8 +1578,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] --with-c14n add the Canonicalization support (on) --with-catalog add the Catalog support (on) --with-debug add the debugging module (on) @@ -1089,8 +1624,8 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags @@ -1102,118 +1637,86 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.59e -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.59e. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1232,7 +1735,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1246,6 +1749,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1267,7 +1771,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1278,7 +1781,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1300,9 +1803,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1313,8 +1814,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1327,20 +1828,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1351,22 +1866,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1378,26 +1899,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1428,14 +1947,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1451,8 +1973,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1464,12 +1986,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1494,8 +2015,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1512,12 +2032,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1534,93 +2048,133 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=24 +LIBXML_MICRO_VERSION=26 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 @@ -1659,8 +2213,8 @@ am__api_version="1.9" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1682,7 +2236,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1701,21 +2255,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1725,8 +2280,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1768,20 +2323,20 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1833,8 +2388,8 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1847,54 +2402,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1965,8 +2523,8 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1979,32 +2537,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2017,27 +2577,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -2066,8 +2640,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2080,32 +2654,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2118,36 +2694,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2160,74 +2751,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2241,7 +2792,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2252,6 +2803,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2269,22 +2821,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2297,36 +2850,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2339,29 +2894,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2374,21 +2945,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2413,46 +2998,70 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2465,19 +3074,23 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2496,22 +3109,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2522,9 +3140,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2538,14 +3155,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2565,14 +3182,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2590,12 +3213,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2618,23 +3241,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2643,24 +3279,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2676,23 +3316,147 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2701,12 +3465,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2722,12 +3494,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2761,10 +3533,10 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; int test (int i, double x); @@ -2781,201 +3553,74 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2983,7 +3628,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2993,8 +3638,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -3021,15 +3666,15 @@ if test "$am__include" = "#"; then fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -3049,8 +3694,8 @@ fi depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3139,8 +3784,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3169,8 +3814,8 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3192,7 +3837,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3211,21 +3856,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3240,8 +3886,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3275,8 +3921,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3301,9 +3952,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3313,8 +3965,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3341,6 +3998,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3358,8 +4016,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3382,8 +4040,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3408,9 +4071,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3420,8 +4084,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3448,6 +4117,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3471,8 +4141,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_RM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3487,32 +4157,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_RM" && ac_cv_path_RM="/bin/rm" ;; esac fi RM=$ac_cv_path_RM - if test -n "$RM"; then - echo "$as_me:$LINENO: result: $RM" >&5 -echo "${ECHO_T}$RM" >&6 + { echo "$as_me:$LINENO: result: $RM" >&5 +echo "${ECHO_T}$RM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MV+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3527,32 +4198,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_MV" && ac_cv_path_MV="/bin/mv" ;; esac fi MV=$ac_cv_path_MV - if test -n "$MV"; then - echo "$as_me:$LINENO: result: $MV" >&5 -echo "${ECHO_T}$MV" >&6 + { echo "$as_me:$LINENO: result: $MV" >&5 +echo "${ECHO_T}$MV" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_TAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3567,32 +4239,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_TAR" && ac_cv_path_TAR="/bin/tar" ;; esac fi TAR=$ac_cv_path_TAR - if test -n "$TAR"; then - echo "$as_me:$LINENO: result: $TAR" >&5 -echo "${ECHO_T}$TAR" >&6 + { echo "$as_me:$LINENO: result: $TAR" >&5 +echo "${ECHO_T}$TAR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3607,32 +4280,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="/usr/bin/perl" ;; esac fi PERL=$ac_cv_path_PERL - if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 + { echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XMLLINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3647,32 +4321,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/usr/bin/xmllint" ;; esac fi XMLLINT=$ac_cv_path_XMLLINT - if test -n "$XMLLINT"; then - echo "$as_me:$LINENO: result: $XMLLINT" >&5 -echo "${ECHO_T}$XMLLINT" >&6 + { echo "$as_me:$LINENO: result: $XMLLINT" >&5 +echo "${ECHO_T}$XMLLINT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XSLTPROC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3687,34 +4362,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="/usr/bin/xsltproc" ;; esac fi XSLTPROC=$ac_cv_path_XSLTPROC - if test -n "$XSLTPROC"; then - echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -echo "${ECHO_T}$XSLTPROC" >&6 + { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +echo "${ECHO_T}$XSLTPROC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for function prototypes" >&5 -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 -if test "$ac_cv_prog_cc_stdc" != no; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + +{ echo "$as_me:$LINENO: checking for function prototypes" >&5 +echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; } +if test "$ac_cv_prog_cc_c89" != no; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define PROTOTYPES 1 @@ -3726,29 +4402,176 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3772,23 +4595,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3797,8 +4633,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -3855,6 +4692,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ctype.h> +#include <stdlib.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -3874,18 +4712,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3898,12 +4745,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -3926,9 +4775,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -3942,23 +4791,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3967,12 +4829,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -3995,18 +4859,19 @@ fi for ac_header in string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4017,23 +4882,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4042,15 +4920,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4059,8 +4938,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4084,9 +4968,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -4110,25 +4995,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -4147,10 +5026,9 @@ echo "$as_me: error: Compiler not ANSI compliant" >&2;} -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -4169,12 +5047,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi + -# Check whether --enable-static or --disable-static was given. +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -4193,12 +5071,12 @@ if test "${enable_static+set}" = set; then esac else enable_static=yes -fi; +fi + -# Check whether --enable-fast-install or --disable-fast-install was given. +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -4217,10 +5095,11 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4273,22 +5152,22 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4317,11 +5196,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4354,17 +5233,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4378,20 +5257,20 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4408,8 +5287,8 @@ case $host_os in ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4457,23 +5336,23 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4648,8 +5527,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4666,11 +5545,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} # Allow CC to be a program name with arguments. compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -4697,7 +5576,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4700 "configure"' > conftest.$ac_ext + echo '#line 5579 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4782,8 +5661,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4809,23 +5688,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4834,8 +5726,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c @@ -4845,8 +5738,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -4876,8 +5769,8 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4890,32 +5783,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4928,27 +5823,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - DLLTOOL=$ac_ct_DLLTOOL + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi else DLLTOOL="$ac_cv_prog_DLLTOOL" fi @@ -4956,8 +5865,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4970,32 +5879,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5008,27 +5919,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AS=$ac_ct_AS + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi else AS="$ac_cv_prog_AS" fi @@ -5036,8 +5961,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5050,32 +5975,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5088,27 +6015,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - OBJDUMP=$ac_ct_OBJDUMP + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi else OBJDUMP="$ac_cv_prog_OBJDUMP" fi @@ -5124,18 +6065,19 @@ need_locks="$enable_libtool_lock" for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5146,23 +6088,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5171,15 +6126,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5188,8 +6144,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5213,9 +6174,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5239,25 +6201,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5269,18 +6225,22 @@ fi done -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5293,36 +6253,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5335,55 +6297,85 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5406,23 +6398,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5431,24 +6436,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5464,23 +6473,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5489,69 +6511,53 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5560,61 +6566,92 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - break + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h fi -ac_ext=cc +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5622,8 +6659,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5712,8 +6749,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -5734,13 +6771,13 @@ fi if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5770,8 +6807,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5796,9 +6838,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5808,8 +6851,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5836,6 +6884,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5853,8 +6902,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5877,8 +6926,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5903,9 +6957,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5915,8 +6970,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5943,6 +7003,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5958,7 +7019,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5972,12 +7033,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5990,36 +7051,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6032,48 +7095,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:6062:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -6083,8 +7176,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6097,23 +7190,36 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6122,20 +7228,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6146,23 +7253,36 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6171,13 +7291,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -6206,8 +7327,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6315,19 +7436,19 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6531,15 +7652,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6553,8 +7674,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6605,8 +7726,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6619,32 +7740,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6657,27 +7780,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -6685,8 +7822,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6699,32 +7836,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6737,27 +7876,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -6765,8 +7918,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6779,32 +7932,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6817,27 +7972,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -6896,8 +8065,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6949,17 +8118,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7011,11 +8180,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -7030,21 +8199,21 @@ esac enable_dlopen=no enable_win32_dll=yes -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -7102,8 +8271,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7120,11 +8289,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7123: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8292: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7127: \$? = $ac_status" >&5 + echo "$as_me:8296: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7137,8 +8306,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -7152,8 +8321,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7362,16 +8531,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7388,11 +8557,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7391: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8560: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7395: \$? = $ac_status" >&5 + echo "$as_me:8564: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7405,8 +8574,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7433,8 +8602,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7461,8 +8630,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -7471,8 +8640,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7492,11 +8661,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7495: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8664: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7499: \$? = $ac_status" >&5 + echo "$as_me:8668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7518,23 +8687,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -7544,8 +8713,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -7961,23 +9130,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7991,7 +9173,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8021,23 +9205,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8051,7 +9248,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8501,8 +9700,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -8522,8 +9721,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8560,16 +9759,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -9144,8 +10343,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -9153,8 +10352,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -9178,8 +10377,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -9192,29 +10391,29 @@ fi striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -9246,8 +10445,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9260,39 +10459,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9301,14 +10513,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -9322,8 +10535,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9350,52 +10563,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9404,18 +10624,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9428,39 +10649,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9469,19 +10703,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9508,52 +10743,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9562,18 +10804,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9586,39 +10829,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9627,19 +10883,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9652,39 +10909,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9693,19 +10963,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9718,39 +10989,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9759,14 +11043,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -9806,8 +11091,8 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9817,7 +11102,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9820 "configure" +#line 11105 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9901,13 +11186,13 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9917,7 +11202,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9920 "configure" +#line 11205 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10001,8 +11286,8 @@ rm -fr conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -10024,13 +11309,13 @@ fi # Report which library types will actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -10050,15 +11335,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -10550,11 +11835,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10608,7 +11893,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10727,18 +12012,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -10767,11 +12052,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10804,17 +12089,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10828,8 +12113,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10879,8 +12164,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -10992,23 +12277,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11022,7 +12320,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11053,23 +12353,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11083,7 +12396,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11815,8 +13130,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -11955,8 +13270,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -12229,16 +13544,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12255,11 +13570,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12258: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13573: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12262: \$? = $ac_status" >&5 + echo "$as_me:13577: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12272,8 +13587,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -12300,8 +13615,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12328,8 +13643,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } if test x"$lt_prog_compiler_static_works_CXX" = xyes; then : @@ -12338,8 +13653,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12359,11 +13674,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13677: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12366: \$? = $ac_status" >&5 + echo "$as_me:13681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12385,23 +13700,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -12411,8 +13726,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -12439,8 +13754,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -12460,8 +13775,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12498,16 +13813,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -13082,8 +14397,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -13091,8 +14406,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -13116,8 +14431,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -13642,13 +14957,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -13667,15 +14982,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -13684,8 +14999,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -13894,16 +15209,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13920,11 +15235,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13923: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15238: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13927: \$? = $ac_status" >&5 + echo "$as_me:15242: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13937,8 +15252,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -13965,8 +15280,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13993,8 +15308,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } if test x"$lt_prog_compiler_static_works_F77" = xyes; then : @@ -14003,8 +15318,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14024,11 +15339,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15342: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14031: \$? = $ac_status" >&5 + echo "$as_me:15346: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14050,23 +15365,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -14076,8 +15391,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -14483,23 +15798,36 @@ _LT_EOF end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14513,7 +15841,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14533,23 +15863,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14563,7 +15906,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15013,8 +16358,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -15034,8 +16379,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -15072,16 +16417,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -15656,8 +17001,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15665,8 +17010,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -15690,8 +17035,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -16128,7 +17473,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -16196,8 +17540,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16214,11 +17558,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16217: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17561: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16221: \$? = $ac_status" >&5 + echo "$as_me:17565: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16231,8 +17575,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -16246,8 +17590,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -16456,16 +17800,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16482,11 +17826,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16485: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17829: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16489: \$? = $ac_status" >&5 + echo "$as_me:17833: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16499,8 +17843,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -16527,8 +17871,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16555,8 +17899,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then : @@ -16565,8 +17909,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16586,11 +17930,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16589: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17933: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16593: \$? = $ac_status" >&5 + echo "$as_me:17937: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16612,23 +17956,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16638,8 +17982,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -17055,23 +18399,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -17085,7 +18442,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17115,23 +18474,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -17145,7 +18517,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17595,8 +18969,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -17616,8 +18990,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17654,16 +19028,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -18238,8 +19612,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -18247,8 +19621,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -18272,8 +19646,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -18709,7 +20083,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -19241,17 +20614,17 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no -fi; - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then @@ -19271,245 +20644,245 @@ _cppflags="${CPPFLAGS}" _ldflags="${LDFLAGS}" -# Check whether --with-c14n or --without-c14n was given. +# Check whether --with-c14n was given. if test "${with_c14n+set}" = set; then - withval="$with_c14n" + withval=$with_c14n; +fi -fi; -# Check whether --with-catalog or --without-catalog was given. +# Check whether --with-catalog was given. if test "${with_catalog+set}" = set; then - withval="$with_catalog" + withval=$with_catalog; +fi -fi; -# Check whether --with-debug or --without-debug was given. +# Check whether --with-debug was given. if test "${with_debug+set}" = set; then - withval="$with_debug" + withval=$with_debug; +fi -fi; -# Check whether --with-docbook or --without-docbook was given. +# Check whether --with-docbook was given. if test "${with_docbook+set}" = set; then - withval="$with_docbook" + withval=$with_docbook; +fi -fi; -# Check whether --with-fexceptions or --without-fexceptions was given. +# Check whether --with-fexceptions was given. if test "${with_fexceptions+set}" = set; then - withval="$with_fexceptions" + withval=$with_fexceptions; +fi -fi; -# Check whether --with-ftp or --without-ftp was given. +# Check whether --with-ftp was given. if test "${with_ftp+set}" = set; then - withval="$with_ftp" + withval=$with_ftp; +fi -fi; -# Check whether --with-history or --without-history was given. +# Check whether --with-history was given. if test "${with_history+set}" = set; then - withval="$with_history" + withval=$with_history; +fi -fi; -# Check whether --with-html or --without-html was given. +# Check whether --with-html was given. if test "${with_html+set}" = set; then - withval="$with_html" + withval=$with_html; +fi -fi; -# Check whether --with-html-dir or --without-html-dir was given. +# Check whether --with-html-dir was given. if test "${with_html_dir+set}" = set; then - withval="$with_html_dir" - HTML_DIR=$withval + withval=$with_html_dir; HTML_DIR=$withval else HTML_DIR='$(datadir)/doc' -fi; +fi + -# Check whether --with-html-subdir or --without-html-subdir was given. +# Check whether --with-html-subdir was given. if test "${with_html_subdir+set}" = set; then - withval="$with_html_subdir" - test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval" + withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval" else HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html" -fi; +fi + -# Check whether --with-http or --without-http was given. +# Check whether --with-http was given. if test "${with_http+set}" = set; then - withval="$with_http" + withval=$with_http; +fi -fi; -# Check whether --with-iconv or --without-iconv was given. +# Check whether --with-iconv was given. if test "${with_iconv+set}" = set; then - withval="$with_iconv" + withval=$with_iconv; +fi -fi; -# Check whether --with-iso8859x or --without-iso8859x was given. +# Check whether --with-iso8859x was given. if test "${with_iso8859x+set}" = set; then - withval="$with_iso8859x" + withval=$with_iso8859x; +fi -fi; -# Check whether --with-legacy or --without-legacy was given. +# Check whether --with-legacy was given. if test "${with_legacy+set}" = set; then - withval="$with_legacy" + withval=$with_legacy; +fi -fi; -# Check whether --with-mem_debug or --without-mem_debug was given. +# Check whether --with-mem_debug was given. if test "${with_mem_debug+set}" = set; then - withval="$with_mem_debug" + withval=$with_mem_debug; +fi -fi; -# Check whether --with-minimum or --without-minimum was given. +# Check whether --with-minimum was given. if test "${with_minimum+set}" = set; then - withval="$with_minimum" + withval=$with_minimum; +fi -fi; -# Check whether --with-output or --without-output was given. +# Check whether --with-output was given. if test "${with_output+set}" = set; then - withval="$with_output" + withval=$with_output; +fi -fi; -# Check whether --with-pattern or --without-pattern was given. +# Check whether --with-pattern was given. if test "${with_pattern+set}" = set; then - withval="$with_pattern" + withval=$with_pattern; +fi -fi; -# Check whether --with-push or --without-push was given. +# Check whether --with-push was given. if test "${with_push+set}" = set; then - withval="$with_push" + withval=$with_push; +fi -fi; -# Check whether --with-python or --without-python was given. +# Check whether --with-python was given. if test "${with_python+set}" = set; then - withval="$with_python" + withval=$with_python; +fi -fi; -# Check whether --with-reader or --without-reader was given. +# Check whether --with-reader was given. if test "${with_reader+set}" = set; then - withval="$with_reader" + withval=$with_reader; +fi -fi; -# Check whether --with-readline or --without-readline was given. +# Check whether --with-readline was given. if test "${with_readline+set}" = set; then - withval="$with_readline" - + withval=$with_readline; if test "$withval" != "no" -a "$withval" != "yes"; then RDL_DIR=$withval CPPFLAGS="${CPPFLAGS} -I$withval/include" LDFLAGS="${LDFLAGS} -L$withval/lib" fi -fi; +fi + -# Check whether --with-regexps or --without-regexps was given. +# Check whether --with-regexps was given. if test "${with_regexps+set}" = set; then - withval="$with_regexps" + withval=$with_regexps; +fi -fi; -# Check whether --with-run_debug or --without-run_debug was given. +# Check whether --with-run_debug was given. if test "${with_run_debug+set}" = set; then - withval="$with_run_debug" + withval=$with_run_debug; +fi -fi; -# Check whether --with-sax1 or --without-sax1 was given. +# Check whether --with-sax1 was given. if test "${with_sax1+set}" = set; then - withval="$with_sax1" + withval=$with_sax1; +fi -fi; -# Check whether --with-schemas or --without-schemas was given. +# Check whether --with-schemas was given. if test "${with_schemas+set}" = set; then - withval="$with_schemas" + withval=$with_schemas; +fi -fi; -# Check whether --with-schematron or --without-schematron was given. +# Check whether --with-schematron was given. if test "${with_schematron+set}" = set; then - withval="$with_schematron" + withval=$with_schematron; +fi -fi; -# Check whether --with-threads or --without-threads was given. +# Check whether --with-threads was given. if test "${with_threads+set}" = set; then - withval="$with_threads" + withval=$with_threads; +fi -fi; -# Check whether --with-thread-alloc or --without-thread-alloc was given. +# Check whether --with-thread-alloc was given. if test "${with_thread_alloc+set}" = set; then - withval="$with_thread_alloc" + withval=$with_thread_alloc; +fi -fi; -# Check whether --with-tree or --without-tree was given. +# Check whether --with-tree was given. if test "${with_tree+set}" = set; then - withval="$with_tree" + withval=$with_tree; +fi -fi; -# Check whether --with-valid or --without-valid was given. +# Check whether --with-valid was given. if test "${with_valid+set}" = set; then - withval="$with_valid" + withval=$with_valid; +fi -fi; -# Check whether --with-writer or --without-writer was given. +# Check whether --with-writer was given. if test "${with_writer+set}" = set; then - withval="$with_writer" + withval=$with_writer; +fi -fi; -# Check whether --with-xinclude or --without-xinclude was given. +# Check whether --with-xinclude was given. if test "${with_xinclude+set}" = set; then - withval="$with_xinclude" + withval=$with_xinclude; +fi -fi; -# Check whether --with-xpath or --without-xpath was given. +# Check whether --with-xpath was given. if test "${with_xpath+set}" = set; then - withval="$with_xpath" + withval=$with_xpath; +fi -fi; -# Check whether --with-xptr or --without-xptr was given. +# Check whether --with-xptr was given. if test "${with_xptr+set}" = set; then - withval="$with_xptr" + withval=$with_xptr; +fi -fi; -# Check whether --with-modules or --without-modules was given. +# Check whether --with-modules was given. if test "${with_modules+set}" = set; then - withval="$with_modules" + withval=$with_modules; +fi -fi; -# Check whether --with-zlib or --without-zlib was given. +# Check whether --with-zlib was given. if test "${with_zlib+set}" = set; then - withval="$with_zlib" - + withval=$with_zlib; if test "$withval" != "no" -a "$withval" != "yes"; then Z_DIR=$withval CPPFLAGS="${CPPFLAGS} -I$withval/include" LDFLAGS="${LDFLAGS} -L$withval/lib" fi -fi; +fi + if test "$with_schemas" = "yes" then @@ -19681,18 +21054,19 @@ else for ac_header in zlib.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19703,23 +21077,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19728,15 +21115,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19745,8 +21133,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19770,9 +21163,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -19796,33 +21190,27 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - echo "$as_me:$LINENO: checking for gzread in -lz" >&5 -echo $ECHO_N "checking for gzread in -lz... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gzread in -lz" >&5 +echo $ECHO_N "checking for gzread in -lz... $ECHO_C" >&6; } if test "${ac_cv_lib_z_gzread+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19835,39 +21223,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gzread (); int main () { -gzread (); +return gzread (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19876,14 +21277,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_z_gzread=no + ac_cv_lib_z_gzread=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzread" >&5 -echo "${ECHO_T}$ac_cv_lib_z_gzread" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzread" >&5 +echo "${ECHO_T}$ac_cv_lib_z_gzread" >&6; } if test $ac_cv_lib_z_gzread = yes; then @@ -19926,9 +21328,9 @@ echo Checking headers ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -19950,23 +21352,36 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19975,12 +21390,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -19992,13 +21409,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20006,124 +21422,99 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20131,120 +21522,96 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20268,23 +21635,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20293,8 +21673,9 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -20351,6 +21732,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ctype.h> +#include <stdlib.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -20370,18 +21752,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20394,12 +21785,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -20412,18 +21805,19 @@ fi for ac_header in fcntl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20434,23 +21828,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20459,15 +21866,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20476,8 +21884,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20501,9 +21914,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20527,25 +21941,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20561,18 +21969,19 @@ done for ac_header in unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20583,23 +21992,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20608,15 +22030,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20625,8 +22048,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20650,9 +22078,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20676,25 +22105,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20710,18 +22133,19 @@ done for ac_header in ctype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20732,23 +22156,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20757,15 +22194,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20774,8 +22212,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20799,9 +22242,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20825,25 +22269,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20859,18 +22297,19 @@ done for ac_header in dirent.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20881,23 +22320,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20906,15 +22358,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20923,8 +22376,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -20948,9 +22406,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20974,25 +22433,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21008,18 +22461,19 @@ done for ac_header in errno.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21030,23 +22484,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21055,15 +22522,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21072,8 +22540,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21097,9 +22570,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21123,25 +22597,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21157,18 +22625,19 @@ done for ac_header in malloc.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21179,23 +22648,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21204,15 +22686,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21221,8 +22704,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21246,9 +22734,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21272,25 +22761,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21306,18 +22789,19 @@ done for ac_header in stdarg.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21328,23 +22812,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21353,15 +22850,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21370,8 +22868,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21395,9 +22898,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21421,25 +22925,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21455,18 +22953,19 @@ done for ac_header in sys/stat.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21477,23 +22976,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21502,15 +23014,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21519,8 +23032,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21544,9 +23062,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21570,25 +23089,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21604,18 +23117,19 @@ done for ac_header in sys/types.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21626,23 +23140,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21651,15 +23178,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21668,8 +23196,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21693,9 +23226,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21719,25 +23253,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21753,18 +23281,19 @@ done for ac_header in time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21775,23 +23304,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21800,15 +23342,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21817,8 +23360,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21842,9 +23390,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21868,25 +23417,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21902,18 +23445,19 @@ done for ac_header in ansidecl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21924,23 +23468,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21949,15 +23506,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21966,8 +23524,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21991,9 +23554,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22017,25 +23581,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22051,18 +23609,19 @@ done for ac_header in ieeefp.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22073,23 +23632,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22098,15 +23670,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22115,8 +23688,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22140,9 +23718,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22166,25 +23745,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22200,18 +23773,19 @@ done for ac_header in nan.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22222,23 +23796,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22247,15 +23834,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22264,8 +23852,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22289,9 +23882,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22315,25 +23909,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22349,18 +23937,19 @@ done for ac_header in math.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22371,23 +23960,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22396,15 +23998,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22413,8 +24016,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22438,9 +24046,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22464,25 +24073,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22498,18 +24101,19 @@ done for ac_header in limits.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22520,23 +24124,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22545,15 +24162,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22562,8 +24180,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22587,9 +24210,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22613,25 +24237,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22647,18 +24265,19 @@ done for ac_header in fp_class.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22669,23 +24288,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22694,15 +24326,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22711,8 +24344,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22736,9 +24374,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22762,25 +24401,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22796,18 +24429,19 @@ done for ac_header in float.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22818,23 +24452,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22843,15 +24490,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22860,8 +24508,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22885,9 +24538,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22911,25 +24565,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22945,18 +24593,19 @@ done for ac_header in stdlib.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22967,23 +24616,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22992,15 +24654,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23009,8 +24672,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23034,9 +24702,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23060,25 +24729,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -23094,9 +24757,9 @@ done for ac_header in sys/socket.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23113,23 +24776,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23138,12 +24814,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -23157,9 +24835,9 @@ done for ac_header in netinet/in.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23176,23 +24854,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23201,12 +24892,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -23220,9 +24913,9 @@ done for ac_header in arpa/inet.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -23242,23 +24935,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23267,12 +24973,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -23286,18 +24994,19 @@ done for ac_header in netdb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23308,23 +25017,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23333,15 +25055,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23350,8 +25073,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23375,9 +25103,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23401,25 +25130,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -23435,18 +25158,19 @@ done for ac_header in sys/time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23457,23 +25181,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23482,15 +25219,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23499,8 +25237,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23524,9 +25267,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23550,25 +25294,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -23584,18 +25322,19 @@ done for ac_header in sys/select.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23606,23 +25345,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23631,15 +25383,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23648,8 +25401,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23673,9 +25431,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23699,25 +25458,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -23733,18 +25486,19 @@ done for ac_header in sys/mman.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23755,23 +25509,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23780,15 +25547,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23797,8 +25565,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23822,9 +25595,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23848,25 +25622,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -23882,18 +25650,19 @@ done for ac_header in sys/timeb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23904,23 +25673,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -23929,15 +25711,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23946,8 +25729,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -23971,9 +25759,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -23997,25 +25786,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24031,18 +25814,19 @@ done for ac_header in signal.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24053,23 +25837,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24078,15 +25875,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24095,8 +25893,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -24120,9 +25923,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24146,25 +25950,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24180,9 +25978,9 @@ done for ac_header in arpa/nameser.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24199,23 +25997,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24224,12 +26035,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -24243,9 +26056,9 @@ done for ac_header in resolv.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24268,23 +26081,36 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24293,12 +26119,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -24312,18 +26140,19 @@ done for ac_header in dl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24334,23 +26163,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24359,15 +26201,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24376,8 +26219,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -24401,9 +26249,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24427,25 +26276,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24461,18 +26304,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24483,23 +26327,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24508,15 +26365,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24525,8 +26383,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -24550,9 +26413,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24576,25 +26440,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24614,9 +26472,9 @@ echo Checking libraries for ac_func in strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24642,52 +26500,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24696,13 +26561,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -24710,8 +26577,8 @@ _ACEOF else # strftime is in -lintl on SCO UNIX. -echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 +echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24724,39 +26591,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char strftime (); int main () { -strftime (); +return strftime (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24765,14 +26645,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_strftime=no + ac_cv_lib_intl_strftime=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } if test $ac_cv_lib_intl_strftime = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRFTIME 1 @@ -24790,9 +26671,9 @@ done for ac_func in strdup strndup strerror do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24818,52 +26699,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24872,13 +26760,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -24895,9 +26785,9 @@ done for ac_func in finite isnand fp_class class fpclass do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24923,52 +26813,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -24977,13 +26874,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -24999,9 +26898,9 @@ done for ac_func in strftime localtime gettimeofday ftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -25027,52 +26926,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25081,13 +26987,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -25102,9 +27010,9 @@ done for ac_func in stat _stat signal do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -25130,52 +27038,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25184,13 +27099,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -25211,9 +27128,9 @@ done for ac_func in printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -25239,52 +27156,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25293,13 +27217,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -25311,8 +27237,8 @@ fi done -echo "$as_me:$LINENO: checking for va_copy" >&5 -echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25330,23 +27256,36 @@ va_copy(ap1,ap2); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25355,12 +27294,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_va_copy=no + have_va_copy=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: result: $have_va_copy" >&5 -echo "${ECHO_T}$have_va_copy" >&6 +{ echo "$as_me:$LINENO: result: $have_va_copy" >&5 +echo "${ECHO_T}$have_va_copy" >&6; } if test x"$have_va_copy" = x"yes"; then cat >>confdefs.h <<\_ACEOF @@ -25368,8 +27308,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: checking for __va_copy" >&5 -echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for __va_copy" >&5 +echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25387,23 +27327,36 @@ __va_copy(ap1,ap2); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25412,12 +27365,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have___va_copy=no + have___va_copy=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: result: $have___va_copy" >&5 -echo "${ECHO_T}$have___va_copy" >&6 + { echo "$as_me:$LINENO: result: $have___va_copy" >&5 +echo "${ECHO_T}$have___va_copy" >&6; } if test x"$have___va_copy" = x"yes"; then cat >>confdefs.h <<\_ACEOF @@ -25427,13 +27381,12 @@ _ACEOF fi fi -echo "$as_me:$LINENO: checking for library containing gethostent" >&5 -echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 +echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } if test "${ac_cv_search_gethostent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_gethostent=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25441,123 +27394,98 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char gethostent (); -int -main () -{ -gethostent (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_gethostent="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_gethostent" = no; then - for ac_lib in nsl; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostent (); int main () { -gethostent (); +return gethostent (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_gethostent="-l$ac_lib" -break + ac_cv_search_gethostent=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_gethostent+set}" = set; then + break fi +done +if test "${ac_cv_search_gethostent+set}" = set; then + : +else + ac_cv_search_gethostent=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -echo "${ECHO_T}$ac_cv_search_gethostent" >&6 -if test "$ac_cv_search_gethostent" != no; then - test "$ac_cv_search_gethostent" = "none required" || LIBS="$ac_cv_search_gethostent $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } +ac_res=$ac_cv_search_gethostent +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 -echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } if test "${ac_cv_search_setsockopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_setsockopt=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25565,123 +27493,98 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char setsockopt (); -int -main () -{ -setsockopt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_setsockopt="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_setsockopt" = no; then - for ac_lib in socket net; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char setsockopt (); int main () { -setsockopt (); +return setsockopt (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' socket net; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_setsockopt="-l$ac_lib" -break + ac_cv_search_setsockopt=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_setsockopt+set}" = set; then + break +fi +done +if test "${ac_cv_search_setsockopt+set}" = set; then + : +else + ac_cv_search_setsockopt=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 -echo "${ECHO_T}$ac_cv_search_setsockopt" >&6 -if test "$ac_cv_search_setsockopt" != no; then - test "$ac_cv_search_setsockopt" = "none required" || LIBS="$ac_cv_search_setsockopt $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } +ac_res=$ac_cv_search_setsockopt +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -echo "$as_me:$LINENO: checking for library containing connect" >&5 -echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for library containing connect" >&5 +echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } if test "${ac_cv_search_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_connect=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25689,121 +27592,97 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char connect (); -int -main () -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_connect="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_connect" = no; then - for ac_lib in inet; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); int main () { -connect (); +return connect (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +for ac_lib in '' inet; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_connect="-l$ac_lib" -break + ac_cv_search_connect=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done + conftest$ac_exeext + if test "${ac_cv_search_connect+set}" = set; then + break fi +done +if test "${ac_cv_search_connect+set}" = set; then + : +else + ac_cv_search_connect=no +fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 -echo "${ECHO_T}$ac_cv_search_connect" >&6 -if test "$ac_cv_search_connect" != no; then - test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 +echo "${ECHO_T}$ac_cv_search_connect" >&6; } +ac_res=$ac_cv_search_connect +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5 -echo $ECHO_N "checking for type of socket length (socklen_t)... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5 +echo $ECHO_N "checking for type of socket length (socklen_t)... $ECHO_C" >&6; } cat > conftest.$ac_ext <<EOF -#line 25806 "configure" +#line 27685 "configure" #include "confdefs.h" #include <stddef.h> @@ -25814,11 +27693,11 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL) ; return 0; } EOF -if { (eval echo configure:25817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:27696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* - echo "$as_me:$LINENO: result: socklen_t *" >&5 -echo "${ECHO_T}socklen_t *" >&6 + { echo "$as_me:$LINENO: result: socklen_t *" >&5 +echo "${ECHO_T}socklen_t *" >&6; } XML_SOCKLEN_T=socklen_t else echo "configure: failed program was:" >&5 @@ -25826,7 +27705,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 25829 "configure" +#line 27708 "configure" #include "confdefs.h" #include <stddef.h> @@ -25837,11 +27716,11 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL) ; return 0; } EOF -if { (eval echo configure:25840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:27719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* - echo "$as_me:$LINENO: result: size_t *" >&5 -echo "${ECHO_T}size_t *" >&6 + { echo "$as_me:$LINENO: result: size_t *" >&5 +echo "${ECHO_T}size_t *" >&6; } XML_SOCKLEN_T=size_t else echo "configure: failed program was:" >&5 @@ -25849,7 +27728,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 25852 "configure" +#line 27731 "configure" #include "confdefs.h" #include <stddef.h> @@ -25860,11 +27739,11 @@ int main(void) { (void)getsockopt (1, 1, 1, NULL, (int *)NULL) ; return 0; } EOF -if { (eval echo configure:25863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then +if { (eval echo configure:27742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then rm -rf conftest* - echo "$as_me:$LINENO: result: int *" >&5 -echo "${ECHO_T}int *" >&6 + { echo "$as_me:$LINENO: result: int *" >&5 +echo "${ECHO_T}int *" >&6; } XML_SOCKLEN_T=int else echo "configure: failed program was:" >&5 @@ -25887,15 +27766,15 @@ _ACEOF -echo "$as_me:$LINENO: checking whether to enable IPv6" >&5 -echo $ECHO_N "checking whether to enable IPv6... $ECHO_C" >&6 -# Check whether --enable-ipv6 or --disable-ipv6 was given. +{ echo "$as_me:$LINENO: checking whether to enable IPv6" >&5 +echo $ECHO_N "checking whether to enable IPv6... $ECHO_C" >&6; } +# Check whether --enable-ipv6 was given. if test "${enable_ipv6+set}" = set; then - enableval="$enable_ipv6" - + enableval=$enable_ipv6; else enable_ipv6=yes -fi; +fi + if test "$with_minimum" = "yes" then enable_ipv6=no @@ -25923,23 +27802,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25948,12 +27840,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_ipv6=no + have_ipv6=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $have_ipv6" >&5 -echo "${ECHO_T}$have_ipv6" >&6 + { echo "$as_me:$LINENO: result: $have_ipv6" >&5 +echo "${ECHO_T}$have_ipv6" >&6; } if test $have_ipv6 = yes; then @@ -25963,8 +27856,8 @@ _ACEOF have_broken_ss_family=no - echo "$as_me:$LINENO: checking struct sockaddr::ss_family" >&5 -echo $ECHO_N "checking struct sockaddr::ss_family... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking struct sockaddr::ss_family" >&5 +echo $ECHO_N "checking struct sockaddr::ss_family... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25986,23 +27879,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26011,15 +27917,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_ss_family=no + have_ss_family=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $have_ss_family" >&5 -echo "${ECHO_T}$have_ss_family" >&6 + { echo "$as_me:$LINENO: result: $have_ss_family" >&5 +echo "${ECHO_T}$have_ss_family" >&6; } if test x$have_ss_family = xno ; then - echo "$as_me:$LINENO: checking broken struct sockaddr::ss_family" >&5 -echo $ECHO_N "checking broken struct sockaddr::ss_family... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking broken struct sockaddr::ss_family" >&5 +echo $ECHO_N "checking broken struct sockaddr::ss_family... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26041,23 +27948,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26066,12 +27986,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_broken_ss_family=no + have_broken_ss_family=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $have_broken_ss_family" >&5 -echo "${ECHO_T}$have_broken_ss_family" >&6 + { echo "$as_me:$LINENO: result: $have_broken_ss_family" >&5 +echo "${ECHO_T}$have_broken_ss_family" >&6; } if test x$have_broken_ss_family = xyes ; then cat >>confdefs.h <<\_ACEOF @@ -26090,8 +28011,8 @@ echo "$as_me: WARNING: ss_family and __ss_family not found" >&2;} fi have_getaddrinfo=no - echo "$as_me:$LINENO: checking for getaddrinfo" >&5 -echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getaddrinfo" >&5 +echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; } if test "${ac_cv_func_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26118,52 +28039,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef getaddrinfo -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getaddrinfo (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) +#if defined __stub_getaddrinfo || defined __stub___getaddrinfo choke me -#else -char (*f) () = getaddrinfo; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != getaddrinfo; +return getaddrinfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26172,13 +28100,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getaddrinfo=no + ac_cv_func_getaddrinfo=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 -echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; } if test $ac_cv_func_getaddrinfo = yes; then have_getaddrinfo=yes fi @@ -26186,9 +28115,9 @@ fi if test $have_getaddrinfo != yes; then for lib in bsd socket inet; do as_ac_Lib=`echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh` -echo "$as_me:$LINENO: checking for getaddrinfo in -l$lib" >&5 -echo $ECHO_N "checking for getaddrinfo in -l$lib... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for getaddrinfo in -l$lib" >&5 +echo $ECHO_N "checking for getaddrinfo in -l$lib... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26200,39 +28129,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getaddrinfo (); int main () { -getaddrinfo (); +return getaddrinfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26241,14 +28183,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBS="$LIBS -l$lib";have_getaddrinfo=yes;break fi @@ -26267,8 +28211,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for isnan" >&5 -echo $ECHO_N "checking for isnan... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for isnan" >&5 +echo $ECHO_N "checking for isnan... $ECHO_C" >&6; } if test "${ac_cv_func_isnan+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26295,52 +28239,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef isnan -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char isnan (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_isnan) || defined (__stub___isnan) +#if defined __stub_isnan || defined __stub___isnan choke me -#else -char (*f) () = isnan; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != isnan; +return isnan (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26349,13 +28300,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_isnan=no + ac_cv_func_isnan=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_isnan" >&5 -echo "${ECHO_T}$ac_cv_func_isnan" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_isnan" >&5 +echo "${ECHO_T}$ac_cv_func_isnan" >&6; } if test $ac_cv_func_isnan = yes; then cat >>confdefs.h <<\_ACEOF @@ -26363,8 +28315,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: checking for isnan in -lm" >&5 -echo $ECHO_N "checking for isnan in -lm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for isnan in -lm" >&5 +echo $ECHO_N "checking for isnan in -lm... $ECHO_C" >&6; } if test "${ac_cv_lib_m_isnan+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26377,39 +28329,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char isnan (); int main () { -isnan (); +return isnan (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26418,14 +28383,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_isnan=no + ac_cv_lib_m_isnan=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_isnan" >&5 -echo "${ECHO_T}$ac_cv_lib_m_isnan" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_isnan" >&5 +echo "${ECHO_T}$ac_cv_lib_m_isnan" >&6; } if test $ac_cv_lib_m_isnan = yes; then cat >>confdefs.h <<\_ACEOF @@ -26437,8 +28403,8 @@ fi fi -echo "$as_me:$LINENO: checking for isinf" >&5 -echo $ECHO_N "checking for isinf... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for isinf" >&5 +echo $ECHO_N "checking for isinf... $ECHO_C" >&6; } if test "${ac_cv_func_isinf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26465,52 +28431,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef isinf -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char isinf (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_isinf) || defined (__stub___isinf) +#if defined __stub_isinf || defined __stub___isinf choke me -#else -char (*f) () = isinf; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != isinf; +return isinf (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26519,13 +28492,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_isinf=no + ac_cv_func_isinf=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5 -echo "${ECHO_T}$ac_cv_func_isinf" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_isinf" >&5 +echo "${ECHO_T}$ac_cv_func_isinf" >&6; } if test $ac_cv_func_isinf = yes; then cat >>confdefs.h <<\_ACEOF @@ -26533,8 +28507,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: checking for isinf in -lm" >&5 -echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for isinf in -lm" >&5 +echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6; } if test "${ac_cv_lib_m_isinf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26547,39 +28521,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char isinf (); int main () { -isinf (); +return isinf (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26588,14 +28575,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_isinf=no + ac_cv_lib_m_isinf=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5 -echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5 +echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6; } if test $ac_cv_lib_m_isinf = yes; then cat >>confdefs.h <<\_ACEOF @@ -26690,8 +28678,8 @@ if test "$with_python" != "no" ; then else # Extract the first word of "python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args. set dummy python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PYTHON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26706,27 +28694,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then - echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6 + { echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi fi fi @@ -26741,17 +28730,17 @@ fi -d $with_python/lib/python$PYTHON_VERSION/site-packages then PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES='$(libdir)/lib/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/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_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages else if test -r /usr/include/python$PYTHON_VERSION/Python.h then PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages else echo could not find python$PYTHON_VERSION/Python.h fi @@ -26764,7 +28753,7 @@ fi fi if test "$with_python" != "" then - pythondir=$(PYTHON_SITE_PACKAGES) + pythondir='$(PYTHON_SITE_PACKAGES)' else pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' fi @@ -26797,8 +28786,8 @@ if test "$with_modules" != "no" ; then case "$host" in *-*-cygwin*) MODULE_EXTENSION=".dll" - echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 -echo $ECHO_N "checking for dlopen in -lcygwin... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 +echo $ECHO_N "checking for dlopen in -lcygwin... $ECHO_C" >&6; } if test "${ac_cv_lib_cygwin_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26811,39 +28800,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26852,14 +28854,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cygwin_dlopen=no + ac_cv_lib_cygwin_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_cygwin_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_cygwin_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cygwin_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_cygwin_dlopen" >&6; } if test $ac_cv_lib_cygwin_dlopen = yes; then WITH_MODULES=1 @@ -26874,8 +28877,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26902,52 +28905,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26956,19 +28966,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then libxml_have_shl_load=yes else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26981,39 +28992,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27022,22 +29046,23 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then MODULE_PLATFORM_LIBS="-ldld" libxml_have_shl_load=yes else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27064,52 +29089,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27118,19 +29150,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then libxml_have_dlopen=yes else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27143,39 +29176,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27184,14 +29230,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then MODULE_PLATFORM_LIBS="-ldl" @@ -27305,17 +29352,17 @@ else echo Enabling multithreaded support if test "${ac_cv_header_pthread_h+set}" = set; then - echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread.h" >&5 +echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 +echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking pthread.h usability" >&5 -echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pthread.h usability" >&5 +echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27326,23 +29373,36 @@ $ac_includes_default #include <pthread.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27351,15 +29411,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking pthread.h presence" >&5 -echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking pthread.h presence" >&5 +echo $ECHO_N "checking pthread.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27368,8 +29429,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <pthread.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27393,9 +29459,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -27419,30 +29486,23 @@ echo "$as_me: WARNING: pthread.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for pthread.h" >&5 -echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pthread.h" >&5 +echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6; } if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_pthread_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 -echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5 +echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; } fi if test $ac_cv_header_pthread_h = yes; then - echo "$as_me:$LINENO: checking for pthread_join in -lpthread" >&5 -echo $ECHO_N "checking for pthread_join in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_join in -lpthread" >&5 +echo $ECHO_N "checking for pthread_join in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_join+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27455,39 +29515,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_join (); int main () { -pthread_join (); +return pthread_join (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27496,14 +29569,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_join=no + ac_cv_lib_pthread_pthread_join=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_join" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_join" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_join" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_join" >&6; } if test $ac_cv_lib_pthread_pthread_join = yes; then THREAD_LIBS="-lpthread" @@ -27577,9 +29651,9 @@ if test "$with_history" = "yes" ; then unset tcap for termlib in ncurses curses termcap terminfo termlib; do as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh` -echo "$as_me:$LINENO: checking for tputs in -l${termlib}" >&5 -echo $ECHO_N "checking for tputs in -l${termlib}... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for tputs in -l${termlib}" >&5 +echo $ECHO_N "checking for tputs in -l${termlib}... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27591,39 +29665,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tputs (); int main () { -tputs (); +return tputs (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27632,14 +29719,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then tcap="-l$termlib" fi @@ -27648,17 +29737,17 @@ fi done if test "${ac_cv_header_readline_history_h+set}" = set; then - echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for readline/history.h" >&5 +echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } if test "${ac_cv_header_readline_history_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking readline/history.h usability" >&5 -echo $ECHO_N "checking readline/history.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking readline/history.h usability" >&5 +echo $ECHO_N "checking readline/history.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27669,23 +29758,36 @@ $ac_includes_default #include <readline/history.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27694,15 +29796,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking readline/history.h presence" >&5 -echo $ECHO_N "checking readline/history.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking readline/history.h presence" >&5 +echo $ECHO_N "checking readline/history.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27711,8 +29814,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <readline/history.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27736,9 +29844,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -27762,30 +29871,23 @@ echo "$as_me: WARNING: readline/history.h: section \"Present But Cannot Be C echo "$as_me: WARNING: readline/history.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: readline/history.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: readline/history.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for readline/history.h" >&5 -echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for readline/history.h" >&5 +echo $ECHO_N "checking for readline/history.h... $ECHO_C" >&6; } if test "${ac_cv_header_readline_history_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_readline_history_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_history_h" >&5 +echo "${ECHO_T}$ac_cv_header_readline_history_h" >&6; } fi if test $ac_cv_header_readline_history_h = yes; then - echo "$as_me:$LINENO: checking for append_history in -lhistory" >&5 -echo $ECHO_N "checking for append_history in -lhistory... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for append_history in -lhistory" >&5 +echo $ECHO_N "checking for append_history in -lhistory... $ECHO_C" >&6; } if test "${ac_cv_lib_history_append_history+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27798,39 +29900,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char append_history (); int main () { -append_history (); +return append_history (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27839,14 +29954,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_history_append_history=no + ac_cv_lib_history_append_history=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_history_append_history" >&5 -echo "${ECHO_T}$ac_cv_lib_history_append_history" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_history_append_history" >&5 +echo "${ECHO_T}$ac_cv_lib_history_append_history" >&6; } if test $ac_cv_lib_history_append_history = yes; then RDL_LIBS="-lhistory" @@ -27861,17 +29977,17 @@ fi if test "${ac_cv_header_readline_readline_h+set}" = set; then - echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } if test "${ac_cv_header_readline_readline_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 -echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5 +echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27882,23 +29998,36 @@ $ac_includes_default #include <readline/readline.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27907,15 +30036,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 -echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5 +echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27924,8 +30054,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <readline/readline.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27949,9 +30084,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -27975,30 +30111,23 @@ echo "$as_me: WARNING: readline/readline.h: section \"Present But Cannot Be echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for readline/readline.h" >&5 -echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5 +echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; } if test "${ac_cv_header_readline_readline_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_readline_readline_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 -echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5 +echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; } fi if test $ac_cv_header_readline_readline_h = yes; then - echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 -echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 +echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } if test "${ac_cv_lib_readline_readline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28011,39 +30140,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char readline (); int main () { -readline (); +return readline (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28052,14 +30194,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_readline_readline=no + ac_cv_lib_readline_readline=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 -echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 +echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; } if test $ac_cv_lib_readline_readline = yes; then RDL_LIBS="-lreadline $RDL_LIBS $tcap" @@ -28333,17 +30476,17 @@ else fi if test "${ac_cv_header_iconv_h+set}" = set; then - echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for iconv.h" >&5 +echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } if test "${ac_cv_header_iconv_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking iconv.h usability" >&5 -echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 +echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28354,23 +30497,36 @@ $ac_includes_default #include <iconv.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -28379,15 +30535,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking iconv.h presence" >&5 -echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 +echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28396,8 +30553,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <iconv.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28421,9 +30583,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -28447,30 +30610,23 @@ echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for iconv.h" >&5 -echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for iconv.h" >&5 +echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } if test "${ac_cv_header_iconv_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_iconv_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 -echo "${ECHO_T}$ac_cv_header_iconv_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } fi if test $ac_cv_header_iconv_h = yes; then - echo "$as_me:$LINENO: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28490,39 +30646,52 @@ iconv (cd, NULL, NULL, NULL, NULL); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_ICONV=1 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 -echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 +echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; } _ldflags="${LDFLAGS}" _libs="${LIBS}" @@ -28548,29 +30717,42 @@ iconv (cd, NULL, NULL, NULL, NULL); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_ICONV=1 ICONV_LIBS="${ICONV_LIBS} -liconv" LIBS="${_libs}" @@ -28580,14 +30762,16 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBS="${_libs}" LDFLAGS="${_ldflags}" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -28757,7 +30941,8 @@ rm -f COPYING.LIB COPYING ln -s Copyright COPYING # keep on one line for cygwin c.f. #130896 - ac_config_files="$ac_config_files libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py" +ac_config_files="$ac_config_files libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -28776,39 +30961,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -28817,32 +31021,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -28922,11 +31112,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -28935,8 +31149,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -28950,18 +31199,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -28969,159 +31219,120 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# CDPATH. +$as_unset CDPATH -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -29130,7 +31341,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -29139,31 +31362,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.59e. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -29171,30 +31377,20 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -29221,19 +31417,21 @@ Configuration commands: $config_commands Report bugs to <bug-autoconf@gnu.org>." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.59e, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -29244,39 +31442,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -29286,18 +31469,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -29313,52 +31502,64 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "libxml2.spec" ) CONFIG_FILES="$CONFIG_FILES libxml2.spec:libxml.spec.in" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "include/libxml/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/libxml/Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/examples/Makefile" ;; - "doc/devhelp/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/devhelp/Makefile" ;; - "example/Makefile" ) CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; - "python/Makefile" ) CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; - "python/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES python/tests/Makefile" ;; - "xstc/Makefile" ) CONFIG_FILES="$CONFIG_FILES xstc/Makefile" ;; - "include/libxml/xmlversion.h" ) CONFIG_FILES="$CONFIG_FILES include/libxml/xmlversion.h" ;; - "xml2-config" ) CONFIG_FILES="$CONFIG_FILES xml2-config" ;; - "libxml-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES libxml-2.0.pc" ;; - "libxml-2.0-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES libxml-2.0-uninstalled.pc" ;; - "python/setup.py" ) CONFIG_FILES="$CONFIG_FILES python/setup.py" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libxml2.spec") CONFIG_FILES="$CONFIG_FILES libxml2.spec:libxml.spec.in" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "include/libxml/Makefile") CONFIG_FILES="$CONFIG_FILES include/libxml/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/examples/Makefile") CONFIG_FILES="$CONFIG_FILES doc/examples/Makefile" ;; + "doc/devhelp/Makefile") CONFIG_FILES="$CONFIG_FILES doc/devhelp/Makefile" ;; + "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; + "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; + "python/tests/Makefile") CONFIG_FILES="$CONFIG_FILES python/tests/Makefile" ;; + "xstc/Makefile") CONFIG_FILES="$CONFIG_FILES xstc/Makefile" ;; + "include/libxml/xmlversion.h") CONFIG_FILES="$CONFIG_FILES include/libxml/xmlversion.h" ;; + "xml2-config") CONFIG_FILES="$CONFIG_FILES xml2-config" ;; + "libxml-2.0.pc") CONFIG_FILES="$CONFIG_FILES libxml-2.0.pc" ;; + "libxml-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libxml-2.0-uninstalled.pc" ;; + "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -29370,719 +31571,743 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@LIBXML_MAJOR_VERSION@,$LIBXML_MAJOR_VERSION,;t t -s,@LIBXML_MINOR_VERSION@,$LIBXML_MINOR_VERSION,;t t -s,@LIBXML_MICRO_VERSION@,$LIBXML_MICRO_VERSION,;t t -s,@LIBXML_VERSION@,$LIBXML_VERSION,;t t -s,@LIBXML_VERSION_INFO@,$LIBXML_VERSION_INFO,;t t -s,@LIBXML_VERSION_NUMBER@,$LIBXML_VERSION_NUMBER,;t t -s,@LIBXML_VERSION_EXTRA@,$LIBXML_VERSION_EXTRA,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@RM@,$RM,;t t -s,@MV@,$MV,;t t -s,@TAR@,$TAR,;t t -s,@PERL@,$PERL,;t t -s,@XMLLINT@,$XMLLINT,;t t -s,@XSLTPROC@,$XSLTPROC,;t t -s,@EGREP@,$EGREP,;t t -s,@U@,$U,;t t -s,@ANSI2KNR@,$ANSI2KNR,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t -s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t -s,@MAINT@,$MAINT,;t t -s,@HTML_DIR@,$HTML_DIR,;t t -s,@Z_CFLAGS@,$Z_CFLAGS,;t t -s,@Z_LIBS@,$Z_LIBS,;t t -s,@PYTHON@,$PYTHON,;t t -s,@WITH_PYTHON_TRUE@,$WITH_PYTHON_TRUE,;t t -s,@WITH_PYTHON_FALSE@,$WITH_PYTHON_FALSE,;t t -s,@pythondir@,$pythondir,;t t -s,@PYTHON_SUBDIR@,$PYTHON_SUBDIR,;t t -s,@WITH_MODULES@,$WITH_MODULES,;t t -s,@MODULE_PLATFORM_LIBS@,$MODULE_PLATFORM_LIBS,;t t -s,@MODULE_EXTENSION@,$MODULE_EXTENSION,;t t -s,@TEST_MODULES@,$TEST_MODULES,;t t -s,@STATIC_BINARIES@,$STATIC_BINARIES,;t t -s,@WITH_TRIO_SOURCES_TRUE@,$WITH_TRIO_SOURCES_TRUE,;t t -s,@WITH_TRIO_SOURCES_FALSE@,$WITH_TRIO_SOURCES_FALSE,;t t -s,@WITH_TRIO@,$WITH_TRIO,;t t -s,@THREAD_LIBS@,$THREAD_LIBS,;t t -s,@BASE_THREAD_LIBS@,$BASE_THREAD_LIBS,;t t -s,@WITH_THREADS@,$WITH_THREADS,;t t -s,@THREAD_CFLAGS@,$THREAD_CFLAGS,;t t -s,@TEST_THREADS@,$TEST_THREADS,;t t -s,@THREADS_W32@,$THREADS_W32,;t t -s,@WITH_TREE@,$WITH_TREE,;t t -s,@WITH_FTP@,$WITH_FTP,;t t -s,@FTP_OBJ@,$FTP_OBJ,;t t -s,@WITH_HTTP@,$WITH_HTTP,;t t -s,@HTTP_OBJ@,$HTTP_OBJ,;t t -s,@WITH_LEGACY@,$WITH_LEGACY,;t t -s,@WITH_READER@,$WITH_READER,;t t -s,@READER_TEST@,$READER_TEST,;t t -s,@WITH_WRITER@,$WITH_WRITER,;t t -s,@WITH_PATTERN@,$WITH_PATTERN,;t t -s,@TEST_PATTERN@,$TEST_PATTERN,;t t -s,@WITH_SAX1@,$WITH_SAX1,;t t -s,@TEST_SAX@,$TEST_SAX,;t t -s,@WITH_PUSH@,$WITH_PUSH,;t t -s,@TEST_PUSH@,$TEST_PUSH,;t t -s,@WITH_HTML@,$WITH_HTML,;t t -s,@HTML_OBJ@,$HTML_OBJ,;t t -s,@TEST_HTML@,$TEST_HTML,;t t -s,@TEST_PHTML@,$TEST_PHTML,;t t -s,@WITH_VALID@,$WITH_VALID,;t t -s,@TEST_VALID@,$TEST_VALID,;t t -s,@TEST_VTIME@,$TEST_VTIME,;t t -s,@WITH_CATALOG@,$WITH_CATALOG,;t t -s,@CATALOG_OBJ@,$CATALOG_OBJ,;t t -s,@TEST_CATALOG@,$TEST_CATALOG,;t t -s,@WITH_DOCB@,$WITH_DOCB,;t t -s,@DOCB_OBJ@,$DOCB_OBJ,;t t -s,@WITH_XPTR@,$WITH_XPTR,;t t -s,@XPTR_OBJ@,$XPTR_OBJ,;t t -s,@TEST_XPTR@,$TEST_XPTR,;t t -s,@WITH_C14N@,$WITH_C14N,;t t -s,@C14N_OBJ@,$C14N_OBJ,;t t -s,@TEST_C14N@,$TEST_C14N,;t t -s,@WITH_XINCLUDE@,$WITH_XINCLUDE,;t t -s,@XINCLUDE_OBJ@,$XINCLUDE_OBJ,;t t -s,@TEST_XINCLUDE@,$TEST_XINCLUDE,;t t -s,@WITH_XPATH@,$WITH_XPATH,;t t -s,@XPATH_OBJ@,$XPATH_OBJ,;t t -s,@TEST_XPATH@,$TEST_XPATH,;t t -s,@WITH_OUTPUT@,$WITH_OUTPUT,;t t -s,@WITH_ICONV@,$WITH_ICONV,;t t -s,@WITH_ISO8859X@,$WITH_ISO8859X,;t t -s,@WITH_SCHEMATRON@,$WITH_SCHEMATRON,;t t -s,@TEST_SCHEMATRON@,$TEST_SCHEMATRON,;t t -s,@WITH_SCHEMAS@,$WITH_SCHEMAS,;t t -s,@TEST_SCHEMAS@,$TEST_SCHEMAS,;t t -s,@WITH_REGEXPS@,$WITH_REGEXPS,;t t -s,@TEST_REGEXPS@,$TEST_REGEXPS,;t t -s,@WITH_DEBUG@,$WITH_DEBUG,;t t -s,@DEBUG_OBJ@,$DEBUG_OBJ,;t t -s,@TEST_DEBUG@,$TEST_DEBUG,;t t -s,@WITH_MEM_DEBUG@,$WITH_MEM_DEBUG,;t t -s,@WITH_RUN_DEBUG@,$WITH_RUN_DEBUG,;t t -s,@WIN32_EXTRA_LIBADD@,$WIN32_EXTRA_LIBADD,;t t -s,@WIN32_EXTRA_LDFLAGS@,$WIN32_EXTRA_LDFLAGS,;t t -s,@CYGWIN_EXTRA_LDFLAGS@,$CYGWIN_EXTRA_LDFLAGS,;t t -s,@CYGWIN_EXTRA_PYTHON_LIBADD@,$CYGWIN_EXTRA_PYTHON_LIBADD,;t t -s,@XML_CFLAGS@,$XML_CFLAGS,;t t -s,@XML_LIBDIR@,$XML_LIBDIR,;t t -s,@XML_LIBS@,$XML_LIBS,;t t -s,@XML_LIBTOOLLIBS@,$XML_LIBTOOLLIBS,;t t -s,@ICONV_LIBS@,$ICONV_LIBS,;t t -s,@XML_INCLUDEDIR@,$XML_INCLUDEDIR,;t t -s,@HAVE_ISNAN@,$HAVE_ISNAN,;t t -s,@HAVE_ISINF@,$HAVE_ISINF,;t t -s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t -s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t -s,@PYTHON_SITE_PACKAGES@,$PYTHON_SITE_PACKAGES,;t t -s,@M_LIBS@,$M_LIBS,;t t -s,@RDL_LIBS@,$RDL_LIBS,;t t -s,@RELDATE@,$RELDATE,;t t -s,@PYTHON_TESTS@,$PYTHON_TESTS,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +LIBXML_MAJOR_VERSION!$LIBXML_MAJOR_VERSION$ac_delim +LIBXML_MINOR_VERSION!$LIBXML_MINOR_VERSION$ac_delim +LIBXML_MICRO_VERSION!$LIBXML_MICRO_VERSION$ac_delim +LIBXML_VERSION!$LIBXML_VERSION$ac_delim +LIBXML_VERSION_INFO!$LIBXML_VERSION_INFO$ac_delim +LIBXML_VERSION_NUMBER!$LIBXML_VERSION_NUMBER$ac_delim +LIBXML_VERSION_EXTRA!$LIBXML_VERSION_EXTRA$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CPP!$CPP$ac_delim +RM!$RM$ac_delim +MV!$MV$ac_delim +TAR!$TAR$ac_delim +PERL!$PERL$ac_delim +XMLLINT!$XMLLINT$ac_delim +XSLTPROC!$XSLTPROC$ac_delim +GREP!$GREP$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +EGREP!$EGREP$ac_delim +U!$U$ac_delim +ANSI2KNR!$ANSI2KNR$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +AS!$AS$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +HTML_DIR!$HTML_DIR$ac_delim +Z_CFLAGS!$Z_CFLAGS$ac_delim +Z_LIBS!$Z_LIBS$ac_delim +PYTHON!$PYTHON$ac_delim +WITH_PYTHON_TRUE!$WITH_PYTHON_TRUE$ac_delim +WITH_PYTHON_FALSE!$WITH_PYTHON_FALSE$ac_delim +pythondir!$pythondir$ac_delim +PYTHON_SUBDIR!$PYTHON_SUBDIR$ac_delim +WITH_MODULES!$WITH_MODULES$ac_delim +MODULE_PLATFORM_LIBS!$MODULE_PLATFORM_LIBS$ac_delim +MODULE_EXTENSION!$MODULE_EXTENSION$ac_delim +TEST_MODULES!$TEST_MODULES$ac_delim +STATIC_BINARIES!$STATIC_BINARIES$ac_delim +WITH_TRIO_SOURCES_TRUE!$WITH_TRIO_SOURCES_TRUE$ac_delim +WITH_TRIO_SOURCES_FALSE!$WITH_TRIO_SOURCES_FALSE$ac_delim +WITH_TRIO!$WITH_TRIO$ac_delim +THREAD_LIBS!$THREAD_LIBS$ac_delim +BASE_THREAD_LIBS!$BASE_THREAD_LIBS$ac_delim +WITH_THREADS!$WITH_THREADS$ac_delim +THREAD_CFLAGS!$THREAD_CFLAGS$ac_delim +TEST_THREADS!$TEST_THREADS$ac_delim +THREADS_W32!$THREADS_W32$ac_delim +WITH_TREE!$WITH_TREE$ac_delim +WITH_FTP!$WITH_FTP$ac_delim +FTP_OBJ!$FTP_OBJ$ac_delim +WITH_HTTP!$WITH_HTTP$ac_delim +HTTP_OBJ!$HTTP_OBJ$ac_delim +WITH_LEGACY!$WITH_LEGACY$ac_delim +WITH_READER!$WITH_READER$ac_delim +READER_TEST!$READER_TEST$ac_delim +WITH_WRITER!$WITH_WRITER$ac_delim +WITH_PATTERN!$WITH_PATTERN$ac_delim +TEST_PATTERN!$TEST_PATTERN$ac_delim +WITH_SAX1!$WITH_SAX1$ac_delim +TEST_SAX!$TEST_SAX$ac_delim +WITH_PUSH!$WITH_PUSH$ac_delim +TEST_PUSH!$TEST_PUSH$ac_delim +WITH_HTML!$WITH_HTML$ac_delim +HTML_OBJ!$HTML_OBJ$ac_delim +TEST_HTML!$TEST_HTML$ac_delim +TEST_PHTML!$TEST_PHTML$ac_delim +WITH_VALID!$WITH_VALID$ac_delim +TEST_VALID!$TEST_VALID$ac_delim +TEST_VTIME!$TEST_VTIME$ac_delim +WITH_CATALOG!$WITH_CATALOG$ac_delim +CATALOG_OBJ!$CATALOG_OBJ$ac_delim +TEST_CATALOG!$TEST_CATALOG$ac_delim +WITH_DOCB!$WITH_DOCB$ac_delim +DOCB_OBJ!$DOCB_OBJ$ac_delim +WITH_XPTR!$WITH_XPTR$ac_delim +XPTR_OBJ!$XPTR_OBJ$ac_delim +TEST_XPTR!$TEST_XPTR$ac_delim +WITH_C14N!$WITH_C14N$ac_delim +C14N_OBJ!$C14N_OBJ$ac_delim +TEST_C14N!$TEST_C14N$ac_delim +WITH_XINCLUDE!$WITH_XINCLUDE$ac_delim +XINCLUDE_OBJ!$XINCLUDE_OBJ$ac_delim +TEST_XINCLUDE!$TEST_XINCLUDE$ac_delim +WITH_XPATH!$WITH_XPATH$ac_delim +XPATH_OBJ!$XPATH_OBJ$ac_delim +TEST_XPATH!$TEST_XPATH$ac_delim +WITH_OUTPUT!$WITH_OUTPUT$ac_delim +WITH_ICONV!$WITH_ICONV$ac_delim +WITH_ISO8859X!$WITH_ISO8859X$ac_delim +WITH_SCHEMATRON!$WITH_SCHEMATRON$ac_delim +TEST_SCHEMATRON!$TEST_SCHEMATRON$ac_delim +WITH_SCHEMAS!$WITH_SCHEMAS$ac_delim +TEST_SCHEMAS!$TEST_SCHEMAS$ac_delim +WITH_REGEXPS!$WITH_REGEXPS$ac_delim +TEST_REGEXPS!$TEST_REGEXPS$ac_delim +WITH_DEBUG!$WITH_DEBUG$ac_delim +DEBUG_OBJ!$DEBUG_OBJ$ac_delim +TEST_DEBUG!$TEST_DEBUG$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +WITH_MEM_DEBUG!$WITH_MEM_DEBUG$ac_delim +WITH_RUN_DEBUG!$WITH_RUN_DEBUG$ac_delim +WIN32_EXTRA_LIBADD!$WIN32_EXTRA_LIBADD$ac_delim +WIN32_EXTRA_LDFLAGS!$WIN32_EXTRA_LDFLAGS$ac_delim +CYGWIN_EXTRA_LDFLAGS!$CYGWIN_EXTRA_LDFLAGS$ac_delim +CYGWIN_EXTRA_PYTHON_LIBADD!$CYGWIN_EXTRA_PYTHON_LIBADD$ac_delim +XML_CFLAGS!$XML_CFLAGS$ac_delim +XML_LIBDIR!$XML_LIBDIR$ac_delim +XML_LIBS!$XML_LIBS$ac_delim +XML_LIBTOOLLIBS!$XML_LIBTOOLLIBS$ac_delim +ICONV_LIBS!$ICONV_LIBS$ac_delim +XML_INCLUDEDIR!$XML_INCLUDEDIR$ac_delim +HAVE_ISNAN!$HAVE_ISNAN$ac_delim +HAVE_ISINF!$HAVE_ISINF$ac_delim +PYTHON_VERSION!$PYTHON_VERSION$ac_delim +PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim +PYTHON_SITE_PACKAGES!$PYTHON_SITE_PACKAGES$ac_delim +M_LIBS!$M_LIBS$ac_delim +RDL_LIBS!$RDL_LIBS$ac_delim +RELDATE!$RELDATE$ac_delim +PYTHON_TESTS!$PYTHON_TESTS$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do @@ -30093,135 +32318,39 @@ for _am_header in $config_headers :; do _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$ac_file : 'X\(//\)[^/]' \| \ X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X$ac_file : 'X\(/\)' \| . 2>/dev/null || echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -30231,18 +32360,29 @@ echo "$as_me: executing $ac_dest commands" >&6;} # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -30264,53 +32404,79 @@ echo X"$mf" | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff --git a/configure.in b/configure.in index a1c0d57..b2344fb 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=24 +LIBXML_MICRO_VERSION=26 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 @@ -680,17 +680,17 @@ 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='$(libdir)/lib/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/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_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages else if test -r /usr/include/python$PYTHON_VERSION/Python.h then PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages else echo could not find python$PYTHON_VERSION/Python.h fi @@ -703,7 +703,7 @@ 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' fi diff --git a/debian/changelog b/debian/changelog index e9089f7..8561723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libxml2 (2.6.26.dfsg-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + Added -fno-strict-aliasing to the CFLAGS. + + Use dpkg-architecture to feed configure. + + Bumped shlibs to current version, since new symbol for XPath cache has + been added. + * debian/control: Bumped Standards-Version to 3.7.2.0. No changes required. + + -- Mike Hommey <glandium@debian.org> Thu, 8 Jun 2006 21:39:55 +0200 + libxml2 (2.6.24.dfsg-1) unstable; urgency=low * New upstream release. Closes: #365246. diff --git a/debian/control b/debian/control index f8abf0b..9f8cb7d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Section: libs Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> Uploaders: Mike Hommey <glandium@debian.org> -Standards-Version: 3.7.0.0 +Standards-Version: 3.7.2.0 Build-Depends: debhelper (>= 5.0.0), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, autotools-dev, libreadline5-dev | libreadline-dev, binutils (>= 2.14.90.0.7) Package: libxml2 diff --git a/debian/rules b/debian/rules index d25fc6e..2d0a6c7 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# These are used for cross-compiling and for saving the configure script +# # from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + # The versions of python currently supported PYVERS=$(subst -dev,,$(subst python,,$(filter python%-dev,$(shell sed -n '/^Build-Depends/s/,//gp' debian/control)))) @@ -14,7 +19,7 @@ CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else - CFLAGS += -O2 + CFLAGS += -O2 -fno-strict-aliasing endif build: build-stamp @@ -27,7 +32,7 @@ build-stamp: done # ./configure - CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-history + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-history echo "all:" > example/Makefile echo "install:" >> example/Makefile echo "distclean:" >> example/Makefile @@ -163,7 +168,7 @@ binary-arch: build install dh_strip $(addprefix -ppython,$(addsuffix -libxml2, $(PYVERS))) dh_compress -a -Xexamples/ dh_fixperms -a - dh_makeshlibs -a -V 'libxml2 (>= 2.6.24)' + dh_makeshlibs -a -V 'libxml2 (>= 2.6.26)' dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index ca14e32..7c9ff72 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -81,6 +81,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>CJKUnifiedIdeographsExtensionB</dt><dd><a href="html/libxml-xmlunicode.html#xmlUCSIsCJKUnifiedIdeographsExtensionB">xmlUCSIsCJKUnifiedIdeographsExtensionB</a><br /> </dd><dt>CVS</dt><dd><a href="html/libxml-xmlversion.html#LIBXML_VERSION_EXTRA">LIBXML_VERSION_EXTRA</a><br /> </dd><dt>CWD</dt><dd><a href="html/libxml-nanoftp.html#xmlNanoFTPCwd">xmlNanoFTPCwd</a><br /> +</dd><dt>Cache</dt><dd><a href="html/libxml-xpath.html#_xmlXPathContext">_xmlXPathContext</a><br /> </dd><dt>Call</dt><dd><a href="html/libxml-parserInternals.html#htmlInitAutoClose">htmlInitAutoClose</a><br /> <a href="html/libxml-parser.html#xmlInitParser">xmlInitParser</a><br /> <a href="html/libxml-xpath.html#xmlXPathOrderDocElems">xmlXPathOrderDocElems</a><br /> @@ -309,6 +310,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlregexp.html#xmlExpNewCtxt">xmlExpNewCtxt</a><br /> <a href="html/libxml-tree.html#xmlNewDoc">xmlNewDoc</a><br /> <a href="html/libxml-xinclude.html#xmlXIncludeNewContext">xmlXIncludeNewContext</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>Creation</dt><dd><a href="html/libxml-tree.html#xmlNewCDataBlock">xmlNewCDataBlock</a><br /> <a href="html/libxml-tree.html#xmlNewCharRef">xmlNewCharRef</a><br /> <a href="html/libxml-tree.html#xmlNewChild">xmlNewChild</a><br /> diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index c2e8d33..0486624 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -123,6 +123,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlreader.html#xmlTextReaderSchemaValidate">xmlTextReaderSchemaValidate</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderSchemaValidateCtxt">xmlTextReaderSchemaValidateCtxt</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderSetSchema">xmlTextReaderSetSchema</a><br /> +</dd><dt>activates</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>activation</dt><dd><a href="html/libxml-tree.html#xmlGetLineNo">xmlGetLineNo</a><br /> </dd><dt>acts</dt><dd><a href="html/libxml-tree.html#xmlGetProp">xmlGetProp</a><br /> </dd><dt>actual</dt><dd><a href="html/libxml-xmlstring.html#xmlGetUTF8Char">xmlGetUTF8Char</a><br /> diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 8f93a9f..1c552b1 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -37,7 +37,10 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="APIchunk27.html">w-w</a> <a href="APIchunk28.html">x-x</a> <a href="APIchunk29.html">y-z</a> -</h2><h2>Letter c:</h2><dl><dt>calculated</dt><dd><a href="html/libxml-xmlstring.html#xmlStrncatNew">xmlStrncatNew</a><br /> +</h2><h2>Letter c:</h2><dl><dt>cache</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> +</dd><dt>cached</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> +</dd><dt>caching:</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> +</dd><dt>calculated</dt><dd><a href="html/libxml-xmlstring.html#xmlStrncatNew">xmlStrncatNew</a><br /> </dd><dt>calculates</dt><dd><a href="html/libxml-xmlstring.html#xmlUTF8Size">xmlUTF8Size</a><br /> </dd><dt>calling</dt><dd><a href="html/libxml-xpath.html#_xmlXPathContext">_xmlXPathContext</a><br /> <a href="html/libxml-uri.html#xmlBuildRelativeURI">xmlBuildRelativeURI</a><br /> @@ -839,6 +842,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlautomata.html#xmlAutomataNewTransition2">xmlAutomataNewTransition2</a><br /> <a href="html/libxml-uri.html#xmlCreateURI">xmlCreateURI</a><br /> <a href="html/libxml-xmlstring.html#xmlStrncatNew">xmlStrncatNew</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>creating</dt><dd><a href="html/libxml-tree.html#xmlDOMWrapAdoptNode">xmlDOMWrapAdoptNode</a><br /> <a href="html/libxml-tree.html#xmlDOMWrapCloneNode">xmlDOMWrapCloneNode</a><br /> <a href="html/libxml-tree.html#xmlDOMWrapReconcileNamespaces">xmlDOMWrapReconcileNamespaces</a><br /> @@ -869,6 +873,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlmemory.html#xmlMemGet">xmlMemGet</a><br /> <a href="html/libxml-xmlmemory.html#xmlMemUsed">xmlMemUsed</a><br /> <a href="html/libxml-xmlIO.html#xmlOutputBufferCreateFilename">xmlOutputBufferCreateFilename</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>custom</dt><dd><a href="html/libxml-tree.html#xmlDOMWrapAdoptNode">xmlDOMWrapAdoptNode</a><br /> <a href="html/libxml-tree.html#xmlDOMWrapCloneNode">xmlDOMWrapCloneNode</a><br /> <a href="html/libxml-xmlsave.html#xmlSaveSetAttrEscape">xmlSaveSetAttrEscape</a><br /> diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 96643e3..5980cc2 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -221,6 +221,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>delegation</dt><dd><a href="html/libxml-catalog.html#xmlCatalogSetDefaultPrefer">xmlCatalogSetDefaultPrefer</a><br /> </dd><dt>delete</dt><dd><a href="html/libxml-nanoftp.html#xmlNanoFTPDele">xmlNanoFTPDele</a><br /> </dd><dt>deletion</dt><dd><a href="html/libxml-catalog.html#xmlCatalogSetDefaultPrefer">xmlCatalogSetDefaultPrefer</a><br /> +</dd><dt>dependant</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>depending</dt><dd><a href="html/libxml-valid.html#xmlIsID">xmlIsID</a><br /> <a href="html/libxml-valid.html#xmlIsRef">xmlIsRef</a><br /> <a href="html/libxml-list.html#xmlListDataCompare">xmlListDataCompare</a><br /> @@ -455,6 +456,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>disabled</dt><dd><a href="html/libxml-hash.html#XML_CAST_FPTR">XML_CAST_FPTR</a><br /> <a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br /> <a href="html/libxml-uri.html#xmlParseURIRaw">xmlParseURIRaw</a><br /> +</dd><dt>disables</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>disabling</dt><dd><a href="html/libxml-xmlIO.html#xmlNoNetExternalEntityLoader">xmlNoNetExternalEntityLoader</a><br /> </dd><dt>disallowed</dt><dd><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_BLOCK_EXTENSION">XML_SCHEMAS_ELEM_BLOCK_EXTENSION</a><br /> <a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_BLOCK_RESTRICTION">XML_SCHEMAS_ELEM_BLOCK_RESTRICTION</a><br /> diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index eb1716e..f5134af 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -50,6 +50,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xpathInternals.html#xmlXPathIdFunction">xmlXPathIdFunction</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathSubstringFunction">xmlXPathSubstringFunction</a><br /> </dd><dt>edition</dt><dd><a href="html/libxml-parserInternals.html#xmlCheckLanguageID">xmlCheckLanguageID</a><br /> +</dd><dt>effect</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>effective</dt><dd><a href="html/libxml-catalog.html#xmlLoadCatalog">xmlLoadCatalog</a><br /> <a href="html/libxml-catalog.html#xmlLoadCatalogs">xmlLoadCatalogs</a><br /> </dd><dt>efficiency</dt><dd><a href="html/libxml-uri.html#xmlBuildRelativeURI">xmlBuildRelativeURI</a><br /> @@ -118,6 +119,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>enable</dt><dd><a href="html/libxml-catalog.html#xmlCatalogSetDebug">xmlCatalogSetDebug</a><br /> </dd><dt>enabled</dt><dd><a href="html/libxml-tree.html#xmlSaveFile">xmlSaveFile</a><br /> <a href="html/libxml-tree.html#xmlSaveFormatFile">xmlSaveFormatFile</a><br /> +</dd><dt>enables</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>enabling</dt><dd><a href="html/libxml-parser.html#xmlLineNumbersDefault">xmlLineNumbersDefault</a><br /> <a href="html/libxml-parser.html#xmlPedanticParserDefault">xmlPedanticParserDefault</a><br /> </dd><dt>enc</dt><dd><a href="html/libxml-xmlIO.html#xmlParserInputBufferCreateFilename">xmlParserInputBufferCreateFilename</a><br /> diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 8b51338..4ac0a55 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -243,6 +243,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>fonctionnalities</dt><dd><a href="html/libxml-xmlIO.html#xmlInputMatchCallback">xmlInputMatchCallback</a><br /> <a href="html/libxml-xmlIO.html#xmlOutputMatchCallback">xmlOutputMatchCallback</a><br /> </dd><dt>for:</dt><dd><a href="html/libxml-xmlschemastypes.html#xmlSchemaGetCanonValue">xmlSchemaGetCanonValue</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>forbid</dt><dd><a href="html/libxml-xpath.html#XML_XPATH_NOVAR">XML_XPATH_NOVAR</a><br /> </dd><dt>force</dt><dd><a href="html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault</a><br /> <a href="html/libxml-xmlerror.html#xmlSetGenericErrorFunc">xmlSetGenericErrorFunc</a><br /> @@ -320,6 +321,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>freeing</dt><dd><a href="html/libxml-uri.html#xmlCanonicPath">xmlCanonicPath</a><br /> <a href="html/libxml-parser.html#xmlParserInputDeallocate">xmlParserInputDeallocate</a><br /> </dd><dt>frees</dt><dd><a href="html/libxml-tree.html#xmlBufferFree">xmlBufferFree</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>front</dt><dd><a href="html/libxml-tree.html#xmlValidateNCName">xmlValidateNCName</a><br /> <a href="html/libxml-tree.html#xmlValidateNMToken">xmlValidateNMToken</a><br /> <a href="html/libxml-tree.html#xmlValidateName">xmlValidateName</a><br /> diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 892cf52..071403e 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -464,6 +464,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-relaxng.html#xmlRelaxNGNewDocParserCtxt">xmlRelaxNGNewDocParserCtxt</a><br /> <a href="html/libxml-valid.html#xmlRemoveID">xmlRemoveID</a><br /> <a href="html/libxml-valid.html#xmlRemoveRef">xmlRemoveRef</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>interned</dt><dd><a href="html/libxml-pattern.html#xmlPatterncompile">xmlPatterncompile</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderConstString">xmlTextReaderConstString</a><br /> </dd><dt>interning</dt><dd><a href="html/libxml-tree.html#xmlCopyNodeList">xmlCopyNodeList</a><br /> diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 0cde864..8541fe1 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -148,6 +148,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlregexp.html#xmlExpMaxToken">xmlExpMaxToken</a><br /> <a href="html/libxml-xmlregexp.html#xmlExpNewCtxt">xmlExpNewCtxt</a><br /> <a href="html/libxml-pattern.html#xmlPatternMaxDepth">xmlPatternMaxDepth</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>maybe</dt><dd><a href="html/libxml-schemasInternals.html#_xmlSchemaElement">_xmlSchemaElement</a><br /> </dd><dt>mean</dt><dd><a href="html/libxml-pattern.html#xmlPatternMinDepth">xmlPatternMinDepth</a><br /> </dd><dt>means</dt><dd><a href="html/libxml-xmlregexp.html#xmlExpNewRange">xmlExpNewRange</a><br /> @@ -238,6 +239,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-pattern.html#xmlPatternMinDepth">xmlPatternMinDepth</a><br /> </dd><dt>minus</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathStringFunction">xmlXPathStringFunction</a><br /> </dd><dt>minute</dt><dd><a href="html/libxml-nanoftp.html#ftpListCallback">ftpListCallback</a><br /> +</dd><dt>misc</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>misleading</dt><dd><a href="html/libxml-parserInternals.html#xmlParsePEReference">xmlParsePEReference</a><br /> <a href="html/libxml-parserInternals.html#xmlParserHandlePEReference">xmlParserHandlePEReference</a><br /> </dd><dt>mixed</dt><dd><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_TYPE_MIXED">XML_SCHEMAS_TYPE_MIXED</a><br /> diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index 8817d3c..f503ffe 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -39,7 +39,9 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="APIchunk29.html">y-z</a> </h2><h2>Letter o:</h2><dl><dt>object?</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathNumberFunction">xmlXPathNumberFunction</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathStringFunction">xmlXPathStringFunction</a><br /> -</dd><dt>objects</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathCompareValues">xmlXPathCompareValues</a><br /> +</dd><dt>objects</dt><dd><a href="html/libxml-xpath.html#_xmlXPathContext">_xmlXPathContext</a><br /> +<a href="html/libxml-xpathInternals.html#xmlXPathCompareValues">xmlXPathCompareValues</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathDivValues">xmlXPathDivValues</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathEqualValues">xmlXPathEqualValues</a><br /> <a href="html/libxml-xpath.html#xmlXPathFreeNodeSetList">xmlXPathFreeNodeSetList</a><br /> @@ -236,6 +238,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlsave.html#xmlSaveToFilename">xmlSaveToFilename</a><br /> <a href="html/libxml-xmlsave.html#xmlSaveToIO">xmlSaveToIO</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderSchemaValidateCtxt">xmlTextReaderSchemaValidateCtxt</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>ordered</dt><dd><a href="html/libxml-list.html#xmlListAppend">xmlListAppend</a><br /> <a href="html/libxml-list.html#xmlListInsert">xmlListInsert</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathNextAncestor">xmlXPathNextAncestor</a><br /> diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index dec8350..f4c8321 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -146,6 +146,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>per</dt><dd><a href="html/libxml-xmlerror.html#xmlGetLastError">xmlGetLastError</a><br /> <a href="html/libxml-parserInternals.html#xmlParseAttributeType">xmlParseAttributeType</a><br /> <a href="html/libxml-valid.html#xmlValidateElementDecl">xmlValidateElementDecl</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>performance</dt><dd><a href="html/libxml-tree.html#xmlGetBufferAllocationScheme">xmlGetBufferAllocationScheme</a><br /> <a href="html/libxml-tree.html#xmlSetBufferAllocationScheme">xmlSetBufferAllocationScheme</a><br /> </dd><dt>performed</dt><dd><a href="html/libxml-HTMLparser.html#htmlNodeStatus">htmlNodeStatus</a><br /> diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index ebbea9a..4a78224 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -541,9 +541,11 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-hash.html#xmlHashUpdateEntry3">xmlHashUpdateEntry3</a><br /> </dd><dt>retry</dt><dd><a href="html/libxml-valid.html#xmlValidGetValidElements">xmlValidGetValidElements</a><br /> </dd><dt>returning</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathStringFunction">xmlXPathStringFunction</a><br /> +</dd><dt>reusal</dt><dd><a href="html/libxml-xpath.html#_xmlXPathContext">_xmlXPathContext</a><br /> </dd><dt>reuse</dt><dd><a href="html/libxml-tree.html#xmlReconciliateNs">xmlReconciliateNs</a><br /> <a href="html/libxml-xmlregexp.html#xmlRegExecPushString">xmlRegExecPushString</a><br /> <a href="html/libxml-xmlregexp.html#xmlRegExecPushString2">xmlRegExecPushString2</a><br /> +</dd><dt>reused</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>reuses</dt><dd><a href="html/libxml-HTMLparser.html#htmlCtxtReadDoc">htmlCtxtReadDoc</a><br /> <a href="html/libxml-HTMLparser.html#htmlCtxtReadFd">htmlCtxtReadFd</a><br /> <a href="html/libxml-HTMLparser.html#htmlCtxtReadFile">htmlCtxtReadFile</a><br /> diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index fa596f6..6ac493b 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -180,6 +180,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>self</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathNextSelf">xmlXPathNextSelf</a><br /> </dd><dt>semantic</dt><dd><a href="html/libxml-xmlautomata.html#xmlAutomataNewNegTrans">xmlAutomataNewNegTrans</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathNodeSetFreeNs">xmlXPathNodeSetFreeNs</a><br /> +</dd><dt>semantics</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>sense</dt><dd><a href="html/libxml-entities.html#xmlCreateEntitiesTable">xmlCreateEntitiesTable</a><br /> </dd><dt>separated</dt><dd><a href="html/libxml-catalog.html#xmlLoadCatalogs">xmlLoadCatalogs</a><br /> </dd><dt>separately</dt><dd><a href="html/libxml-xmlerror.html#xmlSetGenericErrorFunc">xmlSetGenericErrorFunc</a><br /> @@ -261,6 +262,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xpathInternals.html#xmlXPathDifference">xmlXPathDifference</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathIntersection">xmlXPathIntersection</a><br /> </dd><dt>setting</dt><dd><a href="html/libxml-xmlerror.html#xmlSetGenericErrorFunc">xmlSetGenericErrorFunc</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>setups</dt><dd><a href="html/libxml-parserInternals.html#xmlParseEncodingDecl">xmlParseEncodingDecl</a><br /> </dd><dt>sgmlsource</dt><dd><a href="html/libxml-SAX.html#getSystemId">getSystemId</a><br /> <a href="html/libxml-SAX2.html#xmlSAX2GetSystemId">xmlSAX2GetSystemId</a><br /> @@ -388,6 +390,8 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>skipped</dt><dd><a href="html/libxml-parserInternals.html#xmlParseElementChildrenContentDecl">xmlParseElementChildrenContentDecl</a><br /> <a href="html/libxml-parserInternals.html#xmlParseElementMixedContentDecl">xmlParseElementMixedContentDecl</a><br /> <a href="html/libxml-parserInternals.html#xmlSkipBlankChars">xmlSkipBlankChars</a><br /> +</dd><dt>slot</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> +</dd><dt>slots</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>smallest</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathCeilingFunction">xmlXPathCeilingFunction</a><br /> </dd><dt>socket</dt><dd><a href="html/libxml-xmlIO.html#xmlCheckFilename">xmlCheckFilename</a><br /> <a href="html/libxml-nanoftp.html#xmlNanoFTPGetSocket">xmlNanoFTPGetSocket</a><br /> @@ -797,6 +801,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-hash.html#xmlHashUpdateEntry3">xmlHashUpdateEntry3</a><br /> <a href="html/libxml-xmlschemastypes.html#xmlSchemaValueAppend">xmlSchemaValueAppend</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathCompareValues">xmlXPathCompareValues</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>succeeds</dt><dd><a href="html/libxml-xmlIO.html#xmlCheckFilename">xmlCheckFilename</a><br /> <a href="html/libxml-xmlwriter.html#xmlNewTextWriterPushParser">xmlNewTextWriterPushParser</a><br /> </dd><dt>successful</dt><dd><a href="html/libxml-catalog.html#xmlACatalogAdd">xmlACatalogAdd</a><br /> diff --git a/doc/APIchunk28.html b/doc/APIchunk28.html index 34ddc87..b5471fb 100644 --- a/doc/APIchunk28.html +++ b/doc/APIchunk28.html @@ -457,6 +457,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>xmlXPathFunction</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathFunctionLookup">xmlXPathFunctionLookup</a><br /> <a href="html/libxml-xpathInternals.html#xmlXPathFunctionLookupNS">xmlXPathFunctionLookupNS</a><br /> </dd><dt>xmlXPathNodeTrailingSorted</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathNodeTrailing">xmlXPathNodeTrailing</a><br /> +</dd><dt>xmlXPathObject</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>xmlXPathObjectPtr</dt><dd><a href="html/libxml-xpath.html#xmlXPathCompiledEval">xmlXPathCompiledEval</a><br /> <a href="html/libxml-xpath.html#xmlXPathEval">xmlXPathEval</a><br /> <a href="html/libxml-xpath.html#xmlXPathEvalExpression">xmlXPathEvalExpression</a><br /> diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html index dbc12b1..3ebc5a8 100644 --- a/doc/APIchunk5.html +++ b/doc/APIchunk5.html @@ -71,6 +71,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>Optional</dt><dd><a href="html/libxml-HTMLparser.html#_htmlElemDesc">_htmlElemDesc</a><br /> </dd><dt>Oriya</dt><dd><a href="html/libxml-xmlunicode.html#xmlUCSIsOriya">xmlUCSIsOriya</a><br /> </dd><dt>Osmanya</dt><dd><a href="html/libxml-xmlunicode.html#xmlUCSIsOsmanya">xmlUCSIsOsmanya</a><br /> +</dd><dt>Other</dt><dd><a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>Otherwise</dt><dd><a href="html/libxml-pattern.html#xmlStreamPush">xmlStreamPush</a><br /> <a href="html/libxml-pattern.html#xmlStreamPushAttr">xmlStreamPushAttr</a><br /> </dd><dt>Output</dt><dd><a href="html/libxml-xmlIO.html#xmlOutputCloseCallback">xmlOutputCloseCallback</a><br /> diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 87c07a4..82de64b 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -114,6 +114,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-parserInternals.html#xmlParseMarkupDecl">xmlParseMarkupDecl</a><br /> </dd><dt>Then</dt><dd><a href="html/libxml-valid.html#xmlValidateOneElement">xmlValidateOneElement</a><br /> </dd><dt>There</dt><dd><a href="html/libxml-xmlregexp.html#xmlExpParse">xmlExpParse</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>Those</dt><dd><a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br /> </dd><dt>Thus:</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathSubstringFunction">xmlXPathSubstringFunction</a><br /> </dd><dt>Tibetan</dt><dd><a href="html/libxml-xmlunicode.html#xmlUCSIsTibetan">xmlUCSIsTibetan</a><br /> @@ -249,6 +250,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlreader.html#xmlTextReaderSchemaValidate">xmlTextReaderSchemaValidate</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderSchemaValidateCtxt">xmlTextReaderSchemaValidateCtxt</a><br /> <a href="html/libxml-xmlreader.html#xmlTextReaderSetSchema">xmlTextReaderSetSchema</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> </dd><dt>Used</dt><dd><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ANY_LAX">XML_SCHEMAS_ANY_LAX</a><br /> <a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ANY_STRICT">XML_SCHEMAS_ANY_STRICT</a><br /> <a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ATTR_USE_PROHIBITED">XML_SCHEMAS_ATTR_USE_PROHIBITED</a><br /> diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 2de70cc..2a5af4b 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -2457,6 +2457,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlerror.html#XML_SCHEMAV_INVALIDATTR">XML_SCHEMAV_INVALIDATTR</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_INVALIDELEM">XML_SCHEMAV_INVALIDELEM</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_ISABSTRACT">XML_SCHEMAV_ISABSTRACT</a><br /> +<a href="html/libxml-xmlerror.html#XML_SCHEMAV_MISC">XML_SCHEMAV_MISC</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_MISSING">XML_SCHEMAV_MISSING</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOROLLBACK">XML_SCHEMAV_NOROLLBACK</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOROOT">XML_SCHEMAV_NOROOT</a><br /> @@ -3274,6 +3275,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xpath.html#xmlXPathCompiledEval">xmlXPathCompiledEval</a><br /> <a href="html/libxml-xpath.html#xmlXPathContext">xmlXPathContext</a><br /> <a href="html/libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertFunc">xmlXPathConvertFunc</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertNumber">xmlXPathConvertNumber</a><br /> diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 042bc3a..92489fb 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -2164,6 +2164,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xpathInternals.html#xmlXPathDebugDumpCompExpr">xmlXPathDebugDumpCompExpr</a><br /> <a href="html/libxml-xpath.html#xmlXPathFreeCompExpr">xmlXPathFreeCompExpr</a><br /> </p><h2>Type xmlXPathContextPtr:</h2><p><a href="html/libxml-xpath.html#xmlXPathCompiledEval">xmlXPathCompiledEval</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> <a href="html/libxml-xpath.html#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a><br /> <a href="html/libxml-xpath.html#xmlXPathEval">xmlXPathEval</a><br /> <a href="html/libxml-xpath.html#xmlXPathEvalExpression">xmlXPathEvalExpression</a><br /> diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index cc7019a..7e1ba3c 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -1199,6 +1199,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlerror.html#XML_SCHEMAV_INVALIDATTR">XML_SCHEMAV_INVALIDATTR</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_INVALIDELEM">XML_SCHEMAV_INVALIDELEM</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_ISABSTRACT">XML_SCHEMAV_ISABSTRACT</a><br /> +<a href="html/libxml-xmlerror.html#XML_SCHEMAV_MISC">XML_SCHEMAV_MISC</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_MISSING">XML_SCHEMAV_MISSING</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOROLLBACK">XML_SCHEMAV_NOROLLBACK</a><br /> <a href="html/libxml-xmlerror.html#XML_SCHEMAV_NOROOT">XML_SCHEMAV_NOROOT</a><br /> @@ -3292,6 +3293,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xpathInternals.html#xmlXPathContainsFunction">xmlXPathContainsFunction</a><br /> <a href="html/libxml-xpath.html#xmlXPathContext">xmlXPathContext</a><br /> <a href="html/libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a><br /> +<a href="html/libxml-xpath.html#xmlXPathContextSetCache">xmlXPathContextSetCache</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertFunc">xmlXPathConvertFunc</a><br /> <a href="html/libxml-xpath.html#xmlXPathConvertNumber">xmlXPathConvertNumber</a><br /> diff --git a/doc/DOM.html b/doc/DOM.html index 52f1139..a637399 100644 --- a/doc/DOM.html +++ b/doc/DOM.html @@ -7,11 +7,11 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>DOM Principles</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>DOM Principles</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p><a href="http://www.w3.org/DOM/">DOM</a> stands for the <em>Document -Object Model</em>; this is an API for accessing XML or HTML structured -documents. Native support for DOM in Gnome is on the way (module gnome-dom), -and will be based on gnome-xml. This will be a far cleaner interface to -manipulate XML files within Gnome since it won't expose the internal -structure.</p><p>The current DOM implementation on top of libxml2 is the <a href="http://cvs.gnome.org/lxr/source/gdome2/">gdome2 Gnome module</a>, this -is a full DOM interface, thanks to Paolo Casarini, check the <a href="http://www.cs.unibo.it/~casarini/gdome2/">Gdome2 homepage</a> for more -informations.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</style><title>DOM Principles</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>DOM Principles</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p><a href="http://www.w3.org/DOM/">DOM</a>stands for the +<em>DocumentObjectModel</em>; this is an API for accessing XML or HTML +structureddocuments.Native support for DOM in Gnome is on the way (module +gnome-dom),and will bebased on gnome-xml. This will be a far cleaner +interface tomanipulate XMLfiles within Gnome since it won't expose the +internalstructure.</p><p>The current DOM implementation on top of libxml2 is the <a href="http://cvs.gnome.org/lxr/source/gdome2/">gdome2 Gnome module</a>,thisis +a full DOM interface, thanks to Paolo Casarini, check the <a href="http://www.cs.unibo.it/~casarini/gdome2/">Gdome2 +homepage</a>formoreinformations.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/FAQ.html b/doc/FAQ.html index 0d5ded6..cdc6585 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -12,53 +12,49 @@ A:link, A:visited, A:active { text-decoration: underline } <li><a href="FAQ.html#Compilatio">Compilation</a></li> <li><a href="FAQ.html#Developer">Developer corner</a></li> </ul><h3><a name="License" id="License">License</a>(s)</h3><ol><li><em>Licensing Terms for libxml</em> - <p>libxml2 is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a>; see the file Copyright in the distribution for the precise - wording</p> + <p>libxml2 is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>;see + the file Copyright in the distribution for the precisewording</p> </li> <li><em>Can I embed libxml2 in a proprietary application ?</em> - <p>Yes. The MIT License allows you to keep proprietary the changes you - made to libxml, but it would be graceful to send-back bug fixes and - improvements as patches for possible incorporation in the main - development tree.</p> + <p>Yes. The MIT License allows you to keep proprietary the changesyoumade + to libxml, but it would be graceful to send-back bug fixesandimprovements + as patches for possible incorporation in themaindevelopment tree.</p> </li> -</ol><h3><a name="Installati" id="Installati">Installation</a></h3><ol><li><strong><span style="background-color: #FF0000">Do Not Use - libxml1</span></strong>, use libxml2</li> - <li><em>Where can I get libxml</em> ? - <p>The original distribution comes from <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> or <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">gnome.org</a></p> - <p>Most Linux and BSD distributions include libxml, this is probably the - safer way for end-users to use libxml.</p> +</ol><h3><a name="Installati" id="Installati">Installation</a></h3><ol><li><strong><span style="background-color: #FF0000">Do + NotUselibxml1</span></strong>, use libxml2</li> + <li><em>Where can I get libxml</em>? + <p>The original distribution comes from <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>or <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">gnome.org</a></p> + <p>Most Linux and BSD distributions include libxml, this is + probablythesafer way for end-users to use libxml.</p> <p>David Doolin provides precompiled Windows versions at <a href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/ ">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a></p> </li> <li><em>I see libxml and libxml2 releases, which one should I install ?</em> - <ul><li>If you are not constrained by backward compatibility issues with - existing applications, install libxml2 only</li> - <li>If you are not doing development, you can safely install both. - Usually the packages <a href="http://rpmfind.net/linux/RPM/libxml.html">libxml</a> and <a href="http://rpmfind.net/linux/RPM/libxml2.html">libxml2</a> are - compatible (this is not the case for development packages).</li> - <li>If you are a developer and your system provides separate packaging - for shared libraries and the development components, it is possible - to install libxml and libxml2, and also <a href="http://rpmfind.net/linux/RPM/libxml-devel.html">libxml-devel</a> - and <a href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml2-devel</a> - too for libxml2 >= 2.3.0</li> - <li>If you are developing a new application, please develop against - libxml2(-devel)</li> + <ul><li>If you are not constrained by backward compatibility + issueswithexisting applications, install libxml2 only</li> + <li>If you are not doing development, you can safely + installboth.Usually the packages <a href="http://rpmfind.net/linux/RPM/libxml.html">libxml</a>and <a href="http://rpmfind.net/linux/RPM/libxml2.html">libxml2</a>arecompatible(this + is not the case for development packages).</li> + <li>If you are a developer and your system provides + separatepackagingfor shared libraries and the development components, + it ispossibleto install libxml and libxml2, and also <a href="http://rpmfind.net/linux/RPM/libxml-devel.html">libxml-devel</a>and<a href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml2-devel</a>toofor + libxml2 >= 2.3.0</li> + <li>If you are developing a new application, please + developagainstlibxml2(-devel)</li> </ul></li> <li><em>I can't install the libxml package, it conflicts with libxml0</em> - <p>You probably have an old libxml0 package used to provide the shared - library for libxml.so.0, you can probably safely remove it. The libxml - packages provided on <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> provide - libxml.so.0</p> + <p>You probably have an old libxml0 package used to provide + thesharedlibrary for libxml.so.0, you can probably safely remove it. + Thelibxmlpackages provided on <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>providelibxml.so.0</p> </li> - <li><em>I can't install the libxml(2) RPM package due to failed - dependencies</em> - <p>The most generic solution is to re-fetch the latest src.rpm , and - rebuild it locally with</p> + <li><em>I can't install the libxml(2) RPM package due + tofaileddependencies</em> + <p>The most generic solution is to re-fetch the latest src.rpm + ,andrebuild it locally with</p> <p><code>rpm --rebuild libxml(2)-xxx.src.rpm</code>.</p> - <p>If everything goes well it will generate two binary rpm packages (one - providing the shared libs and xmllint, and the other one, the -devel - package, providing includes, static libraries and scripts needed to build - applications with libxml(2)) that you can install locally.</p> + <p>If everything goes well it will generate two binary rpm + packages(oneproviding the shared libs and xmllint, and the other one, + the-develpackage, providing includes, static libraries and scripts needed + tobuildapplications with libxml(2)) that you can install locally.</p> </li> </ol><h3><a name="Compilatio" id="Compilatio">Compilation</a></h3><ol><li><em>What is the process to compile libxml2 ?</em> <p>As most UNIX libraries libxml2 follows the "standard":</p> @@ -69,109 +65,106 @@ A:link, A:visited, A:active { text-decoration: underline } <p><code>./configure [possible options]</code></p> <p><code>make</code></p> <p><code>make install</code></p> - <p>At that point you may have to rerun ldconfig or a similar utility to - update your list of installed shared libs.</p> + <p>At that point you may have to rerun ldconfig or a similar + utilitytoupdate your list of installed shared libs.</p> </li> <li><em>What other libraries are needed to compile/install libxml2 ?</em> - <p>Libxml2 does not require any other library, the normal C ANSI API - should be sufficient (please report any violation to this rule you may - find).</p> - <p>However if found at configuration time libxml2 will detect and use the - following libs:</p> - <ul><li><a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a> : a - highly portable and available widely compression library.</li> - <li>iconv: a powerful character encoding conversion library. It is - included by default in recent glibc libraries, so it doesn't need to - be installed specifically on Linux. It now seems a <a href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">part - of the official UNIX</a> specification. Here is one <a href="http://www.gnu.org/software/libiconv/">implementation of the - library</a> which source can be found <a href="ftp://ftp.ilog.fr/pub/Users/haible/gnu/">here</a>.</li> + <p>Libxml2 does not require any other library, the normal C ANSIAPIshould + be sufficient (please report any violation to this rule youmayfind).</p> + <p>However if found at configuration time libxml2 will detect and + usethefollowing libs:</p> + <ul><li><a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a>:ahighly + portable and available widely compression library.</li> + <li>iconv: a powerful character encoding conversion library. + Itisincluded by default in recent glibc libraries, so it doesn't + needtobe installed specifically on Linux. It now seems a <a href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">partofthe + official UNIX</a>specification. Here is one <a href="http://www.gnu.org/software/libiconv/">implementation + ofthelibrary</a>which source can be found <a href="ftp://ftp.ilog.fr/pub/Users/haible/gnu/">here</a>.</li> </ul></li> <li><em>Make check fails on some platforms</em> - <p>Sometimes the regression tests' results don't completely match the - value produced by the parser, and the makefile uses diff to print the - delta. On some platforms the diff return breaks the compilation process; - if the diff is small this is probably not a serious problem.</p> - <p>Sometimes (especially on Solaris) make checks fail due to limitations - in make. Try using GNU-make instead.</p> + <p>Sometimes the regression tests' results don't completely matchthevalue + produced by the parser, and the makefile uses diff to printthedelta. On + some platforms the diff return breaks the compilationprocess;if the diff + is small this is probably not a serious problem.</p> + <p>Sometimes (especially on Solaris) make checks fail due tolimitationsin + make. Try using GNU-make instead.</p> </li> <li><em>I use the CVS version and there is no configure script</em> - <p>The configure script (and other Makefiles) are generated. Use the - autogen.sh script to regenerate the configure script and Makefiles, - like:</p> + <p>The configure script (and other Makefiles) are generated. + Usetheautogen.sh script to regenerate the configure script + andMakefiles,like:</p> <p><code>./autogen.sh --prefix=/usr --disable-shared</code></p> </li> <li><em>I have troubles when running make tests with gcc-3.0</em> - <p>It seems the initial release of gcc-3.0 has a problem with the - optimizer which miscompiles the URI module. Please use another - compiler.</p> + <p>It seems the initial release of gcc-3.0 has a problem withtheoptimizer + which miscompiles the URI module. Please useanothercompiler.</p> </li> -</ol><h3><a name="Developer" id="Developer">Developer</a> corner</h3><ol><li><em>Troubles compiling or linking programs using libxml2</em> - <p>Usually the problem comes from the fact that the compiler doesn't get - the right compilation or linking flags. There is a small shell script - <code>xml2-config</code> which is installed as part of libxml2 usual - install process which provides those flags. Use</p> +</ol><h3><a name="Developer" id="Developer">Developer</a>corner</h3><ol><li><em>Troubles compiling or linking programs using libxml2</em> + <p>Usually the problem comes from the fact that the compiler + doesn'tgetthe right compilation or linking flags. There is a small + shellscript<code>xml2-config</code>which is installed as part of + libxml2usualinstall process which provides those flags. Use</p> <p><code>xml2-config --cflags</code></p> <p>to get the compilation flags and</p> <p><code>xml2-config --libs</code></p> - <p>to get the linker flags. Usually this is done directly from the - Makefile as:</p> + <p>to get the linker flags. Usually this is done directly fromtheMakefile + as:</p> <p><code>CFLAGS=`xml2-config --cflags`</code></p> <p><code>LIBS=`xml2-config --libs`</code></p> </li> - <li><em>I want to install my own copy of libxml2 in my home directory and - link my programs against it, but it doesn't work</em> - <p>There are many different ways to accomplish this. Here is one way to - do this under Linux. Suppose your home directory is <code>/home/user. - </code>Then:</p> + <li><em>I want to install my own copy of libxml2 in my home + directoryandlink my programs against it, but it doesn't work</em> + <p>There are many different ways to accomplish this. Here is one waytodo + this under Linux. Suppose your home directory + is<code>/home/user.</code>Then:</p> <ul><li>Create a subdirectory, let's call it <code>myxml</code></li> <li>unpack the libxml2 distribution into that subdirectory</li> - <li>chdir into the unpacked distribution - (<code>/home/user/myxml/libxml2 </code>)</li> - <li>configure the library using the "<code>--prefix</code>" switch, - specifying an installation subdirectory in - <code>/home/user/myxml</code>, e.g. - <p><code>./configure --prefix /home/user/myxml/xmlinst</code> {other - configuration options}</p> + <li>chdir into the unpacked + distribution(<code>/home/user/myxml/libxml2</code>)</li> + <li>configure the library using the + "<code>--prefix</code>"switch,specifying an installation + subdirectoryin<code>/home/user/myxml</code>, e.g. + <p><code>./configure + --prefix/home/user/myxml/xmlinst</code>{otherconfiguration + options}</p> </li> - <li>now run <code>make</code> followed by <code>make install</code></li> - <li>At this point, the installation subdirectory contains the complete - "private" include files, library files and binary program files (e.g. - xmllint), located in - <p><code>/home/user/myxml/xmlinst/lib, - /home/user/myxml/xmlinst/include </code> and <code> - /home/user/myxml/xmlinst/bin</code></p> + <li>now run <code>make</code>followed by <code>make install</code></li> + <li>At this point, the installation subdirectory contains + thecomplete"private" include files, library files and binary + programfiles (e.g.xmllint), located in + <p><code>/home/user/myxml/xmlinst/lib,/home/user/myxml/xmlinst/include</code>and + <code>/home/user/myxml/xmlinst/bin</code></p> respectively.</li> - <li>In order to use this "private" library, you should first add it to - the beginning of your default PATH (so that your own private program - files such as xmllint will be used instead of the normal system - ones). To do this, the Bash command would be + <li>In order to use this "private" library, you should first add + ittothe beginning of your default PATH (so that your own + privateprogramfiles such as xmllint will be used instead of the + normalsystemones). To do this, the Bash command would be <p><code>export PATH=/home/user/myxml/xmlinst/bin:$PATH</code></p> </li> - <li>Now suppose you have a program <code>test1.c</code> that you would - like to compile with your "private" library. Simply compile it using - the command + <li>Now suppose you have a program <code>test1.c</code>that + youwouldlike to compile with your "private" library. Simply compile + itusingthe command <p><code>gcc `xml2-config --cflags --libs` -o test test.c</code></p> - Note that, because your PATH has been set with <code> - /home/user/myxml/xmlinst/bin</code> at the beginning, the xml2-config - program which you just installed will be used instead of the system - default one, and this will <em>automatically</em> get the correct - libraries linked with your program.</li> + Note that, because your PATH has been set + with<code>/home/user/myxml/xmlinst/bin</code>at the beginning, + thexml2-configprogram which you just installed will be used instead + ofthe systemdefault one, and this will <em>automatically</em>get + thecorrectlibraries linked with your program.</li> </ul></li> <p></p> <li><em>xmlDocDump() generates output on one line.</em> - <p>Libxml2 will not <strong>invent</strong> spaces in the content of a - document since <strong>all spaces in the content of a document are - significant</strong>. If you build a tree from the API and want - indentation:</p> + <p>Libxml2 will not <strong>invent</strong>spaces in the content + ofadocument since <strong>all spaces in the content of a + documentaresignificant</strong>. If you build a tree from the API + andwantindentation:</p> <ol><li>the correct way is to generate those yourself too.</li> - <li>the dangerous way is to ask libxml2 to add those blanks to your - content <strong>modifying the content of your document in the - process</strong>. The result may not be what you expect. There is - <strong>NO</strong> way to guarantee that such a modification won't - affect other parts of the content of your document. See <a href="http://xmlsoft.org/html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault - ()</a> and <a href="http://xmlsoft.org/html/libxml-tree.html#xmlSaveFormatFile">xmlSaveFormatFile - ()</a></li> + <li>the dangerous way is to ask libxml2 to add those blanks + toyourcontent <strong>modifying the content of your document + intheprocess</strong>. The result may not be what you expect. + Thereis<strong>NO</strong>way to guarantee that such a + modificationwon'taffect other parts of the content of your document. + See <a href="http://xmlsoft.org/html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault()</a>and<a href="http://xmlsoft.org/html/libxml-tree.html#xmlSaveFormatFile">xmlSaveFormatFile()</a></li> </ol></li> <li>Extra nodes in the document: <p><em>For a XML file as below:</em></p> @@ -180,10 +173,10 @@ A:link, A:visited, A:active { text-decoration: underline } <NODE CommFlag="0"/> <NODE CommFlag="1"/> </PLAN></pre> - <p><em>after parsing it with the function - pxmlDoc=xmlParseFile(...);</em></p> - <p><em>I want to the get the content of the first node (node with the - CommFlag="0")</em></p> + <p><em>after parsing it with + thefunctionpxmlDoc=xmlParseFile(...);</em></p> + <p><em>I want to the get the content of the first node (node + withtheCommFlag="0")</em></p> <p><em>so I did it as following;</em></p> <pre>xmlNodePtr pnode; pnode=pxmlDoc->children->children;</pre> @@ -191,63 +184,62 @@ pnode=pxmlDoc->children->children;</pre> <pre>pnode=pxmlDoc->children->children->next;</pre> <p><em>then it works. Can someone explain it to me.</em></p> <p></p> - <p>In XML all characters in the content of the document are significant - <strong>including blanks and formatting line breaks</strong>.</p> - <p>The extra nodes you are wondering about are just that, text nodes with - the formatting spaces which are part of the document but that people tend - to forget. There is a function <a href="http://xmlsoft.org/html/libxml-parser.html">xmlKeepBlanksDefault - ()</a> to remove those at parse time, but that's an heuristic, and its - use should be limited to cases where you are certain there is no - mixed-content in the document.</p> + <p>In XML all characters in the content of the document + aresignificant<strong>including blanks and formatting + linebreaks</strong>.</p> + <p>The extra nodes you are wondering about are just that, text + nodeswiththe formatting spaces which are part of the document but that + peopletendto forget. There is a function <a href="http://xmlsoft.org/html/libxml-parser.html">xmlKeepBlanksDefault()</a>toremove + those at parse time, but that's an heuristic, and itsuse should belimited + to cases where you are certain there is nomixed-content in + thedocument.</p> </li> - <li><em>I get compilation errors of existing code like when accessing - <strong>root</strong> or <strong>child fields</strong> of nodes.</em> - <p>You are compiling code developed for libxml version 1 and using a - libxml2 development environment. Either switch back to libxml v1 devel or - even better fix the code to compile with libxml2 (or both) by <a href="upgrade.html">following the instructions</a>.</p> + <li><em>I get compilation errors of existing code like + whenaccessing<strong>root</strong>or <strong>child + fields</strong>ofnodes.</em> + <p>You are compiling code developed for libxml version 1 and + usingalibxml2 development environment. Either switch back to libxml v1 + develoreven better fix the code to compile with libxml2 (or both) by <a href="upgrade.html">following the instructions</a>.</p> </li> - <li><em>I get compilation errors about non existing - <strong>xmlRootNode</strong> or <strong>xmlChildrenNode</strong> - fields.</em> - <p>The source code you are using has been <a href="upgrade.html">upgraded</a> to be able to compile with both libxml - and libxml2, but you need to install a more recent version: - libxml(-devel) >= 1.8.8 or libxml2(-devel) >= 2.1.0</p> + <li><em>I get compilation errors about + nonexisting<strong>xmlRootNode</strong>or<strong>xmlChildrenNode</strong>fields.</em> + <p>The source code you are using has been <a href="upgrade.html">upgraded</a>to be able to compile with both + libxmlandlibxml2, but you need to install a more recent + version:libxml(-devel)>= 1.8.8 or libxml2(-devel) >= 2.1.0</p> </li> <li><em>XPath implementation looks seriously broken</em> - <p>XPath implementation prior to 2.3.0 was really incomplete. Upgrade to - a recent version, there are no known bugs in the current version.</p> + <p>XPath implementation prior to 2.3.0 was really incomplete. Upgrade + toarecent version, there are no known bugs in the current version.</p> </li> <li><em>The example provided in the web page does not compile.</em> - <p>It's hard to maintain the documentation in sync with the code - <grin/> ...</p> - <p>Check the previous points 1/ and 2/ raised before, and please send - patches.</p> + <p>It's hard to maintain the documentation in sync with + thecode<grin/> ...</p> + <p>Check the previous points 1/ and 2/ raised before, and + pleasesendpatches.</p> </li> - <li><em>Where can I get more examples and information than provided on the - web page?</em> - <p>Ideally a libxml2 book would be nice. I have no such plan ... But you - can:</p> - <ul><li>check more deeply the <a href="html/libxml-lib.html">existing - generated doc</a></li> - <li>have a look at <a href="examples/index.html">the set of - examples</a>.</li> - <li>look for examples of use for libxml2 function using the Gnome code. - For example the following will query the full Gnome CVS base for the - use of the <strong>xmlAddChild()</strong> function: + <li><em>Where can I get more examples and information than provided + ontheweb page?</em> + <p>Ideally a libxml2 book would be nice. I have no such plan ... + Butyoucan:</p> + <ul><li>check more deeply the <a href="html/libxml-lib.html">existinggenerated doc</a></li> + <li>have a look at <a href="examples/index.html">the + setofexamples</a>.</li> + <li>look for examples of use for libxml2 function using the + Gnomecode.For example the following will query the full Gnome CVS + base fortheuse of the <strong>xmlAddChild()</strong>function: <p><a href="http://cvs.gnome.org/lxr/search?string=xmlAddChild">http://cvs.gnome.org/lxr/search?string=xmlAddChild</a></p> - <p>This may be slow, a large hardware donation to the gnome project - could cure this :-)</p> + <p>This may be slow, a large hardware donation to the + gnomeprojectcould cure this :-)</p> </li> - <li><a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&dir=gnome-xml">Browse - the libxml2 source</a> , I try to write code as clean and documented - as possible, so looking at it may be helpful. In particular the code - of xmllint.c and of the various testXXX.c test programs should - provide good examples of how to do things with the library.</li> + <li><a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&dir=gnome-xml">Browsethelibxml2 + source</a>, I try to write code as clean and documentedaspossible, so + looking at it may be helpful. In particular the codeofxmllint.c and + of the various testXXX.c test programs shouldprovidegood examples of + how to do things with the library.</li> </ul></li> <li>What about C++ ? - <p>libxml2 is written in pure C in order to allow easy reuse on a number - of platforms, including embedded systems. I don't intend to convert to - C++.</p> + <p>libxml2 is written in pure C in order to allow easy reuse on anumberof + platforms, including embedded systems. I don't intend to converttoC++.</p> <p>There is however a C++ wrapper which may fulfill your needs:</p> <ul><li>by Ari Johnson <ari@btigate.com>: <p>Website: <a href="http://libxmlplusplus.sourceforge.net/">http://libxmlplusplus.sourceforge.net/</a></p> @@ -261,11 +253,10 @@ pnode=pxmlDoc->children->children;</pre> --> </ul></li> <li>How to validate a document a posteriori ? - <p>It is possible to validate documents which had not been validated at - initial parsing time or documents which have been built from scratch - using the API. Use the <a href="http://xmlsoft.org/html/libxml-valid.html#xmlValidateDtd">xmlValidateDtd()</a> - function. It is also possible to simply add a DTD to an existing - document:</p> + <p>It is possible to validate documents which had not been + validatedatinitial parsing time or documents which have been built + fromscratchusing the API. Use the <a href="http://xmlsoft.org/html/libxml-valid.html#xmlValidateDtd">xmlValidateDtd()</a>function.It + is also possible to simply add a DTD to an existingdocument:</p> <pre>xmlDocPtr doc; /* your existing document */ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */ @@ -277,10 +268,10 @@ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */ </pre> </li> <li>So what is this funky "xmlChar" used all the time? - <p>It is a null terminated sequence of utf-8 characters. And only utf-8! - You need to convert strings encoded in different ways to utf-8 before - passing them to the API. This can be accomplished with the iconv library - for instance.</p> + <p>It is a null terminated sequence of utf-8 characters. And + onlyutf-8!You need to convert strings encoded in different ways to + utf-8beforepassing them to the API. This can be accomplished with the + iconvlibraryfor instance.</p> </li> <li>etc ...</li> </ol><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/Makefile.in b/doc/Makefile.in index cb91092..174aa7f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -100,6 +100,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -227,15 +228,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -252,23 +247,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/doc/XMLinfo.html b/doc/XMLinfo.html index 474f9c1..5314fac 100644 --- a/doc/XMLinfo.html +++ b/doc/XMLinfo.html @@ -7,9 +7,9 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>XML</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>XML</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p><a href="http://www.w3.org/TR/REC-xml">XML is a standard</a> for -markup-based structured documents. Here is <a name="example" id="example">an example XML -document</a>:</p><pre><?xml version="1.0"?> +</style><title>XML</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>XML</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p><a href="http://www.w3.org/TR/REC-xml">XML is astandard</a>formarkup-based +structured documents. Here is <a name="example" id="example">an example +XMLdocument</a>:</p><pre><?xml version="1.0"?> <EXAMPLE prop1="gnome is great" prop2="&amp; linux too"> <head> <title>Welcome to Gnome</title> @@ -20,16 +20,17 @@ document</a>:</p><pre><?xml version="1.0"?> <image href="linus.gif"/> <p>...</p> </chapter> -</EXAMPLE></pre><p>The first line specifies that it is an XML document and gives useful -information about its encoding. Then the rest of the document is a text -format whose structure is specified by tags between brackets. <strong>Each -tag opened has to be closed</strong>. XML is pedantic about this. However, if -a tag is empty (no content), a single tag can serve as both the opening and -closing tag if it ends with <code>/></code> rather than with -<code>></code>. Note that, for example, the image tag has no content (just -an attribute) and is closed by ending the tag with <code>/></code>.</p><p>XML can be applied successfully to a wide range of tasks, ranging from -long term structured document maintenance (where it follows the steps of -SGML) to simple data encoding mechanisms like configuration file formatting -(glade), spreadsheets (gnumeric), or even shorter lived documents such as -WebDAV where it is used to encode remote calls between a client and a -server.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</EXAMPLE></pre><p>The first line specifies that it is an XML document and +givesusefulinformation about its encoding. Then the rest of the document is +atextformat whose structure is specified by tags between +brackets.<strong>Eachtag opened has to be closed</strong>. XML is pedantic +about this.However, ifa tag is empty (no content), a single tag can serve as +both theopening andclosing tag if it ends with <code>/></code>rather +thanwith<code>></code>. Note that, for example, the image tag has no +content(justan attribute) and is closed by ending the tag +with<code>/></code>.</p><p>XML can be applied successfully to a wide range of tasks, ranging +fromlongterm structured document maintenance (where it follows the steps +ofSGML) tosimple data encoding mechanisms like configuration file +formatting(glade),spreadsheets (gnumeric), or even shorter lived documents +such asWebDAV whereit is used to encode remote calls between a client and +aserver.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/XSLT.html b/doc/XSLT.html index 657ead3..4a8c09b 100644 --- a/doc/XSLT.html +++ b/doc/XSLT.html @@ -7,7 +7,8 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>XSLT</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>XSLT</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Check <a href="http://xmlsoft.org/XSLT">the separate libxslt page</a></p><p><a href="http://www.w3.org/TR/xslt">XSL Transformations</a>, is a -language for transforming XML documents into other XML documents (or -HTML/textual output).</p><p>A separate library called libxslt is available implementing XSLT-1.0 for -libxml2. This module "libxslt" too can be found in the Gnome CVS base.</p><p>You can check the progresses on the libxslt <a href="http://xmlsoft.org/XSLT/ChangeLog.html">Changelog</a>.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</style><title>XSLT</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>XSLT</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Check <a href="http://xmlsoft.org/XSLT">the separate libxslt page</a></p><p><a href="http://www.w3.org/TR/xslt">XSL Transformations</a>, is +alanguagefor transforming XML documents into other XML documents +(orHTML/textualoutput).</p><p>A separate library called libxslt is available implementing +XSLT-1.0forlibxml2. This module "libxslt" too can be found in the Gnome CVS +base.</p><p>You can check the progresses on the libxslt <a href="http://xmlsoft.org/XSLT/ChangeLog.html">Changelog</a>.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/architecture.html b/doc/architecture.html index 906c5b2..7809bc6 100644 --- a/doc/architecture.html +++ b/doc/architecture.html @@ -7,8 +7,8 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>libxml2 architecture</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>libxml2 architecture</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Libxml2 is made of multiple components; some of them are optional, and -most of the block interfaces are public. The main components are:</p><ul><li>an Input/Output layer</li> +</style><title>libxml2 architecture</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>libxml2 architecture</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Libxml2 is made of multiple components; some of them are optional, +andmostof the block interfaces are public. The main components are:</p><ul><li>an Input/Output layer</li> <li>FTP and HTTP client layers (optional)</li> <li>an Internationalization layer managing the encodings support</li> <li>a URI module</li> @@ -17,7 +17,6 @@ most of the block interfaces are public. The main components are:</p><ul><li>an <li>a SAX tree module to build an in-memory DOM representation</li> <li>a tree module to manipulate the DOM representation</li> <li>a validation module using the DOM representation (optional)</li> - <li>an XPath module for global lookup in a DOM representation - (optional)</li> + <li>an XPath module for global lookup in a DOM representation(optional)</li> <li>a debug module (optional)</li> </ul><p>Graphically this gives the following:</p><p><img src="libxml.gif" alt="a graphical view of the various" /></p><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/bugs.html b/doc/bugs.html index 6415c85..c755d00 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -7,62 +7,62 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Reporting bugs and getting help</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Reporting bugs and getting help</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Well, bugs or missing features are always possible, and I will make a -point of fixing them in a timely fashion. The best way to report a bug is to -use the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnome -bug tracking database</a> (make sure to use the "libxml2" module name). I -look at reports there regularly and it's good to have a reminder when a bug -is still open. Be sure to specify that the bug is for the package libxml2.</p><p>For small problems you can try to get help on IRC, the #xml channel on -irc.gnome.org (port 6667) usually have a few person subscribed which may help -(but there is no garantee and if a real issue is raised it should go on the -mailing-list for archival).</p><p>There is also a mailing-list <a href="mailto:xml@gnome.org">xml@gnome.org</a> for libxml, with an <a href="http://mail.gnome.org/archives/xml/">on-line archive</a> (<a href="http://xmlsoft.org/messages">old</a>). To subscribe to this list, -please visit the <a href="http://mail.gnome.org/mailman/listinfo/xml">associated Web</a> page and -follow the instructions. <strong>Do not send code, I won't debug it</strong> -(but patches are really appreciated!).</p><p>Please note that with the current amount of virus and SPAM, sending mail -to the list without being subscribed won't work. There is *far too many -bounces* (in the order of a thousand a day !) I cannot approve them manually -anymore. If your mail to the list bounced waiting for administrator approval, -it is LOST ! Repost it and fix the problem triggering the error. Also please -note that <span style="color: #FF0000; background-color: #FFFFFF">emails with -a legal warning asking to not copy or redistribute freely the informations -they contain</span> are <strong>NOT</strong> acceptable for the mailing-list, -such mail will as much as possible be discarded automatically, and are less -likely to be answered if they made it to the list, <strong>DO NOT</strong> -post to the list from an email address where such legal requirements are -automatically added, get private paying support if you can't share -informations.</p><p>Check the following <strong><span style="color: #FF0000">before -posting</span></strong>:</p><ul><li>Read the <a href="FAQ.html">FAQ</a> and <a href="search.php">use the - search engine</a> to get information related to your problem.</li> - <li>Make sure you are <a href="ftp://xmlsoft.org/libxml2/">using a recent - version</a>, and that the problem still shows up in a recent version.</li> - <li>Check the <a href="http://mail.gnome.org/archives/xml/">list - archives</a> to see if the problem was reported already. In this case - there is probably a fix available, similarly check the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">registered - open bugs</a>.</li> - <li>Make sure you can reproduce the bug with xmllint or one of the test - programs found in source in the distribution.</li> - <li>Please send the command showing the error as well as the input (as an - attachment)</li> -</ul><p>Then send the bug with associated information to reproduce it to the <a href="mailto:xml@gnome.org">xml@gnome.org</a> list; if it's really libxml -related I will approve it. Please do not send mail to me directly, it makes -things really hard to track and in some cases I am not the best person to -answer a given question, ask on the list.</p><p>To <span style="color: #E50000">be really clear about support</span>:</p><ul><li>Support or help <span style="color: #E50000">requests MUST be sent to - the list or on bugzilla</span> in case of problems, so that the Question - and Answers can be shared publicly. Failing to do so carries the implicit - message "I want free support but I don't want to share the benefits with - others" and is not welcome. I will automatically Carbon-Copy the - xml@gnome.org mailing list for any technical reply made about libxml2 or - libxslt.</li> - <li>There is <span style="color: #E50000">no garantee of support</span>, if - your question remains unanswered after a week, repost it, making sure you - gave all the detail needed and the information requested.</li> - <li>Failing to provide information as requested or double checking first - for prior feedback also carries the implicit message "the time of the - library maintainers is less valuable than my time" and might not be - welcome.</li> -</ul><p>Of course, bugs reported with a suggested patch for fixing them will -probably be processed faster than those without.</p><p>If you're looking for help, a quick look at <a href="http://mail.gnome.org/archives/xml/">the list archive</a> may actually -provide the answer. I usually send source samples when answering libxml2 -usage questions. The <a href="http://xmlsoft.org/html/book1.html">auto-generated documentation</a> is -not as polished as I would like (i need to learn more about DocBook), but -it's a good starting point.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</style><title>Reporting bugs and getting help</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Reporting bugs and getting help</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Well, bugs or missing features are always possible, and I will make +apointof fixing them in a timely fashion. The best way to report a bug is +touse the<a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnomebugtracking +database</a>(make sure to use the "libxml2" module name). Ilook atreports +there regularly and it's good to have a reminder when a bugis stillopen. Be +sure to specify that the bug is for the package libxml2.</p><p>For small problems you can try to get help on IRC, the #xml +channelonirc.gnome.org (port 6667) usually have a few person subscribed which +mayhelp(but there is no garantee and if a real issue is raised it should go +onthemailing-list for archival).</p><p>There is also a mailing-list <a href="mailto:xml@gnome.org">xml@gnome.org</a>for libxml, with an <a href="http://mail.gnome.org/archives/xml/">on-line archive</a>(<a href="http://xmlsoft.org/messages">old</a>). To subscribe to this +list,pleasevisit the <a href="http://mail.gnome.org/mailman/listinfo/xml">associatedWeb</a>page +andfollow the instructions. <strong>Do not send code, I won'tdebug +it</strong>(but patches are really appreciated!).</p><p>Please note that with the current amount of virus and SPAM, sending +mailtothe list without being subscribed won't work. There is *far too +manybounces*(in the order of a thousand a day !) I cannot approve them +manuallyanymore.If your mail to the list bounced waiting for administrator +approval,it isLOST ! Repost it and fix the problem triggering the error. Also +pleasenotethat <span style="color: #FF0000; background-color: #FFFFFF">emails +withalegal warning asking to not copy or redistribute freely the +informationstheycontain</span>are <strong>NOT</strong>acceptable for the +mailing-list,suchmail will as much as possible be discarded automatically, +and are lesslikelyto be answered if they made it to the list, <strong>DO +NOT</strong>post tothe list from an email address where such legal +requirements areautomaticallyadded, get private paying support if you can't +shareinformations.</p><p>Check the following <strong><span style="color: #FF0000">beforeposting</span></strong>:</p><ul><li>Read the <a href="FAQ.html">FAQ</a>and <a href="search.php">usethesearch engine</a>to get information related to + your problem.</li> + <li>Make sure you are <a href="ftp://xmlsoft.org/libxml2/">using + arecentversion</a>, and that the problem still shows up in a + recentversion.</li> + <li>Check the <a href="http://mail.gnome.org/archives/xml/">listarchives</a>to see if + theproblem was reported already. In this casethere is probably a + fixavailable, similarly check the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">registeredopenbugs</a>.</li> + <li>Make sure you can reproduce the bug with xmllint or one of + thetestprograms found in source in the distribution.</li> + <li>Please send the command showing the error as well as the input + (asanattachment)</li> +</ul><p>Then send the bug with associated information to reproduce it to the <a href="mailto:xml@gnome.org">xml@gnome.org</a>list; if it's +reallylibxmlrelated I will approve it. Please do not send mail to me +directly, itmakesthings really hard to track and in some cases I am not the +best persontoanswer a given question, ask on the list.</p><p>To <span style="color: #E50000">be really clear about support</span>:</p><ul><li>Support or help <span style="color: #E50000">requests MUST be senttothe + list or on bugzilla</span>in case of problems, so that theQuestionand + Answers can be shared publicly. Failing to do so carries + theimplicitmessage "I want free support but I don't want to share + thebenefits withothers" and is not welcome. I will automatically + Carbon-Copythexml@gnome.org mailing list for any technical reply made + about libxml2orlibxslt.</li> + <li>There is <span style="color: #E50000">no garantee of + support</span>,ifyour question remains unanswered after a week, repost + it, making sureyougave all the detail needed and the information + requested.</li> + <li>Failing to provide information as requested or double checking + firstforprior feedback also carries the implicit message "the time of + thelibrarymaintainers is less valuable than my time" and might not + bewelcome.</li> +</ul><p>Of course, bugs reported with a suggested patch for fixing +themwillprobably be processed faster than those without.</p><p>If you're looking for help, a quick look at <a href="http://mail.gnome.org/archives/xml/">the list +archive</a>mayactuallyprovide the answer. I usually send source samples when +answeringlibxml2usage questions. The <a href="http://xmlsoft.org/html/book1.html">auto-generateddocumentation</a>isnot +as polished as I would like (i need to learn moreabout DocBook), butit's a +good starting point.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/catalog.html b/doc/catalog.html index 4100fed..34f9902 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -14,77 +14,78 @@ A:link, A:visited, A:active { text-decoration: underline } <li><a href="#reference">How to tune catalog usage</a></li> <li><a href="#validate">How to debug catalog processing</a></li> <li><a href="#Declaring">How to create and maintain catalogs</a></li> - <li><a href="#implemento">The implementor corner quick review of the - API</a></li> + <li><a href="#implemento">The implementor corner quick review + oftheAPI</a></li> <li><a href="#Other">Other resources</a></li> -</ol><h3><a name="General2" id="General2">General overview</a></h3><p>What is a catalog? Basically it's a lookup mechanism used when an entity -(a file or a remote resource) references another entity. The catalog lookup -is inserted between the moment the reference is recognized by the software -(XML parser, stylesheet processing, or even images referenced for inclusion -in a rendering) and the time where loading that resource is actually -started.</p><p>It is basically used for 3 things:</p><ul><li>mapping from "logical" names, the public identifiers and a more - concrete name usable for download (and URI). For example it can associate - the logical name +</ol><h3><a name="General2" id="General2">General overview</a></h3><p>What is a catalog? Basically it's a lookup mechanism used when an +entity(afile or a remote resource) references another entity. The catalog +lookupisinserted between the moment the reference is recognized by the +software(XMLparser, stylesheet processing, or even images referenced for +inclusionin arendering) and the time where loading that resource is +actuallystarted.</p><p>It is basically used for 3 things:</p><ul><li>mapping from "logical" names, the public identifiers and a + moreconcretename usable for download (and URI). For example it can + associatethelogical name <p>"-//OASIS//DTD DocBook XML V4.1.2//EN"</p> - <p>of the DocBook 4.1.2 XML DTD with the actual URL where it can be - downloaded</p> + <p>of the DocBook 4.1.2 XML DTD with the actual URL where it + canbedownloaded</p> <p>http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd</p> </li> - <li>remapping from a given URL to another one, like an HTTP indirection - saying that + <li>remapping from a given URL to another one, like an + HTTPindirectionsaying that <p>"http://www.oasis-open.org/committes/tr.xsl"</p> <p>should really be looked at</p> <p>"http://www.oasis-open.org/committes/entity/stylesheets/base/tr.xsl"</p> </li> - <li>providing a local cache mechanism allowing to load the entities - associated to public identifiers or remote resources, this is a really - important feature for any significant deployment of XML or SGML since it - allows to avoid the aleas and delays associated to fetching remote - resources.</li> -</ul><h3><a name="definition" id="definition">The definitions</a></h3><p>Libxml, as of 2.4.3 implements 2 kind of catalogs:</p><ul><li>the older SGML catalogs, the official spec is SGML Open Technical - Resolution TR9401:1997, but is better understood by reading <a href="http://www.jclark.com/sp/catalog.htm">the SP Catalog page</a> from - James Clark. This is relatively old and not the preferred mode of - operation of libxml.</li> - <li><a href="http://www.oasis-open.org/committees/entity/spec.html">XML - Catalogs</a> is far more flexible, more recent, uses an XML syntax and - should scale quite better. This is the default option of libxml.</li> -</ul><p></p><h3><a name="Simple" id="Simple">Using catalog</a></h3><p>In a normal environment libxml2 will by default check the presence of a -catalog in /etc/xml/catalog, and assuming it has been correctly populated, -the processing is completely transparent to the document user. To take a -concrete example, suppose you are authoring a DocBook document, this one -starts with the following DOCTYPE definition:</p><pre><?xml version='1.0'?> + <li>providing a local cache mechanism allowing to load + theentitiesassociated to public identifiers or remote resources, this is + areallyimportant feature for any significant deployment of XML or + SGMLsince itallows to avoid the aleas and delays associated to + fetchingremoteresources.</li> +</ul><h3><a name="definition" id="definition">The definitions</a></h3><p>Libxml, as of 2.4.3 implements 2 kind of catalogs:</p><ul><li>the older SGML catalogs, the official spec is SGML + OpenTechnicalResolution TR9401:1997, but is better understood by reading + <a href="http://www.jclark.com/sp/catalog.htm">the SP + Catalogpage</a>fromJames Clark. This is relatively old and not the + preferredmode ofoperation of libxml.</li> + <li><a href="http://www.oasis-open.org/committees/entity/spec.html">XMLCatalogs</a>isfar + more flexible, more recent, uses an XML syntax andshould scale + quitebetter. This is the default option of libxml.</li> +</ul><p></p><h3><a name="Simple" id="Simple">Using catalog</a></h3><p>In a normal environment libxml2 will by default check the presence +ofacatalog in /etc/xml/catalog, and assuming it has been +correctlypopulated,the processing is completely transparent to the document +user. Totake aconcrete example, suppose you are authoring a DocBook document, +thisonestarts with the following DOCTYPE definition:</p><pre><?xml version='1.0'?> <!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.4//EN" - "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd"></pre><p>When validating the document with libxml, the catalog will be -automatically consulted to lookup the public identifier "-//Norman Walsh//DTD -DocBk XML V3.1.4//EN" and the system identifier -"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if these entities have -been installed on your system and the catalogs actually point to them, libxml -will fetch them from the local disk.</p><p style="font-size: 10pt"><strong>Note</strong>: Really don't use this -DOCTYPE example it's a really old version, but is fine as an example.</p><p>Libxml2 will check the catalog each time that it is requested to load an -entity, this includes DTD, external parsed entities, stylesheets, etc ... If -your system is correctly configured all the authoring phase and processing -should use only local files, even if your document stays portable because it -uses the canonical public and system ID, referencing the remote document.</p><h3><a name="Some" id="Some">Some examples:</a></h3><p>Here is a couple of fragments from XML Catalogs used in libxml2 early -regression tests in <code>test/catalogs</code> :</p><pre><?xml version="1.0"?> + "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd"></pre><p>When validating the document with libxml, the catalog will +beautomaticallyconsulted to lookup the public identifier "-//Norman +Walsh//DTDDocBk XMLV3.1.4//EN" and the +systemidentifier"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if +theseentities havebeen installed on your system and the catalogs actually +point tothem, libxmlwill fetch them from the local disk.</p><p style="font-size: 10pt"><strong>Note</strong>: Really don't usethisDOCTYPE +example it's a really old version, but is fine as an example.</p><p>Libxml2 will check the catalog each time that it is requested to +loadanentity, this includes DTD, external parsed entities, stylesheets, etc +...Ifyour system is correctly configured all the authoring phase +andprocessingshould use only local files, even if your document stays +portablebecause ituses the canonical public and system ID, referencing the +remotedocument.</p><h3><a name="Some" id="Some">Some examples:</a></h3><p>Here is a couple of fragments from XML Catalogs used in +libxml2earlyregression tests in <code>test/catalogs</code>:</p><pre><?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/> -...</pre><p>This is the beginning of a catalog for DocBook 4.1.2, XML Catalogs are -written in XML, there is a specific namespace for catalog elements -"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry in this -catalog is a <code>public</code> mapping it allows to associate a Public -Identifier with an URI.</p><pre>... +...</pre><p>This is the beginning of a catalog for DocBook 4.1.2, XML +Catalogsarewritten in XML, there is a specific namespace for +catalogelements"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry +inthiscatalog is a <code>public</code>mapping it allows to associate +aPublicIdentifier with an URI.</p><pre>... <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/" rewritePrefix="file:///usr/share/xml/docbook/"/> -...</pre><p>A <code>rewriteSystem</code> is a very powerful instruction, it says that -any URI starting with a given prefix should be looked at another URI -constructed by replacing the prefix with an new one. In effect this acts like -a cache system for a full area of the Web. In practice it is extremely useful -with a file prefix if you have installed a copy of those resources on your -local system.</p><pre>... +...</pre><p>A <code>rewriteSystem</code>is a very powerful instruction, it saysthatany +URI starting with a given prefix should be looked at anotherURIconstructed by +replacing the prefix with an new one. In effect this actslikea cache system +for a full area of the Web. In practice it is extremelyusefulwith a file +prefix if you have installed a copy of those resources onyourlocal system.</p><pre>... <delegatePublic publicIdStartString="-//OASIS//DTD XML Catalog //" catalog="file:///usr/share/xml/docbook.xml"/> <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" @@ -95,21 +96,21 @@ local system.</p><pre>... catalog="file:///usr/share/xml/docbook.xml"/> <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/xml/docbook.xml"/> -...</pre><p>Delegation is the core features which allows to build a tree of catalogs, -easier to maintain than a single catalog, based on Public Identifier, System -Identifier or URI prefixes it instructs the catalog software to look up -entries in another resource. This feature allow to build hierarchies of -catalogs, the set of entries presented should be sufficient to redirect the -resolution of all DocBook references to the specific catalog in -<code>/usr/share/xml/docbook.xml</code> this one in turn could delegate all -references for DocBook 4.2.1 to a specific catalog installed at the same time -as the DocBook resources on the local machine.</p><h3><a name="reference" id="reference">How to tune catalog usage:</a></h3><p>The user can change the default catalog behaviour by redirecting queries -to its own set of catalogs, this can be done by setting the -<code>XML_CATALOG_FILES</code> environment variable to a list of catalogs, an -empty one should deactivate loading the default <code>/etc/xml/catalog</code> -default catalog</p><h3><a name="validate" id="validate">How to debug catalog processing:</a></h3><p>Setting up the <code>XML_DEBUG_CATALOG</code> environment variable will -make libxml2 output debugging informations for each catalog operations, for -example:</p><pre>orchis:~/XML -> xmllint --memory --noout test/ent2 +...</pre><p>Delegation is the core features which allows to build a tree +ofcatalogs,easier to maintain than a single catalog, based on +PublicIdentifier, SystemIdentifier or URI prefixes it instructs the +catalogsoftware to look upentries in another resource. This feature allow to +buildhierarchies ofcatalogs, the set of entries presented should be +sufficient toredirect theresolution of all DocBook references to the specific +catalogin<code>/usr/share/xml/docbook.xml</code>this one in turn could +delegateallreferences for DocBook 4.2.1 to a specific catalog installed at +the sametimeas the DocBook resources on the local machine.</p><h3><a name="reference" id="reference">How to tune catalog usage:</a></h3><p>The user can change the default catalog behaviour by redirecting +queriestoits own set of catalogs, this can be done by +settingthe<code>XML_CATALOG_FILES</code>environment variable to a list of +catalogs,anempty one should deactivate loading the +default<code>/etc/xml/catalog</code>default catalog</p><h3><a name="validate" id="validate">How to debug catalog processing:</a></h3><p>Setting up the <code>XML_DEBUG_CATALOG</code>environment variable +willmakelibxml2 output debugging informations for each catalog +operations,forexample:</p><pre>orchis:~/XML -> xmllint --memory --noout test/ent2 warning: failed to load external entity "title.xml" orchis:~/XML -> export XML_DEBUG_CATALOG= orchis:~/XML -> xmllint --memory --noout test/ent2 @@ -117,26 +118,26 @@ Failed to parse catalog /etc/xml/catalog Failed to parse catalog /etc/xml/catalog warning: failed to load external entity "title.xml" Catalogs cleanup -orchis:~/XML -> </pre><p>The test/ent2 references an entity, running the parser from memory makes -the base URI unavailable and the the "title.xml" entity cannot be loaded. -Setting up the debug environment variable allows to detect that an attempt is -made to load the <code>/etc/xml/catalog</code> but since it's not present the -resolution fails.</p><p>But the most advanced way to debug XML catalog processing is to use the -<strong>xmlcatalog</strong> command shipped with libxml2, it allows to load -catalogs and make resolution queries to see what is going on. This is also -used for the regression tests:</p><pre>orchis:~/XML -> ./xmlcatalog test/catalogs/docbook.xml \ +orchis:~/XML -> </pre><p>The test/ent2 references an entity, running the parser from memorymakesthe +base URI unavailable and the the "title.xml" entity cannot beloaded.Setting +up the debug environment variable allows to detect that anattempt ismade to +load the <code>/etc/xml/catalog</code>but since it's notpresent theresolution +fails.</p><p>But the most advanced way to debug XML catalog processing is to +usethe<strong>xmlcatalog</strong>command shipped with libxml2, it allows +toloadcatalogs and make resolution queries to see what is going on. This +isalsoused for the regression tests:</p><pre>orchis:~/XML -> ./xmlcatalog test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -orchis:~/XML -> </pre><p>For debugging what is going on, adding one -v flags increase the verbosity -level to indicate the processing done (adding a second flag also indicate -what elements are recognized at parsing):</p><pre>orchis:~/XML -> ./xmlcatalog -v test/catalogs/docbook.xml \ +orchis:~/XML -> </pre><p>For debugging what is going on, adding one -v flags increase +theverbositylevel to indicate the processing done (adding a second flag +alsoindicatewhat elements are recognized at parsing):</p><pre>orchis:~/XML -> ./xmlcatalog -v test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" Parsing catalog test/catalogs/docbook.xml's content Found public match -//OASIS//DTD DocBook XML V4.1.2//EN http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd Catalogs cleanup -orchis:~/XML -> </pre><p>A shell interface is also available to debug and process multiple queries -(and for regression tests):</p><pre>orchis:~/XML -> ./xmlcatalog -shell test/catalogs/docbook.xml \ +orchis:~/XML -> </pre><p>A shell interface is also available to debug and process +multiplequeries(and for regression tests):</p><pre>orchis:~/XML -> ./xmlcatalog -shell test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" > help Commands available: @@ -152,18 +153,18 @@ exit: quit the shell > public "-//OASIS//DTD DocBook XML V4.1.2//EN" http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd > quit -orchis:~/XML -> </pre><p>This should be sufficient for most debugging purpose, this was actually -used heavily to debug the XML Catalog implementation itself.</p><h3><a name="Declaring" id="Declaring">How to create and maintain</a> catalogs:</h3><p>Basically XML Catalogs are XML files, you can either use XML tools to -manage them or use <strong>xmlcatalog</strong> for this. The basic step is -to create a catalog the -create option provide this facility:</p><pre>orchis:~/XML -> ./xmlcatalog --create tst.xml +orchis:~/XML -> </pre><p>This should be sufficient for most debugging purpose, this wasactuallyused +heavily to debug the XML Catalog implementation itself.</p><h3><a name="Declaring" id="Declaring">How to create and maintain</a>catalogs:</h3><p>Basically XML Catalogs are XML files, you can either use XML toolstomanage +them or use <strong>xmlcatalog</strong>for this. The basic stepisto create a +catalog the -create option provide this facility:</p><pre>orchis:~/XML -> ./xmlcatalog --create tst.xml <?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/> -orchis:~/XML -> </pre><p>By default xmlcatalog does not overwrite the original catalog and save the -result on the standard output, this can be overridden using the -noout -option. The <code>-add</code> command allows to add entries in the -catalog:</p><pre>orchis:~/XML -> ./xmlcatalog --noout --create --add "public" \ +orchis:~/XML -> </pre><p>By default xmlcatalog does not overwrite the original catalog and +savetheresult on the standard output, this can be overridden using +the-nooutoption. The <code>-add</code>command allows to add entries +inthecatalog:</p><pre>orchis:~/XML -> ./xmlcatalog --noout --create --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd tst.xml orchis:~/XML -> cat tst.xml @@ -174,83 +175,80 @@ orchis:~/XML -> cat tst.xml <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/> </catalog> -orchis:~/XML -> </pre><p>The <code>-add</code> option will always take 3 parameters even if some of -the XML Catalog constructs (like nextCatalog) will have only a single -argument, just pass a third empty string, it will be ignored.</p><p>Similarly the <code>-del</code> option remove matching entries from the -catalog:</p><pre>orchis:~/XML -> ./xmlcatalog --del \ +orchis:~/XML -> </pre><p>The <code>-add</code>option will always take 3 parameters even if +someofthe XML Catalog constructs (like nextCatalog) will have only +asingleargument, just pass a third empty string, it will be ignored.</p><p>Similarly the <code>-del</code>option remove matching entries +fromthecatalog:</p><pre>orchis:~/XML -> ./xmlcatalog --del \ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" tst.xml <?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/> -orchis:~/XML -> </pre><p>The catalog is now empty. Note that the matching of <code>-del</code> is -exact and would have worked in a similar fashion with the Public ID -string.</p><p>This is rudimentary but should be sufficient to manage a not too complex -catalog tree of resources.</p><h3><a name="implemento" id="implemento">The implementor corner quick review of the -API:</a></h3><p>First, and like for every other module of libxml, there is an -automatically generated <a href="html/libxml-catalog.html">API page for -catalog support</a>.</p><p>The header for the catalog interfaces should be included as:</p><pre>#include <libxml/catalog.h></pre><p>The API is voluntarily kept very simple. First it is not obvious that -applications really need access to it since it is the default behaviour of -libxml2 (Note: it is possible to completely override libxml2 default catalog -by using <a href="html/libxml-parser.html">xmlSetExternalEntityLoader</a> to -plug an application specific resolver).</p><p>Basically libxml2 support 2 catalog lists:</p><ul><li>the default one, global shared by all the application</li> - <li>a per-document catalog, this one is built if the document uses the - <code>oasis-xml-catalog</code> PIs to specify its own catalog list, it is - associated to the parser context and destroyed when the parsing context - is destroyed.</li> -</ul><p>the document one will be used first if it exists.</p><h4>Initialization routines:</h4><p>xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs() should be -used at startup to initialize the catalog, if the catalog should be -initialized with specific values xmlLoadCatalog() or xmlLoadCatalogs() -should be called before xmlInitializeCatalog() which would otherwise do a -default initialization first.</p><p>The xmlCatalogAddLocal() call is used by the parser to grow the document -own catalog list if needed.</p><h4>Preferences setup:</h4><p>The XML Catalog spec requires the possibility to select default -preferences between public and system delegation, -xmlCatalogSetDefaultPrefer() allows this, xmlCatalogSetDefaults() and -xmlCatalogGetDefaults() allow to control if XML Catalogs resolution should -be forbidden, allowed for global catalog, for document catalog or both, the -default is to allow both.</p><p>And of course xmlCatalogSetDebug() allows to generate debug messages -(through the xmlGenericError() mechanism).</p><h4>Querying routines:</h4><p>xmlCatalogResolve(), xmlCatalogResolveSystem(), xmlCatalogResolvePublic() -and xmlCatalogResolveURI() are relatively explicit if you read the XML -Catalog specification they correspond to section 7 algorithms, they should -also work if you have loaded an SGML catalog with a simplified semantic.</p><p>xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the same but -operate on the document catalog list</p><h4>Cleanup and Miscellaneous:</h4><p>xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal() is -the per-document equivalent.</p><p>xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically modify the -first catalog in the global list, and xmlCatalogDump() allows to dump a -catalog state, those routines are primarily designed for xmlcatalog, I'm not -sure that exposing more complex interfaces (like navigation ones) would be -really useful.</p><p>The xmlParseCatalogFile() is a function used to load XML Catalog files, -it's similar as xmlParseFile() except it bypass all catalog lookups, it's -provided because this functionality may be useful for client tools.</p><h4>threaded environments:</h4><p>Since the catalog tree is built progressively, some care has been taken to -try to avoid troubles in multithreaded environments. The code is now thread -safe assuming that the libxml2 library has been compiled with threads -support.</p><p></p><h3><a name="Other" id="Other">Other resources</a></h3><p>The XML Catalog specification is relatively recent so there isn't much -literature to point at:</p><ul><li>You can find a good rant from Norm Walsh about <a href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">the - need for catalogs</a>, it provides a lot of context informations even if - I don't agree with everything presented. Norm also wrote a more recent - article <a href="http://wwws.sun.com/software/xml/developers/resolver/article/">XML - entities and URI resolvers</a> describing them.</li> - <li>An <a href="http://home.ccil.org/~cowan/XML/XCatalog.html">old XML - catalog proposal</a> from John Cowan</li> - <li>The <a href="http://www.rddl.org/">Resource Directory Description - Language</a> (RDDL) another catalog system but more oriented toward - providing metadata for XML namespaces.</li> - <li>the page from the OASIS Technical <a href="http://www.oasis-open.org/committees/entity/">Committee on Entity - Resolution</a> who maintains XML Catalog, you will find pointers to the - specification update, some background and pointers to others tools - providing XML Catalog support</li> - <li>There is a <a href="buildDocBookCatalog">shell script</a> to generate - XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/ - directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on - the resources found on the system. Otherwise it will just create - ~/xmlcatalog and ~/dbkxmlcatalog and doing: +orchis:~/XML -> </pre><p>The catalog is now empty. Note that the matching +of<code>-del</code>isexact and would have worked in a similar fashion with +thePublic IDstring.</p><p>This is rudimentary but should be sufficient to manage a not +toocomplexcatalog tree of resources.</p><h3><a name="implemento" id="implemento">The implementor corner quick review +oftheAPI:</a></h3><p>First, and like for every other module of libxml, there is +anautomaticallygenerated <a href="html/libxml-catalog.html">API page +forcatalogsupport</a>.</p><p>The header for the catalog interfaces should be included as:</p><pre>#include <libxml/catalog.h></pre><p>The API is voluntarily kept very simple. First it is not +obviousthatapplications really need access to it since it is the default +behaviouroflibxml2 (Note: it is possible to completely override libxml2 +defaultcatalogby using <a href="html/libxml-parser.html">xmlSetExternalEntityLoader</a>toplug +anapplication specific resolver).</p><p>Basically libxml2 support 2 catalog lists:</p><ul><li>the default one, global shared by all the application</li> + <li>a per-document catalog, this one is built if the document + usesthe<code>oasis-xml-catalog</code>PIs to specify its own catalog list, + itisassociated to the parser context and destroyed when the + parsingcontextis destroyed.</li> +</ul><p>the document one will be used first if it exists.</p><h4>Initialization routines:</h4><p>xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs() +shouldbeused at startup to initialize the catalog, if the catalog +shouldbeinitialized with specific values xmlLoadCatalog() +orxmlLoadCatalogs()should be called before xmlInitializeCatalog() which +wouldotherwise do adefault initialization first.</p><p>The xmlCatalogAddLocal() call is used by the parser to grow thedocumentown +catalog list if needed.</p><h4>Preferences setup:</h4><p>The XML Catalog spec requires the possibility to select +defaultpreferencesbetween public and system +delegation,xmlCatalogSetDefaultPrefer() allowsthis, xmlCatalogSetDefaults() +andxmlCatalogGetDefaults() allow to control ifXML Catalogs resolution +shouldbe forbidden, allowed for global catalog, fordocument catalog or both, +thedefault is to allow both.</p><p>And of course xmlCatalogSetDebug() allows to generate +debugmessages(through the xmlGenericError() mechanism).</p><h4>Querying routines:</h4><p>xmlCatalogResolve(), +xmlCatalogResolveSystem(),xmlCatalogResolvePublic()and xmlCatalogResolveURI() +are relatively explicitif you read the XMLCatalog specification they +correspond to section 7algorithms, they shouldalso work if you have loaded an +SGML catalog with asimplified semantic.</p><p>xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the +samebutoperate on the document catalog list</p><h4>Cleanup and Miscellaneous:</h4><p>xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal()isthe +per-document equivalent.</p><p>xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically +modifythefirst catalog in the global list, and xmlCatalogDump() allows to +dumpacatalog state, those routines are primarily designed for xmlcatalog, +I'mnotsure that exposing more complex interfaces (like navigation ones) +wouldbereally useful.</p><p>The xmlParseCatalogFile() is a function used to load XML Catalogfiles,it's +similar as xmlParseFile() except it bypass all catalog lookups,it'sprovided +because this functionality may be useful for client tools.</p><h4>threaded environments:</h4><p>Since the catalog tree is built progressively, some care has been +takentotry to avoid troubles in multithreaded environments. The code is +nowthreadsafe assuming that the libxml2 library has been compiled +withthreadssupport.</p><p></p><h3><a name="Other" id="Other">Other resources</a></h3><p>The XML Catalog specification is relatively recent so there +isn'tmuchliterature to point at:</p><ul><li>You can find a good rant from Norm Walsh about <a href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">theneedfor + catalogs</a>, it provides a lot of context informations even ifIdon't + agree with everything presented. Norm also wrote a morerecentarticle <a href="http://wwws.sun.com/software/xml/developers/resolver/article/">XMLentitiesand + URI resolvers</a>describing them.</li> + <li>An <a href="http://home.ccil.org/~cowan/XML/XCatalog.html">oldXMLcatalog + proposal</a>from John Cowan</li> + <li>The <a href="http://www.rddl.org/">Resource + DirectoryDescriptionLanguage</a>(RDDL) another catalog system but more + orientedtowardproviding metadata for XML namespaces.</li> + <li>the page from the OASIS Technical <a href="http://www.oasis-open.org/committees/entity/">Committee + onEntityResolution</a>who maintains XML Catalog, you will find pointers + tothespecification update, some background and pointers to + otherstoolsproviding XML Catalog support</li> + <li>There is a <a href="buildDocBookCatalog">shell script</a>to + generateXMLCatalogs for DocBook 4.1.2 . If it can write to the + /etc/xml/directory,it will set-up /etc/xml/catalog and /etc/xml/docbook + based ontheresources found on the system. Otherwise it will just + create~/xmlcatalogand ~/dbkxmlcatalog and doing: <p><code>export XML_CATALOG_FILES=$HOME/xmlcatalog</code></p> - <p>should allow to process DocBook documentations without requiring - network accesses for the DTD or stylesheets</p> + <p>should allow to process DocBook documentations withoutrequiringnetwork + accesses for the DTD or stylesheets</p> </li> - <li>I have uploaded <a href="ftp://xmlsoft.org/libxml2/test/dbk412catalog.tar.gz">a - small tarball</a> containing XML Catalogs for DocBook 4.1.2 which seems - to work fine for me too</li> - <li>The <a href="http://www.xmlsoft.org/xmlcatalog_man.html">xmlcatalog - manual page</a></li> -</ul><p>If you have suggestions for corrections or additions, simply contact -me:</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> + <li>I have uploaded <a href="ftp://xmlsoft.org/libxml2/test/dbk412catalog.tar.gz">asmalltarball</a>containing + XML Catalogs for DocBook 4.1.2 which seemsto workfine for me too</li> + <li>The <a href="http://www.xmlsoft.org/xmlcatalog_man.html">xmlcatalogmanualpage</a></li> +</ul><p>If you have suggestions for corrections or additions, simply contactme:</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/contribs.html b/doc/contribs.html index e493eb3..2163d60 100644 --- a/doc/contribs.html +++ b/doc/contribs.html @@ -7,34 +7,29 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Contributions</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Contributions</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><ul><li>Bjorn Reese, William Brack and Thomas Broyer have provided a number of - patches, Gary Pennington worked on the validation API, threading support - and Solaris port.</li> +</style><title>Contributions</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Contributions</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><ul><li>Bjorn Reese, William Brack and Thomas Broyer have provided a + numberofpatches, Gary Pennington worked on the validation API, + threadingsupportand Solaris port.</li> <li>John Fleck helps maintaining the documentation and man pages.</li> - <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a> is now the - maintainer of the Windows port, <a href="http://www.zlatkovic.com/projects/libxml/index.html">he provides - binaries</a></li> - <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a> provides - <a href="http://garypennington.net/libxml2/">Solaris binaries</a></li> - <li><a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt - Sergeant</a> developed <a href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl wrapper for - libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML - application server</a></li> - <li><a href="mailto:fnatter@gmx.net">Felix Natter</a> and <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions - documentation</li> - <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a> provided <a href="http://xmlsoft.org/messages/0488.html">man pages</a></li> - <li>there is a module for <a href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxslt support - in OpenNSD/AOLServer</a></li> - <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provided the - first version of libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a></li> - <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue - libxml2</a> with Kylix and Delphi and other Pascal compilers</li> - <li><a href="mailto:aleksey@aleksey.com">Aleksey Sanin</a> implemented the - <a href="http://www.w3.org/Signature/">XML Canonicalization and XML - Digital Signature</a> <a href="http://www.aleksey.com/xmlsec/">implementations for libxml2</a></li> - <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a> and - contributors maintain <a href="http://tclxml.sourceforge.net/">tcl - bindings for libxml2 and libxslt</a>, as well as <a href="http://tclxml.sf.net/tkxmllint.html">tkxmllint</a> a GUI for - xmllint and <a href="http://tclxml.sf.net/tkxsltproc.html">tkxsltproc</a> - a GUI for xsltproc.</li> + <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>is + nowthemaintainer of the Windows port, <a href="http://www.zlatkovic.com/projects/libxml/index.html">heprovidesbinaries</a></li> + <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a>provides<a href="http://garypennington.net/libxml2/">Solaris binaries</a></li> + <li><a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">MattSergeant</a>developed<a href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl + wrapperforlibxml2/libxslt as part of the <a href="http://axkit.com/">AxKitXMLapplication server</a></li> + <li><a href="mailto:fnatter@gmx.net">Felix Natter</a>and <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a>provide <a href="libxml-doc.el">an emacs module</a>to lookup + libxml(2)functionsdocumentation</li> + <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a>provided <a href="http://xmlsoft.org/messages/0488.html">man pages</a></li> + <li>there is a module for <a href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxsltsupportin + OpenNSD/AOLServer</a></li> + <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave + Kuhlman</a>providedthefirst version of libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a></li> + <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units + togluelibxml2</a>with Kylix and Delphi and other Pascal compilers</li> + <li><a href="mailto:aleksey@aleksey.com">Aleksey Sanin</a>implemented the<a href="http://www.w3.org/Signature/">XML Canonicalization and + XMLDigitalSignature</a><a href="http://www.aleksey.com/xmlsec/">implementations forlibxml2</a></li> + <li><a href="mailto:Steve.Ball@explain.com.au">SteveBall</a>andcontributors + maintain <a href="http://tclxml.sourceforge.net/">tclbindings for libxml2 + andlibxslt</a>, as well as <a href="http://tclxml.sf.net/tkxmllint.html">tkxmllint</a>a GUI + forxmllintand <a href="http://tclxml.sf.net/tkxsltproc.html">tkxsltproc</a>a GUIfor + xsltproc.</li> </ul><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in index 76dd23c..52421e6 100644 --- a/doc/devhelp/Makefile.in +++ b/doc/devhelp/Makefile.in @@ -87,6 +87,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -214,15 +215,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -239,23 +234,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index d0eb477..7545da4 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -707,6 +707,7 @@ void <a href="#xmlResetError">xmlResetError</a> (<a href="libxml2-xmlerror.htm <a name="XML_SCHEMAV_CVC_TYPE_2">XML_SCHEMAV_CVC_TYPE_2</a> = 1876 /* 1876 */ <a name="XML_SCHEMAV_CVC_IDC">XML_SCHEMAV_CVC_IDC</a> = 1877 /* 1877 */ <a name="XML_SCHEMAV_CVC_WILDCARD">XML_SCHEMAV_CVC_WILDCARD</a> = 1878 /* 1878 */ + <a name="XML_SCHEMAV_MISC">XML_SCHEMAV_MISC</a> = 1879 /* 1879 */ <a name="XML_XPTR_UNKNOWN_SCHEME">XML_XPTR_UNKNOWN_SCHEME</a> = 1900 <a name="XML_XPTR_CHILDSEQ_START">XML_XPTR_CHILDSEQ_START</a> = 1901 /* 1901 */ <a name="XML_XPTR_EVAL_FAILED">XML_XPTR_EVAL_FAILED</a> = 1902 /* 1902 */ diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html index 4d1a4cc..f3fe7a6 100644 --- a/doc/devhelp/libxml2-xpath.html +++ b/doc/devhelp/libxml2-xpath.html @@ -72,6 +72,7 @@ int <a href="#xmlXPathCastNodeSetToBoolean">xmlXPathCastNodeSetToBoolean</a> (<a typedef <a href="libxml2-xpath.html#xmlXPathFunction">xmlXPathFunction</a> <a href="#xmlXPathFuncLookupFunc">xmlXPathFuncLookupFunc</a> (void * ctxt, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ns_uri); <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlXPathCastNodeToString">xmlXPathCastNodeToString</a> (<a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> node); int <a href="#xmlXPathIsNaN">xmlXPathIsNaN</a> (double val); +int <a href="#xmlXPathContextSetCache">xmlXPathContextSetCache</a> (<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/> int active, <br/> int value, <br/> int options); <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathConvertString">xmlXPathConvertString</a> (<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val); <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a> (<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val); int <a href="#xmlXPathIsInf">xmlXPathIsInf</a> (double val); @@ -209,7 +210,8 @@ The content of this structure is not made public by the API. <a href="libxml2-xmlerror.html#xmlError">xmlError</a> lastError : the last error <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> debugNode : the source node XSLT dictionnary <a href="libxml2-dict.html#xmlDictPtr">xmlDictPtr</a> dict : dictionnary if any - int flags : flags to control compilation + int flags : flags to control compilation Cache for reusal of XPath objects + void * cache } xmlXPathContext; </pre><p/> </div> @@ -436,6 +438,10 @@ The content of this structure is not made public by the API. </pre><p>Evaluate the Precompiled XPath expression in the given context.</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the compiled XPath expression</td></tr><tr><td><span class="term"><i><tt>ctx</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> resulting from the evaluation or NULL. the caller has to free the object.</td></tr></tbody></table></div></div> <hr/> + <div class="refsect2" lang="en"><h3><a name="xmlXPathContextSetCache"/>xmlXPathContextSetCache ()</h3><pre class="programlisting">int xmlXPathContextSetCache (<a href="libxml2-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br/> int active, <br/> int value, <br/> int options)<br/> +</pre><p>Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.</p> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>active</tt></i>:</span></td><td>enables/disables (creates/frees) the cache</td></tr><tr><td><span class="term"><i><tt>value</tt></i>:</span></td><td>a value with semantics dependant on @options</td></tr><tr><td><span class="term"><i><tt>options</tt></i>:</span></td><td>options (currently only the value 0 is used)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if the setting succeeded, and -1 on API or internal errors.</td></tr></tbody></table></div></div> + <hr/> <div class="refsect2" lang="en"><h3><a name="xmlXPathConvertBoolean"/>xmlXPathConvertBoolean ()</h3><pre class="programlisting"><a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> xmlXPathConvertBoolean (<a href="libxml2-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val)<br/> </pre><p>Converts an existing object to its boolean() equivalent</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>val</tt></i>:</span></td><td>an XPath object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new object, the old one is freed (or the operation is done directly on @val)</td></tr></tbody></table></div></div> diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index ca79c03..e0af836 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -1297,6 +1297,7 @@ <function name="XML_SCHEMAV_INVALIDATTR" link="libxml2-xmlerror.html#XML_SCHEMAV_INVALIDATTR"/> <function name="XML_SCHEMAV_INVALIDELEM" link="libxml2-xmlerror.html#XML_SCHEMAV_INVALIDELEM"/> <function name="XML_SCHEMAV_ISABSTRACT" link="libxml2-xmlerror.html#XML_SCHEMAV_ISABSTRACT"/> + <function name="XML_SCHEMAV_MISC" link="libxml2-xmlerror.html#XML_SCHEMAV_MISC"/> <function name="XML_SCHEMAV_MISSING" link="libxml2-xmlerror.html#XML_SCHEMAV_MISSING"/> <function name="XML_SCHEMAV_NOROLLBACK" link="libxml2-xmlerror.html#XML_SCHEMAV_NOROLLBACK"/> <function name="XML_SCHEMAV_NOROOT" link="libxml2-xmlerror.html#XML_SCHEMAV_NOROOT"/> @@ -3320,6 +3321,7 @@ <function name="xmlXPathCompiledEval ()" link="libxml2-xpath.html#xmlXPathCompiledEval"/> <function name="xmlXPathConcatFunction ()" link="libxml2-xpathInternals.html#xmlXPathConcatFunction"/> <function name="xmlXPathContainsFunction ()" link="libxml2-xpathInternals.html#xmlXPathContainsFunction"/> + <function name="xmlXPathContextSetCache ()" link="libxml2-xpath.html#xmlXPathContextSetCache"/> <function name="xmlXPathConvertBoolean ()" link="libxml2-xpath.html#xmlXPathConvertBoolean"/> <function name="xmlXPathConvertNumber ()" link="libxml2-xpath.html#xmlXPathConvertNumber"/> <function name="xmlXPathConvertString ()" link="libxml2-xpath.html#xmlXPathConvertString"/> diff --git a/doc/docs.html b/doc/docs.html index 4c5fe55..fa30ac2 100644 --- a/doc/docs.html +++ b/doc/docs.html @@ -7,27 +7,22 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Developer Menu</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Developer Menu</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>There are several on-line resources related to using libxml:</p><ol><li>Use the <a href="search.php">search engine</a> to look up - information.</li> +</style><title>Developer Menu</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Developer Menu</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>There are several on-line resources related to using libxml:</p><ol><li>Use the <a href="search.php">search engine</a>to lookupinformation.</li> <li>Check the <a href="FAQ.html">FAQ.</a></li> - <li>Check the <a href="http://xmlsoft.org/html/libxml-lib.html">extensive - documentation</a> automatically extracted from code comments.</li> - <li>Look at the documentation about <a href="encoding.html">libxml - internationalization support</a>.</li> - <li>This page provides a global overview and <a href="example.html">some - examples</a> on how to use libxml.</li> + <li>Check the <a href="http://xmlsoft.org/html/libxml-lib.html">extensivedocumentation</a>automaticallyextracted + from code comments.</li> + <li>Look at the documentation about <a href="encoding.html">libxmlinternationalization support</a>.</li> + <li>This page provides a global overview and <a href="example.html">someexamples</a>on how to use libxml.</li> <li><a href="examples/index.html">Code examples</a></li> - <li>John Fleck's libxml2 tutorial: <a href="tutorial/index.html">html</a> - or <a href="tutorial/xmltutorial.pdf">pdf</a>.</li> - <li>If you need to parse large files, check the <a href="xmlreader.html">xmlReader</a> API tutorial</li> - <li><a href="mailto:james@daa.com.au">James Henstridge</a> wrote <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">some nice - documentation</a> explaining how to use the libxml SAX interface.</li> - <li>George Lebl wrote <a href="http://www-106.ibm.com/developerworks/library/l-gnome3/">an article - for IBM developerWorks</a> about using libxml.</li> - <li>Check <a href="http://cvs.gnome.org/lxr/source/gnome-xml/TODO">the TODO - file</a>.</li> - <li>Read the <a href="upgrade.html">1.x to 2.x upgrade path</a> - description. If you are starting a new project using libxml you should - really use the 2.x version.</li> + <li>John Fleck's libxml2 tutorial: <a href="tutorial/index.html">html</a>or<a href="tutorial/xmltutorial.pdf">pdf</a>.</li> + <li>If you need to parse large files, check the <a href="xmlreader.html">xmlReader</a>API tutorial</li> + <li><a href="mailto:james@daa.com.au">James Henstridge</a>wrote <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">somenicedocumentation</a>explaining + how to use the libxml SAX interface.</li> + <li>George Lebl wrote <a href="http://www-106.ibm.com/developerworks/library/l-gnome3/">anarticlefor + IBM developerWorks</a>about using libxml.</li> + <li>Check <a href="http://cvs.gnome.org/lxr/source/gnome-xml/TODO">theTODOfile</a>.</li> + <li>Read the <a href="upgrade.html">1.x to 2.x upgrade + path</a>description.If you are starting a new project using libxml you + shouldreally use the2.x version.</li> <li>And don't forget to look at the <a href="http://mail.gnome.org/archives/xml/">mailing-list archive</a>.</li> </ol><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/downloads.html b/doc/downloads.html index e49f483..71ce9a6 100644 --- a/doc/downloads.html +++ b/doc/downloads.html @@ -7,30 +7,28 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Downloads</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Downloads</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The latest versions of libxml2 can be found on the <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> server ( <a href="http://xmlsoft.org/sources/">HTTP</a>, <a href="ftp://xmlsoft.org/libxml2/">FTP</a> and rsync are available), there is also -mirrors (<a href="ftp://ftp.planetmirror.com/pub/xmlsoft/">Australia</a>( <a href="http://xmlsoft.planetmirror.com/">Web</a>), <a href="ftp://fr.rpmfind.net/pub/libxml/">France</a>) or on the <a href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a> as <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">source archive</a> -, Antonin Sprinzl also provide <a href="ftp://gd.tuwien.ac.at/pub/libxml/">a -mirror in Austria</a>. (NOTE that you need both the <a href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a> and <a href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a> -packages installed to compile applications using libxml.)</p><p>You can find all the history of libxml(2) and libxslt releases in the <a href="http://xmlsoft.org/sources/old/">old</a> directory. The precompiled -Windows binaries made by Igor Zlatovic are available in the <a href="http://xmlsoft.org/sources/win32/">win32</a> directory.</p><p>Binary ports:</p><ul><li>Red Hat RPMs for i386 are available directly on <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>, the source RPM will compile on - any architecture supported by Red Hat.</li> - <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a> is now the - maintainer of the Windows port, <a href="http://www.zlatkovic.com/projects/libxml/index.html">he provides - binaries</a>.</li> - <li>Blastwave provides <a href="http://www.blastwave.org/packages.php/libxml2">Solaris - binaries</a>.</li> - <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a> provides <a href="http://www.explain.com.au/oss/libxml2xslt.html">Mac Os X - binaries</a>.</li> +</style><title>Downloads</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Downloads</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The latest versions of libxml2 can be found on the <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>server ( <a href="http://xmlsoft.org/sources/">HTTP</a>, <a href="ftp://xmlsoft.org/libxml2/">FTP</a>and rsync are available), there +isalsomirrors (<a href="ftp://ftp.planetmirror.com/pub/xmlsoft/">Australia</a>(<a href="http://xmlsoft.planetmirror.com/">Web</a>), <a href="ftp://fr.rpmfind.net/pub/libxml/">France</a>) or on the <a href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a>as <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">source +archive</a>,Antonin Sprinzl also provide <a href="ftp://gd.tuwien.ac.at/pub/libxml/">amirror in Austria</a>. (NOTE +thatyou need both the <a href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a>and <a href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a>packagesinstalled +to compile applications using libxml.)</p><p>You can find all the history of libxml(2) and libxslt releases in the <a href="http://xmlsoft.org/sources/old/">old</a>directory. +TheprecompiledWindows binaries made by Igor Zlatovic are available in the <a href="http://xmlsoft.org/sources/win32/">win32</a>directory.</p><p>Binary ports:</p><ul><li>Red Hat RPMs for i386 are available directly on <a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>, the source RPM + willcompile onany architecture supported by Red Hat.</li> + <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>is + nowthemaintainer of the Windows port, <a href="http://www.zlatkovic.com/projects/libxml/index.html">heprovidesbinaries</a>.</li> + <li>Blastwave provides <a href="http://www.blastwave.org/packages.php/libxml2">Solarisbinaries</a>.</li> + <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a>provides <a href="http://www.explain.com.au/oss/libxml2xslt.html">Mac + OsXbinaries</a>.</li> <li>The HP-UX porting center provides <a href="http://hpux.connect.org.uk/hppd/hpux/Gnome/">HP-UX binaries</a></li> - <li>Bull provides precompiled <a href="http://gnome.bullfreeware.com/new_index.html">RPMs for AIX</a> as - patr of their GNOME packages</li> + <li>Bull provides precompiled <a href="http://gnome.bullfreeware.com/new_index.html">RPMs forAIX</a>aspatr + of their GNOME packages</li> </ul><p>If you know other supported binary ports, please <a href="http://veillard.com/">contact me</a>.</p><p><a name="Snapshot" id="Snapshot">Snapshot:</a></p><ul><li>Code from the W3C cvs base libxml2 module, updated hourly <a href="ftp://xmlsoft.org/libxml2/libxml2-cvs-snapshot.tar.gz">libxml2-cvs-snapshot.tar.gz</a>.</li> <li>Docs, content of the web site, the list archive included <a href="ftp://xmlsoft.org/libxml2/libxml-docs.tar.gz">libxml-docs.tar.gz</a>.</li> -</ul><p><a name="Contribs" id="Contribs">Contributions:</a></p><p>I do accept external contributions, especially if compiling on another -platform, get in touch with the list to upload the package, wrappers for -various languages have been provided, and can be found in the <a href="python.html">bindings section</a></p><p>Libxml2 is also available from CVS:</p><ul><li><p>The <a href="http://cvs.gnome.org/viewcvs/libxml2/">Gnome CVS - base</a>. Check the <a href="http://developer.gnome.org/tools/cvs.html">Gnome CVS Tools</a> - page; the CVS module is <b>libxml2</b>.</p> +</ul><p><a name="Contribs" id="Contribs">Contributions:</a></p><p>I do accept external contributions, especially if compiling +onanotherplatform, get in touch with the list to upload the package, +wrappersforvarious languages have been provided, and can be found in the <a href="python.html">bindings section</a></p><p>Libxml2 is also available from CVS:</p><ul><li><p>The <a href="http://cvs.gnome.org/viewcvs/libxml2/">GnomeCVSbase</a>. Check the + <a href="http://developer.gnome.org/tools/cvs.html">Gnome CVS + Tools</a>page;the CVS module is <b>libxml2</b>.</p> </li> - <li>The <strong>libxslt</strong> module is also present there</li> + <li>The <strong>libxslt</strong>module is also present there</li> </ul><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/encoding.html b/doc/encoding.html index 1f4558d..8db787e 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -7,44 +7,44 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Encodings support</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Encodings support</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>If you are not really familiar with Internationalization (usual shortcut -is I18N) , Unicode, characters and glyphs, I suggest you read a <a href="http://www.tbray.org/ongoing/When/200x/2003/04/06/Unicode">presentation</a> -by Tim Bray on Unicode and why you should care about it.</p><p>If you don't understand why <b>it does not make sense to have a string -without knowing what encoding it uses</b>, then as Joel Spolsky said <a href="http://www.joelonsoftware.com/articles/Unicode.html">please do not -write another line of code until you finish reading that article.</a>. It is -a prerequisite to understand this page, and avoid a lot of problems with -libxml2, XML or text processing in general.</p><p>Table of Content:</p><ol><li><a href="encoding.html#What">What does internationalization support - mean ?</a></li> - <li><a href="encoding.html#internal">The internal encoding, how and - why</a></li> +</style><title>Encodings support</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Encodings support</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>If you are not really familiar with Internationalization (usual +shortcutisI18N) , Unicode, characters and glyphs, I suggest you read a <a href="http://www.tbray.org/ongoing/When/200x/2003/04/06/Unicode">presentation</a>byTim +Bray on Unicode and why you should care about it.</p><p>If you don't understand why <b>it does not make sense to have +astringwithout knowing what encoding it uses</b>, then as Joel Spolsky said +<a href="http://www.joelonsoftware.com/articles/Unicode.html">please do +notwriteanother line of code until you finish reading that article.</a>. It +isaprerequisite to understand this page, and avoid a lot of +problemswithlibxml2, XML or text processing in general.</p><p>Table of Content:</p><ol><li><a href="encoding.html#What">What does internationalization + supportmean?</a></li> + <li><a href="encoding.html#internal">The internal encoding, + howandwhy</a></li> <li><a href="encoding.html#implemente">How is it implemented ?</a></li> <li><a href="encoding.html#Default">Default supported encodings</a></li> - <li><a href="encoding.html#extend">How to extend the existing - support</a></li> -</ol><h3><a name="What" id="What">What does internationalization support mean ?</a></h3><p>XML was designed from the start to allow the support of any character set -by using Unicode. Any conformant XML parser has to support the UTF-8 and -UTF-16 default encodings which can both express the full unicode ranges. UTF8 -is a variable length encoding whose greatest points are to reuse the same -encoding for ASCII and to save space for Western encodings, but it is a bit -more complex to handle in practice. UTF-16 use 2 bytes per character (and -sometimes combines two pairs), it makes implementation easier, but looks a -bit overkill for Western languages encoding. Moreover the XML specification -allows the document to be encoded in other encodings at the condition that -they are clearly labeled as such. For example the following is a wellformed -XML document encoded in ISO-8859-1 and using accentuated letters that we -French like for both markup and content:</p><pre><?xml version="1.0" encoding="ISO-8859-1"?> + <li><a href="encoding.html#extend">How to extend theexistingsupport</a></li> +</ol><h3><a name="What" id="What">What does internationalization support mean ?</a></h3><p>XML was designed from the start to allow the support of any charactersetby +using Unicode. Any conformant XML parser has to support the UTF-8andUTF-16 +default encodings which can both express the full unicode ranges.UTF8is a +variable length encoding whose greatest points are to reuse thesameencoding +for ASCII and to save space for Western encodings, but it is abitmore complex +to handle in practice. UTF-16 use 2 bytes per character(andsometimes combines +two pairs), it makes implementation easier, but looksabit overkill for +Western languages encoding. Moreover the XMLspecificationallows the document +to be encoded in other encodings at thecondition thatthey are clearly labeled +as such. For example the following isa wellformedXML document encoded in +ISO-8859-1 and using accentuated lettersthat weFrench like for both markup +and content:</p><pre><?xml version="1.0" encoding="ISO-8859-1"?> <très>là</très></pre><p>Having internationalization support in libxml2 means the following:</p><ul><li>the document is properly parsed</li> <li>informations about it's encoding are saved</li> <li>it can be modified</li> <li>it can be saved in its original encoding</li> - <li>it can also be saved in another encoding supported by libxml2 (for - example straight UTF8 or even an ASCII form)</li> -</ul><p>Another very important point is that the whole libxml2 API, with the -exception of a few routines to read with a specific encoding or save to a -specific encoding, is completely agnostic about the original encoding of the -document.</p><p>It should be noted too that the HTML parser embedded in libxml2 now obey -the same rules too, the following document will be (as of 2.2.2) handled in -an internationalized fashion by libxml2 too:</p><pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" + <li>it can also be saved in another encoding supported by + libxml2(forexample straight UTF8 or even an ASCII form)</li> +</ul><p>Another very important point is that the whole libxml2 API, +withtheexception of a few routines to read with a specific encoding or save +toaspecific encoding, is completely agnostic about the original encoding +ofthedocument.</p><p>It should be noted too that the HTML parser embedded in libxml2 nowobeythe +same rules too, the following document will be (as of 2.2.2) handledinan +internationalized fashion by libxml2 too:</p><pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="fr"> <head> @@ -52,59 +52,60 @@ an internationalized fashion by libxml2 too:</p><pre><!DOCTYPE HTML PUBLIC "- </head> <body> <p>W3C crée des standards pour le Web.</body> -</html></pre><h3><a name="internal" id="internal">The internal encoding, how and why</a></h3><p>One of the core decisions was to force all documents to be converted to a -default internal encoding, and that encoding to be UTF-8, here are the -rationales for those choices:</p><ul><li>keeping the native encoding in the internal form would force the libxml - users (or the code associated) to be fully aware of the encoding of the - original document, for examples when adding a text node to a document, - the content would have to be provided in the document encoding, i.e. the - client code would have to check it before hand, make sure it's conformant - to the encoding, etc ... Very hard in practice, though in some specific - cases this may make sense.</li> - <li>the second decision was which encoding. From the XML spec only UTF8 and - UTF16 really makes sense as being the two only encodings for which there - is mandatory support. UCS-4 (32 bits fixed size encoding) could be - considered an intelligent choice too since it's a direct Unicode mapping - support. I selected UTF-8 on the basis of efficiency and compatibility - with surrounding software: - <ul><li>UTF-8 while a bit more complex to convert from/to (i.e. slightly - more costly to import and export CPU wise) is also far more compact - than UTF-16 (and UCS-4) for a majority of the documents I see it used - for right now (RPM RDF catalogs, advogato data, various configuration - file formats, etc.) and the key point for today's computer - architecture is efficient uses of caches. If one nearly double the - memory requirement to store the same amount of data, this will trash - caches (main memory/external caches/internal caches) and my take is - that this harms the system far more than the CPU requirements needed - for the conversion to UTF-8</li> - <li>Most of libxml2 version 1 users were using it with straight ASCII - most of the time, doing the conversion with an internal encoding - requiring all their code to be rewritten was a serious show-stopper - for using UTF-16 or UCS-4.</li> - <li>UTF-8 is being used as the de-facto internal encoding standard for - related code like the <a href="http://www.pango.org/">pango</a> - upcoming Gnome text widget, and a lot of Unix code (yet another place - where Unix programmer base takes a different approach from Microsoft - - they are using UTF-16)</li> +</html></pre><h3><a name="internal" id="internal">The internal encoding, how and why</a></h3><p>One of the core decisions was to force all documents to be converted +toadefault internal encoding, and that encoding to be UTF-8, here +aretherationales for those choices:</p><ul><li>keeping the native encoding in the internal form would force + thelibxmlusers (or the code associated) to be fully aware of the encoding + oftheoriginal document, for examples when adding a text node to + adocument,the content would have to be provided in the document + encoding,i.e. theclient code would have to check it before hand, make + sure it'sconformantto the encoding, etc ... Very hard in practice, though + in somespecificcases this may make sense.</li> + <li>the second decision was which encoding. From the XML spec only + UTF8andUTF16 really makes sense as being the two only encodings for + whichthereis mandatory support. UCS-4 (32 bits fixed size encoding) + couldbeconsidered an intelligent choice too since it's a direct + Unicodemappingsupport. I selected UTF-8 on the basis of efficiency + andcompatibilitywith surrounding software: + <ul><li>UTF-8 while a bit more complex to convert from/to (i.e.slightlymore + costly to import and export CPU wise) is also far morecompactthan + UTF-16 (and UCS-4) for a majority of the documents I seeit usedfor + right now (RPM RDF catalogs, advogato data, variousconfigurationfile + formats, etc.) and the key point for today'scomputerarchitecture is + efficient uses of caches. If one nearlydouble thememory requirement + to store the same amount of data, thiswill trashcaches (main + memory/external caches/internal caches) and mytake isthat this harms + the system far more than the CPU requirementsneededfor the conversion + to UTF-8</li> + <li>Most of libxml2 version 1 users were using it with + straightASCIImost of the time, doing the conversion with an + internalencodingrequiring all their code to be rewritten was a + seriousshow-stopperfor using UTF-16 or UCS-4.</li> + <li>UTF-8 is being used as the de-facto internal encoding + standardforrelated code like the <a href="http://www.pango.org/">pango</a>upcoming Gnome text widget, + anda lot of Unix code (yet another placewhere Unix programmer base + takesa different approach from Microsoft- they are using UTF-16)</li> </ul></li> -</ul><p>What does this mean in practice for the libxml2 user:</p><ul><li>xmlChar, the libxml2 data type is a byte, those bytes must be assembled - as UTF-8 valid strings. The proper way to terminate an xmlChar * string - is simply to append 0 byte, as usual.</li> - <li>One just need to make sure that when using chars outside the ASCII set, - the values has been properly converted to UTF-8</li> -</ul><h3><a name="implemente" id="implemente">How is it implemented ?</a></h3><p>Let's describe how all this works within libxml, basically the I18N -(internationalization) support get triggered only during I/O operation, i.e. -when reading a document or saving one. Let's look first at the reading -sequence:</p><ol><li>when a document is processed, we usually don't know the encoding, a - simple heuristic allows to detect UTF-16 and UCS-4 from encodings where - the ASCII range (0-0x7F) maps with ASCII</li> - <li>the xml declaration if available is parsed, including the encoding - declaration. At that point, if the autodetected encoding is different - from the one declared a call to xmlSwitchEncoding() is issued.</li> - <li>If there is no encoding declaration, then the input has to be in either - UTF-8 or UTF-16, if it is not then at some point when processing the - input, the converter/checker of UTF-8 form will raise an encoding error. - You may end-up with a garbled document, or no document at all ! Example: +</ul><p>What does this mean in practice for the libxml2 user:</p><ul><li>xmlChar, the libxml2 data type is a byte, those bytes must + beassembledas UTF-8 valid strings. The proper way to terminate an xmlChar + *stringis simply to append 0 byte, as usual.</li> + <li>One just need to make sure that when using chars outside the + ASCIIset,the values has been properly converted to UTF-8</li> +</ul><h3><a name="implemente" id="implemente">How is it implemented ?</a></h3><p>Let's describe how all this works within libxml, basically +theI18N(internationalization) support get triggered only during I/O +operation,i.e.when reading a document or saving one. Let's look first at +thereadingsequence:</p><ol><li>when a document is processed, we usually don't know the + encoding,asimple heuristic allows to detect UTF-16 and UCS-4 from + encodingswherethe ASCII range (0-0x7F) maps with ASCII</li> + <li>the xml declaration if available is parsed, including + theencodingdeclaration. At that point, if the autodetected encoding + isdifferentfrom the one declared a call to xmlSwitchEncoding() + isissued.</li> + <li>If there is no encoding declaration, then the input has to be + ineitherUTF-8 or UTF-16, if it is not then at some point when + processingtheinput, the converter/checker of UTF-8 form will raise an + encodingerror.You may end-up with a garbled document, or no document at + all !Example: <pre>~/XML -> ./xmllint err.xml err.xml:1: error: Input is not proper UTF-8, indicate encoding ! <très>là</très> @@ -113,94 +114,93 @@ err.xml:1: error: Bytes: 0xE8 0x73 0x3E 0x6C <très>là</très> ^</pre> </li> - <li>xmlSwitchEncoding() does an encoding name lookup, canonicalize it, and - then search the default registered encoding converters for that encoding. - If it's not within the default set and iconv() support has been compiled - it, it will ask iconv for such an encoder. If this fails then the parser - will report an error and stops processing: + <li>xmlSwitchEncoding() does an encoding name lookup, canonicalize + it,andthen search the default registered encoding converters for + thatencoding.If it's not within the default set and iconv() support has + beencompiledit, it will ask iconv for such an encoder. If this fails then + theparserwill report an error and stops processing: <pre>~/XML -> ./xmllint err2.xml err2.xml:1: error: Unsupported encoding UnsupportedEnc <?xml version="1.0" encoding="UnsupportedEnc"?> ^</pre> </li> - <li>From that point the encoder processes progressively the input (it is - plugged as a front-end to the I/O module) for that entity. It captures - and converts on-the-fly the document to be parsed to UTF-8. The parser - itself just does UTF-8 checking of this input and process it - transparently. The only difference is that the encoding information has - been added to the parsing context (more precisely to the input - corresponding to this entity).</li> - <li>The result (when using DOM) is an internal form completely in UTF-8 - with just an encoding information on the document node.</li> -</ol><p>Ok then what happens when saving the document (assuming you -collected/built an xmlDoc DOM like structure) ? It depends on the function -called, xmlSaveFile() will just try to save in the original encoding, while -xmlSaveFileTo() and xmlSaveFileEnc() can optionally save to a given -encoding:</p><ol><li>if no encoding is given, libxml2 will look for an encoding value - associated to the document and if it exists will try to save to that - encoding, + <li>From that point the encoder processes progressively the input + (itisplugged as a front-end to the I/O module) for that entity. + Itcapturesand converts on-the-fly the document to be parsed to UTF-8. + Theparseritself just does UTF-8 checking of this input and + processittransparently. The only difference is that the encoding + informationhasbeen added to the parsing context (more precisely to + theinputcorresponding to this entity).</li> + <li>The result (when using DOM) is an internal form completely in + UTF-8withjust an encoding information on the document node.</li> +</ol><p>Ok then what happens when saving the document (assuming +youcollected/builtan xmlDoc DOM like structure) ? It depends on the +functioncalled,xmlSaveFile() will just try to save in the original +encoding,whilexmlSaveFileTo() and xmlSaveFileEnc() can optionally save to +agivenencoding:</p><ol><li>if no encoding is given, libxml2 will look for an + encodingvalueassociated to the document and if it exists will try to save + tothatencoding, <p>otherwise everything is written in the internal form, i.e. UTF-8</p> </li> - <li>so if an encoding was specified, either at the API level or on the - document, libxml2 will again canonicalize the encoding name, lookup for a - converter in the registered set or through iconv. If not found the - function will return an error code</li> - <li>the converter is placed before the I/O buffer layer, as another kind of - buffer, then libxml2 will simply push the UTF-8 serialization to through - that buffer, which will then progressively be converted and pushed onto - the I/O layer.</li> - <li>It is possible that the converter code fails on some input, for example - trying to push an UTF-8 encoded Chinese character through the UTF-8 to - ISO-8859-1 converter won't work. Since the encoders are progressive they - will just report the error and the number of bytes converted, at that - point libxml2 will decode the offending character, remove it from the - buffer and replace it with the associated charRef encoding &#123; and - resume the conversion. This guarantees that any document will be saved - without losses (except for markup names where this is not legal, this is - a problem in the current version, in practice avoid using non-ascii - characters for tag or attribute names). A special "ascii" encoding name - is used to save documents to a pure ascii form can be used when - portability is really crucial</li> + <li>so if an encoding was specified, either at the API level or + onthedocument, libxml2 will again canonicalize the encoding name, + lookupfor aconverter in the registered set or through iconv. If not + foundthefunction will return an error code</li> + <li>the converter is placed before the I/O buffer layer, as another + kindofbuffer, then libxml2 will simply push the UTF-8 serialization + tothroughthat buffer, which will then progressively be converted and + pushedontothe I/O layer.</li> + <li>It is possible that the converter code fails on some input, + forexampletrying to push an UTF-8 encoded Chinese character through + theUTF-8 toISO-8859-1 converter won't work. Since the encoders + areprogressive theywill just report the error and the number of + bytesconverted, at thatpoint libxml2 will decode the offending + character,remove it from thebuffer and replace it with the associated + charRefencoding &#123; andresume the conversion. This guarantees that + anydocument will be savedwithout losses (except for markup names where + thisis not legal, this isa problem in the current version, in practice + avoidusing non-asciicharacters for tag or attribute names). A special + "ascii"encoding nameis used to save documents to a pure ascii form can be + usedwhenportability is really crucial</li> </ol><p>Here are a few examples based on the same test document:</p><pre>~/XML -> ./xmllint isolat1 <?xml version="1.0" encoding="ISO-8859-1"?> <très>là</très> ~/XML -> ./xmllint --encode UTF-8 isolat1 <?xml version="1.0" encoding="UTF-8"?> <très>là </très> -~/XML -> </pre><p>The same processing is applied (and reuse most of the code) for HTML I18N -processing. Looking up and modifying the content encoding is a bit more -difficult since it is located in a <meta> tag under the <head>, -so a couple of functions htmlGetMetaEncoding() and htmlSetMetaEncoding() have -been provided. The parser also attempts to switch encoding on the fly when -detecting such a tag on input. Except for that the processing is the same -(and again reuses the same code).</p><h3><a name="Default" id="Default">Default supported encodings</a></h3><p>libxml2 has a set of default converters for the following encodings -(located in encoding.c):</p><ol><li>UTF-8 is supported by default (null handlers)</li> +~/XML -> </pre><p>The same processing is applied (and reuse most of the code) for +HTMLI18Nprocessing. Looking up and modifying the content encoding is a +bitmoredifficult since it is located in a <meta> tag under +the<head>,so a couple of functions htmlGetMetaEncoding() +andhtmlSetMetaEncoding() havebeen provided. The parser also attempts to +switchencoding on the fly whendetecting such a tag on input. Except for that +theprocessing is the same(and again reuses the same code).</p><h3><a name="Default" id="Default">Default supported encodings</a></h3><p>libxml2 has a set of default converters for the followingencodings(located +in encoding.c):</p><ol><li>UTF-8 is supported by default (null handlers)</li> <li>UTF-16, both little and big endian</li> <li>ISO-Latin-1 (ISO-8859-1) covering most western languages</li> <li>ASCII, useful mostly for saving</li> - <li>HTML, a specific handler for the conversion of UTF-8 to ASCII with HTML - predefined entities like &copy; for the Copyright sign.</li> -</ol><p>More over when compiled on an Unix platform with iconv support the full -set of encodings supported by iconv can be instantly be used by libxml. On a -linux machine with glibc-2.1 the list of supported encodings and aliases fill -3 full pages, and include UCS-4, the full set of ISO-Latin encodings, and the -various Japanese ones.</p><p>To convert from the UTF-8 values returned from the API to another encoding -then it is possible to use the function provided from <a href="html/libxml-encoding.html">the encoding module</a> like <a href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a>, or use the -POSIX <a href="http://www.opengroup.org/onlinepubs/009695399/functions/iconv.html">iconv()</a> -API directly.</p><h4>Encoding aliases</h4><p>From 2.2.3, libxml2 has support to register encoding names aliases. The -goal is to be able to parse document whose encoding is supported but where -the name differs (for example from the default set of names accepted by -iconv). The following functions allow to register and handle new aliases for -existing encodings. Once registered libxml2 will automatically lookup the -aliases when handling a document:</p><ul><li>int xmlAddEncodingAlias(const char *name, const char *alias);</li> + <li>HTML, a specific handler for the conversion of UTF-8 to ASCII + withHTMLpredefined entities like &copy; for the Copyright sign.</li> +</ol><p>More over when compiled on an Unix platform with iconv support the +fullsetof encodings supported by iconv can be instantly be used by libxml. On +alinuxmachine with glibc-2.1 the list of supported encodings and aliases +fill3 fullpages, and include UCS-4, the full set of ISO-Latin encodings, and +thevariousJapanese ones.</p><p>To convert from the UTF-8 values returned from the API to +anotherencodingthen it is possible to use the function provided from <a href="html/libxml-encoding.html">the encoding module</a>like <a href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a>, or +usethePOSIX <a href="http://www.opengroup.org/onlinepubs/009695399/functions/iconv.html">iconv()</a>APIdirectly.</p><h4>Encoding aliases</h4><p>From 2.2.3, libxml2 has support to register encoding names aliases.Thegoal +is to be able to parse document whose encoding is supported butwherethe name +differs (for example from the default set of names acceptedbyiconv). The +following functions allow to register and handle new aliasesforexisting +encodings. Once registered libxml2 will automatically lookupthealiases when +handling a document:</p><ul><li>int xmlAddEncodingAlias(const char *name, const char *alias);</li> <li>int xmlDelEncodingAlias(const char *alias);</li> <li>const char * xmlGetEncodingAlias(const char *alias);</li> <li>void xmlCleanupEncodingAliases(void);</li> -</ul><h3><a name="extend" id="extend">How to extend the existing support</a></h3><p>Well adding support for new encoding, or overriding one of the encoders -(assuming it is buggy) should not be hard, just write input and output -conversion routines to/from UTF-8, and register them using -xmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx), and they will be -called automatically if the parser(s) encounter such an encoding name -(register it uppercase, this will help). The description of the encoders, -their arguments and expected return values are described in the encoding.h -header.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</ul><h3><a name="extend" id="extend">How to extend the existing support</a></h3><p>Well adding support for new encoding, or overriding one of +theencoders(assuming it is buggy) should not be hard, just write input +andoutputconversion routines to/from UTF-8, and register +themusingxmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx), and they +willbecalled automatically if the parser(s) encounter such an +encodingname(register it uppercase, this will help). The description of +theencoders,their arguments and expected return values are described in +theencoding.hheader.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/entities.html b/doc/entities.html index c234b41..732562a 100644 --- a/doc/entities.html +++ b/doc/entities.html @@ -7,34 +7,35 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Entities or no entities</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Entities or no entities</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Entities in principle are similar to simple C macros. An entity defines an -abbreviation for a given string that you can reuse many times throughout the -content of your document. Entities are especially useful when a given string -may occur frequently within a document, or to confine the change needed to a -document to a restricted area in the internal subset of the document (at the -beginning). Example:</p><pre>1 <?xml version="1.0"?> +</style><title>Entities or no entities</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Entities or no entities</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Entities in principle are similar to simple C macros. An entity +definesanabbreviation for a given string that you can reuse many times +throughoutthecontent of your document. Entities are especially useful when a +givenstringmay occur frequently within a document, or to confine the change +neededto adocument to a restricted area in the internal subset of the +document (atthebeginning). Example:</p><pre>1 <?xml version="1.0"?> 2 <!DOCTYPE EXAMPLE SYSTEM "example.dtd" [ 3 <!ENTITY xml "Extensible Markup Language"> 4 ]> 5 <EXAMPLE> 6 &xml; -7 </EXAMPLE></pre><p>Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing -its name with '&' and following it by ';' without any spaces added. There -are 5 predefined entities in libxml2 allowing you to escape characters with -predefined meaning in some parts of the xml document content: -<strong>&lt;</strong> for the character '<', <strong>&gt;</strong> -for the character '>', <strong>&apos;</strong> for the character ''', -<strong>&quot;</strong> for the character '"', and -<strong>&amp;</strong> for the character '&'.</p><p>One of the problems related to entities is that you may want the parser to -substitute an entity's content so that you can see the replacement text in -your application. Or you may prefer to keep entity references as such in the -content to be able to save the document back without losing this usually -precious information (if the user went through the pain of explicitly -defining entities, he may have a a rather negative attitude if you blindly -substitute them as saving time). The <a href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault()</a> -function allows you to check and change the behaviour, which is to not -substitute entities by default.</p><p>Here is the DOM tree built by libxml2 for the previous document in the -default case:</p><pre>/gnome/src/gnome-xml -> ./xmllint --debug test/ent1 +7 </EXAMPLE></pre><p>Line 3 declares the xml entity. Line 6 uses the xml entity, byprefixingits +name with '&' and following it by ';' without any spacesadded. Thereare 5 +predefined entities in libxml2 allowing you to escapecharacters +withpredefined meaning in some parts of the xml +documentcontent:<strong>&lt;</strong>for the character +'<',<strong>&gt;</strong>for the character +'>',<strong>&apos;</strong>for the +character''',<strong>&quot;</strong>for the character +'"',and<strong>&amp;</strong>for the character '&'.</p><p>One of the problems related to entities is that you may want the +parsertosubstitute an entity's content so that you can see the replacement +textinyour application. Or you may prefer to keep entity references as such +inthecontent to be able to save the document back without losing +thisusuallyprecious information (if the user went through the pain +ofexplicitlydefining entities, he may have a a rather negative attitude if +youblindlysubstitute them as saving time). The <a href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault()</a>functionallows +you to check and change the behaviour, which is to notsubstituteentities by +default.</p><p>Here is the DOM tree built by libxml2 for the previous document +inthedefault case:</p><pre>/gnome/src/gnome-xml -> ./xmllint --debug test/ent1 DOCUMENT version=1.0 ELEMENT EXAMPLE @@ -49,16 +50,17 @@ DOCUMENT version=1.0 ELEMENT EXAMPLE TEXT - content= Extensible Markup Language</pre><p>So, entities or no entities? Basically, it depends on your use case. I -suggest that you keep the non-substituting default behaviour and avoid using -entities in your XML document or data if you are not willing to handle the -entity references elements in the DOM tree.</p><p>Note that at save time libxml2 enforces the conversion of the predefined -entities where necessary to prevent well-formedness problems, and will also -transparently replace those with chars (i.e. it will not generate entity -reference elements in the DOM tree or call the reference() SAX callback when -finding them in the input).</p><p><span style="background-color: #FF0000">WARNING</span>: handling entities -on top of the libxml2 SAX interface is difficult!!! If you plan to use -non-predefined entities in your documents, then the learning curve to handle -then using the SAX API may be long. If you plan to use complex documents, I -strongly suggest you consider using the DOM interface instead and let libxml -deal with the complexity rather than trying to do it yourself.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> + content= Extensible Markup Language</pre><p>So, entities or no entities? Basically, it depends on your use +case.Isuggest that you keep the non-substituting default behaviour and +avoidusingentities in your XML document or data if you are not willing to +handletheentity references elements in the DOM tree.</p><p>Note that at save time libxml2 enforces the conversion of +thepredefinedentities where necessary to prevent well-formedness problems, +andwill alsotransparently replace those with chars (i.e. it will not +generateentityreference elements in the DOM tree or call the reference() SAX +callbackwhenfinding them in the input).</p><p><span style="background-color: #FF0000">WARNING</span>: handlingentitieson +top of the libxml2 SAX interface is difficult!!! If you plan +tousenon-predefined entities in your documents, then the learning curve +tohandlethen using the SAX API may be long. If you plan to use +complexdocuments, Istrongly suggest you consider using the DOM interface +instead andlet libxmldeal with the complexity rather than trying to do it +yourself.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/example.html b/doc/example.html index 894f03a..194f619 100644 --- a/doc/example.html +++ b/doc/example.html @@ -7,11 +7,11 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>A real example</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>A real example</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Here is a real size example, where the actual content of the application -data is not kept in the DOM tree but uses internal structures. It is based on -a proposal to keep a database of jobs related to Gnome, with an XML based -storage structure. Here is an <a href="gjobs.xml">XML encoded jobs -base</a>:</p><pre><?xml version="1.0"?> +</style><title>A real example</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>A real example</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Here is a real size example, where the actual content of +theapplicationdata is not kept in the DOM tree but uses internal structures. +Itis based ona proposal to keep a database of jobs related to Gnome, with +anXML basedstorage structure. Here is an <a href="gjobs.xml">XML +encodedjobsbase</a>:</p><pre><?xml version="1.0"?> <gjob:Helping xmlns:gjob="http://www.gnome.org/some-location"> <gjob:Jobs> @@ -66,13 +66,14 @@ base</a>:</p><pre><?xml version="1.0"?> </gjob:Job> </gjob:Jobs> -</gjob:Helping></pre><p>While loading the XML file into an internal DOM tree is a matter of -calling only a couple of functions, browsing the tree to gather the data and -generate the internal structures is harder, and more error prone.</p><p>The suggested principle is to be tolerant with respect to the input -structure. For example, the ordering of the attributes is not significant, -the XML specification is clear about it. It's also usually a good idea not to -depend on the order of the children of a given node, unless it really makes -things harder. Here is some code to parse the information for a person:</p><pre>/* +</gjob:Helping></pre><p>While loading the XML file into an internal DOM tree is a matter +ofcallingonly a couple of functions, browsing the tree to gather the data +andgeneratethe internal structures is harder, and more error prone.</p><p>The suggested principle is to be tolerant with respect to +theinputstructure. For example, the ordering of the attributes is +notsignificant,the XML specification is clear about it. It's also usually a +goodidea not todepend on the order of the children of a given node, unless +itreally makesthings harder. Here is some code to parse the information for +aperson:</p><pre>/* * A person record */ typedef struct person { @@ -113,21 +114,22 @@ DEBUG("parsePerson\n"); } return(ret); -}</pre><p>Here are a couple of things to notice:</p><ul><li>Usually a recursive parsing style is the more convenient one: XML data - is by nature subject to repetitive constructs and usually exhibits highly - structured patterns.</li> - <li>The two arguments of type <em>xmlDocPtr</em> and <em>xmlNsPtr</em>, - i.e. the pointer to the global XML document and the namespace reserved to - the application. Document wide information are needed for example to - decode entities and it's a good coding practice to define a namespace for - your application set of data and test that the element and attributes - you're analyzing actually pertains to your application space. This is - done by a simple equality test (cur->ns == ns).</li> - <li>To retrieve text and attributes value, you can use the function - <em>xmlNodeListGetString</em> to gather all the text and entity reference - nodes generated by the DOM output and produce an single text string.</li> -</ul><p>Here is another piece of code used to parse another level of the -structure:</p><pre>#include <libxml/tree.h> +}</pre><p>Here are a couple of things to notice:</p><ul><li>Usually a recursive parsing style is the more convenient one: XMLdatais + by nature subject to repetitive constructs and usually + exhibitshighlystructured patterns.</li> + <li>The two arguments of type <em>xmlDocPtr</em>and + <em>xmlNsPtr</em>,i.e.the pointer to the global XML document and the + namespace reserved totheapplication. Document wide information are needed + for example todecodeentities and it's a good coding practice to define a + namespace foryourapplication set of data and test that the element and + attributesyou'reanalyzing actually pertains to your application space. + This isdone by asimple equality test (cur->ns == ns).</li> + <li>To retrieve text and attributes value, you can use + thefunction<em>xmlNodeListGetString</em>to gather all the text and + entityreferencenodes generated by the DOM output and produce an single + textstring.</li> +</ul><p>Here is another piece of code used to parse another level +ofthestructure:</p><pre>#include <libxml/tree.h> /* * a Description for a Job */ @@ -177,10 +179,10 @@ DEBUG("parseJob\n"); } return(ret); -}</pre><p>Once you are used to it, writing this kind of code is quite simple, but -boring. Ultimately, it could be possible to write stubbers taking either C -data structure definitions, a set of XML examples or an XML DTD and produce -the code needed to import and export the content between C data and XML -storage. This is left as an exercise to the reader :-)</p><p>Feel free to use <a href="example/gjobread.c">the code for the full C -parsing example</a> as a template, it is also available with Makefile in the -Gnome CVS base under gnome-xml/example</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +}</pre><p>Once you are used to it, writing this kind of code is quite +simple,butboring. Ultimately, it could be possible to write stubbers taking +eitherCdata structure definitions, a set of XML examples or an XML DTD +andproducethe code needed to import and export the content between C data +andXMLstorage. This is left as an exercise to the reader :-)</p><p>Feel free to use <a href="example/gjobread.c">the code for the +fullCparsing example</a>as a template, it is also available with Makefile +intheGnome CVS base under gnome-xml/example</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in index 83de8f9..2886329 100644 --- a/doc/examples/Makefile.in +++ b/doc/examples/Makefile.in @@ -147,6 +147,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -274,15 +275,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -299,23 +294,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/doc/help.html b/doc/help.html index 5559007..a660a87 100644 --- a/doc/help.html +++ b/doc/help.html @@ -7,19 +7,17 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>How to help</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>How to help</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>You can help the project in various ways, the best thing to do first is to -subscribe to the mailing-list as explained before, check the <a href="http://mail.gnome.org/archives/xml/">archives </a>and the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnome bug -database</a>:</p><ol><li>Provide patches when you find problems.</li> - <li>Provide the diffs when you port libxml2 to a new platform. They may not - be integrated in all cases but help pinpointing portability problems - and</li> - <li>Provide documentation fixes (either as patches to the code comments or - as HTML diffs).</li> - <li>Provide new documentations pieces (translations, examples, etc - ...).</li> +</style><title>How to help</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>How to help</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>You can help the project in various ways, the best thing to do first +istosubscribe to the mailing-list as explained before, check the <a href="http://mail.gnome.org/archives/xml/">archives </a>and the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnomebugdatabase</a>:</p><ol><li>Provide patches when you find problems.</li> + <li>Provide the diffs when you port libxml2 to a new platform. They + maynotbe integrated in all cases but help pinpointing + portabilityproblemsand</li> + <li>Provide documentation fixes (either as patches to the code commentsoras + HTML diffs).</li> + <li>Provide new documentations pieces (translations, examples, etc...).</li> <li>Check the TODO file and try to close one of the items.</li> - <li>Take one of the points raised in the archive or the bug database and - provide a fix. <a href="mailto:daniel@veillard.com">Get in touch with me - </a>before to avoid synchronization problems and check that the suggested - fix will fit in nicely :-)</li> + <li>Take one of the points raised in the archive or the bug + databaseandprovide a fix. <a href="mailto:daniel@veillard.com">Get in + touch withme</a>before to avoid synchronization problems and check that + thesuggestedfix will fit in nicely :-)</li> </ol><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html index f526e69..aefa967 100644 --- a/doc/html/libxml-xmlerror.html +++ b/doc/html/libxml-xmlerror.html @@ -657,6 +657,7 @@ void <a href="#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a> (void * userD <a name="XML_SCHEMAV_CVC_TYPE_2" id="XML_SCHEMAV_CVC_TYPE_2">XML_SCHEMAV_CVC_TYPE_2</a> = 1876 : 1876 <a name="XML_SCHEMAV_CVC_IDC" id="XML_SCHEMAV_CVC_IDC">XML_SCHEMAV_CVC_IDC</a> = 1877 : 1877 <a name="XML_SCHEMAV_CVC_WILDCARD" id="XML_SCHEMAV_CVC_WILDCARD">XML_SCHEMAV_CVC_WILDCARD</a> = 1878 : 1878 + <a name="XML_SCHEMAV_MISC" id="XML_SCHEMAV_MISC">XML_SCHEMAV_MISC</a> = 1879 : 1879 <a name="XML_XPTR_UNKNOWN_SCHEME" id="XML_XPTR_UNKNOWN_SCHEME">XML_XPTR_UNKNOWN_SCHEME</a> = 1900 <a name="XML_XPTR_CHILDSEQ_START" id="XML_XPTR_CHILDSEQ_START">XML_XPTR_CHILDSEQ_START</a> = 1901 : 1901 <a name="XML_XPTR_EVAL_FAILED" id="XML_XPTR_EVAL_FAILED">XML_XPTR_EVAL_FAILED</a> = 1902 : 1902 diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html index 4cfb2bc..a0d9ba7 100644 --- a/doc/html/libxml-xpath.html +++ b/doc/html/libxml-xpath.html @@ -51,6 +51,7 @@ The content of this structure is not made public by the API. <pre class="programlisting">int <a href="#xmlXPathCmpNodes">xmlXPathCmpNodes</a> (<a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node1, <br /> <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node2)</pre> <pre class="programlisting"><a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> <a href="#xmlXPathCompile">xmlXPathCompile</a> (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str)</pre> <pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathCompiledEval">xmlXPathCompiledEval</a> (<a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br /> <a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx)</pre> +<pre class="programlisting">int <a href="#xmlXPathContextSetCache">xmlXPathContextSetCache</a> (<a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br /> int active, <br /> int value, <br /> int options)</pre> <pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> <a href="#xmlXPathConvertBoolean">xmlXPathConvertBoolean</a> (<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val)</pre> <pre class="programlisting">Function type: <a href="#xmlXPathConvertFunc">xmlXPathConvertFunc</a> int <a href="#xmlXPathConvertFunc">xmlXPathConvertFunc</a> (<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj, <br /> int type) @@ -138,7 +139,8 @@ The content of this structure is not made public by the API. <a href="libxml-xmlerror.html#xmlError">xmlError</a> lastError : the last error <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> debugNode : the source node XSLT dictionnary <a href="libxml-dict.html#xmlDictPtr">xmlDictPtr</a> dict : dictionnary if any - int flags : flags to control compilation + int flags : flags to control compilation Cache for + void * cache }</pre><h3>Enum <a name="xmlXPathError" id="xmlXPathError">xmlXPathError</a></h3><pre class="programlisting">Enum xmlXPathError { <a name="XPATH_EXPRESSION_OK" id="XPATH_EXPRESSION_OK">XPATH_EXPRESSION_OK</a> = 0 <a name="XPATH_NUMBER_ERROR" id="XPATH_NUMBER_ERROR">XPATH_NUMBER_ERROR</a> = 1 @@ -244,7 +246,9 @@ The content of this structure is not made public by the API. </pre><p>Compile an XPath expression</p> <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td>the XPath expression</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> resulting from the compilation or NULL. the caller has to free the object.</td></tr></tbody></table></div><h3><a name="xmlXPathCompiledEval" id="xmlXPathCompiledEval"></a>Function: xmlXPathCompiledEval</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> xmlXPathCompiledEval (<a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> comp, <br /> <a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx)<br /> </pre><p>Evaluate the Precompiled XPath expression in the given context.</p> -<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the compiled XPath expression</td></tr><tr><td><span class="term"><i><tt>ctx</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> resulting from the evaluation or NULL. the caller has to free the object.</td></tr></tbody></table></div><h3><a name="xmlXPathConvertBoolean" id="xmlXPathConvertBoolean"></a>Function: xmlXPathConvertBoolean</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> xmlXPathConvertBoolean (<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val)<br /> +<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the compiled XPath expression</td></tr><tr><td><span class="term"><i><tt>ctx</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> resulting from the evaluation or NULL. the caller has to free the object.</td></tr></tbody></table></div><h3><a name="xmlXPathContextSetCache" id="xmlXPathContextSetCache"></a>Function: xmlXPathContextSetCache</h3><pre class="programlisting">int xmlXPathContextSetCache (<a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br /> int active, <br /> int value, <br /> int options)<br /> +</pre><p>Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.</p> +<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>active</tt></i>:</span></td><td>enables/disables (creates/frees) the cache</td></tr><tr><td><span class="term"><i><tt>value</tt></i>:</span></td><td>a value with semantics dependant on @options</td></tr><tr><td><span class="term"><i><tt>options</tt></i>:</span></td><td>options (currently only the value 0 is used)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if the setting succeeded, and -1 on API or internal errors.</td></tr></tbody></table></div><h3><a name="xmlXPathConvertBoolean" id="xmlXPathConvertBoolean"></a>Function: xmlXPathConvertBoolean</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> xmlXPathConvertBoolean (<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val)<br /> </pre><p>Converts an existing object to its boolean() equivalent</p> <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>val</tt></i>:</span></td><td>an XPath object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new object, the old one is freed (or the operation is done directly on @val)</td></tr></tbody></table></div><h3><a name="xmlXPathConvertFunc" id="xmlXPathConvertFunc"></a>Function type: xmlXPathConvertFunc</h3><pre class="programlisting">Function type: xmlXPathConvertFunc int xmlXPathConvertFunc (<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> obj, <br /> int type) diff --git a/doc/index.html b/doc/index.html index 21d61eb..22f013b 100644 --- a/doc/index.html +++ b/doc/index.html @@ -216,74 +216,73 @@ A:link, A:visited, A:active { text-decoration: underline } <tr> <td bgcolor="#fffacd"> <p></p> - <p style="text-align: right; font-style: italic; font-size: 10pt">"Programming -with libxml2 is like the thrilling embrace of an exotic stranger." <a href="http://diveintomark.org/archives/2004/02/18/libxml2">Mark -Pilgrim</a></p> - <p>Libxml2 is the XML C parser and toolkit developed for the Gnome project -(but usable outside of the Gnome platform), it is free software available -under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT -License</a>. XML itself is a metalanguage to design markup languages, i.e. -text language where semantic and structure are added to the content using -extra "markup" information enclosed between angle brackets. HTML is the most -well-known markup language. Though the library is written in C <a href="python.html">a variety of language bindings</a> make it available in -other environments.</p> - <p>Libxml2 is known to be very portable, the library should build and work -without serious troubles on a variety of systems (Linux, Unix, Windows, -CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)</p> - <p>Libxml2 implements a number of existing standards related to markup -languages:</p> + <p style="text-align: right; font-style: italic; font-size: 10pt">"Programmingwithlibxml2 +is like the thrilling embrace of an exotic stranger." <a href="http://diveintomark.org/archives/2004/02/18/libxml2">MarkPilgrim</a></p> + <p>Libxml2 is the XML C parser and toolkit developed for the Gnomeproject(but +usable outside of the Gnome platform), it is free softwareavailableunder the +<a href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>.XML +itself is a metalanguage to design markup languages, i.e.text languagewhere +semantic and structure are added to the content usingextra +"markup"information enclosed between angle brackets. HTML is the +mostwell-knownmarkup language. Though the library is written in C <a href="python.html">avariety of language bindings</a>make it available inother +environments.</p> + <p>Libxml2 is known to be very portable, the library should build +andworkwithout serious troubles on a variety of systems (Linux, +Unix,Windows,CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)</p> + <p>Libxml2 implements a number of existing standards related +tomarkuplanguages:</p> <ul><li>the XML standard: <a href="http://www.w3.org/TR/REC-xml">http://www.w3.org/TR/REC-xml</a></li> <li>Namespaces in XML: <a href="http://www.w3.org/TR/REC-xml-names/">http://www.w3.org/TR/REC-xml-names/</a></li> <li>XML Base: <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a></li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a> : - Uniform Resource Identifiers <a href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a></li> + <li><a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC2396</a>:Uniform + Resource Identifiers <a href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a></li> <li>XML Path Language (XPath) 1.0: <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a></li> <li>HTML4 parser: <a href="http://www.w3.org/TR/html401/">http://www.w3.org/TR/html401/</a></li> <li>XML Pointer Language (XPointer) Version 1.0: <a href="http://www.w3.org/TR/xptr">http://www.w3.org/TR/xptr</a></li> <li>XML Inclusions (XInclude) Version 1.0: <a href="http://www.w3.org/TR/xinclude/">http://www.w3.org/TR/xinclude/</a></li> - <li>ISO-8859-x encodings, as well as <a href="http://www.cis.ohio-state.edu/rfc/rfc2044.txt">rfc2044</a> [UTF-8] - and <a href="http://www.cis.ohio-state.edu/rfc/rfc2781.txt">rfc2781</a> - [UTF-16] Unicode encodings, and more if using iconv support</li> + <li>ISO-8859-x encodings, as well as <a href="http://www.cis.ohio-state.edu/rfc/rfc2044.txt">rfc2044</a>[UTF-8]and<a href="http://www.cis.ohio-state.edu/rfc/rfc2781.txt">rfc2781</a>[UTF-16]Unicode + encodings, and more if using iconv support</li> <li>part of SGML Open Technical Resolution TR9401:1997</li> <li>XML Catalogs Working Draft 06 August 2001: <a href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">http://www.oasis-open.org/committees/entity/spec-2001-08-06.html</a></li> - <li>Canonical XML Version 1.0: <a href="http://www.w3.org/TR/xml-c14n">http://www.w3.org/TR/xml-c14n</a> - and the Exclusive XML Canonicalization CR draft <a href="http://www.w3.org/TR/xml-exc-c14n">http://www.w3.org/TR/xml-exc-c14n</a></li> + <li>Canonical XML Version 1.0: <a href="http://www.w3.org/TR/xml-c14n">http://www.w3.org/TR/xml-c14n</a>andthe + Exclusive XML Canonicalization CR draft <a href="http://www.w3.org/TR/xml-exc-c14n">http://www.w3.org/TR/xml-exc-c14n</a></li> <li>Relax NG, ISO/IEC 19757-2:2003, <a href="http://www.oasis-open.org/committees/relax-ng/spec-20011203.html">http://www.oasis-open.org/committees/relax-ng/spec-20011203.html</a></li> - <li>W3C XML Schemas Part 2: Datatypes <a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">REC 02 May - 2001</a></li> - <li>W3C <a href="http://www.w3.org/TR/xml-id/">xml:id</a> Working Draft 7 - April 2004</li> + <li>W3C XML Schemas Part 2: Datatypes <a href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">REC + 02May2001</a></li> + <li>W3C <a href="http://www.w3.org/TR/xml-id/">xml:id</a>Working + Draft7April 2004</li> </ul> - <p>In most cases libxml2 tries to implement the specifications in a -relatively strictly compliant way. As of release 2.4.16, libxml2 passed all -1800+ tests from the <a href="http://www.oasis-open.org/committees/xml-conformance/">OASIS XML Tests -Suite</a>.</p> - <p>To some extent libxml2 provides support for the following additional -specifications but doesn't claim to implement them completely:</p> - <ul><li>Document Object Model (DOM) <a href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/</a> - the document model, but it doesn't implement the API itself, gdome2 does - this on top of libxml2</li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a> : - libxml2 implements a basic FTP client code</li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a> : - HTTP/1.0, again a basic HTTP client code</li> - <li>SAX: a SAX2 like interface and a minimal SAX1 implementation compatible - with early expat versions</li> + <p>In most cases libxml2 tries to implement the specifications in +arelativelystrictly compliant way. As of release 2.4.16, libxml2 passed +all1800+ testsfrom the <a href="http://www.oasis-open.org/committees/xml-conformance/">OASIS +XMLTestsSuite</a>.</p> + <p>To some extent libxml2 provides support for the +followingadditionalspecifications but doesn't claim to implement them +completely:</p> + <ul><li>Document Object Model (DOM) <a href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/</a>thedocument + model, but it doesn't implement the API itself, gdome2 doesthison top of + libxml2</li> + <li><a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC959</a>:libxml2 + implements a basic FTP client code</li> + <li><a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC1945</a>:HTTP/1.0, + again a basic HTTP client code</li> + <li>SAX: a SAX2 like interface and a minimal SAX1 + implementationcompatiblewith early expat versions</li> </ul> - <p>A partial implementation of <a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schemas Part -1: Structure</a> is being worked on but it would be far too early to make any -conformance statement about it at the moment.</p> + <p>A partial implementation of <a href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schemas +Part1:Structure</a>is being worked on but it would be far too early to +makeanyconformance statement about it at the moment.</p> <p>Separate documents:</p> - <ul><li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a> providing an - implementation of XSLT 1.0 and common extensions like EXSLT for - libxml2</li> - <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 page</a> - : a standard DOM2 implementation for libxml2</li> - <li><a href="http://www.aleksey.com/xmlsec/">the XMLSec page</a>: an - implementation of <a href="http://www.w3.org/TR/xmldsig-core/">W3C XML - Digital Signature</a> for libxml2</li> - <li>also check the related links section below for more related and active - projects.</li> + <ul><li><a href="http://xmlsoft.org/XSLT/">the libxslt + page</a>providinganimplementation of XSLT 1.0 and common extensions like + EXSLTforlibxml2</li> + <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 + page</a>:a standard DOM2 implementation for libxml2</li> + <li><a href="http://www.aleksey.com/xmlsec/">the XMLSec + page</a>:animplementation of <a href="http://www.w3.org/TR/xmldsig-core/">W3CXMLDigital Signature</a>for + libxml2</li> + <li>also check the related links section below for more related + andactiveprojects.</li> </ul> <p>Logo designed by <a href="mailto:liyanage@access.ch">Marc Liyanage</a>.</p> <p> diff --git a/doc/interface.html b/doc/interface.html index 8163c41..88ec0d8 100644 --- a/doc/interface.html +++ b/doc/interface.html @@ -7,19 +7,18 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>The SAX interface</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The SAX interface</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Sometimes the DOM tree output is just too large to fit reasonably into -memory. In that case (and if you don't expect to save back the XML document -loaded using libxml), it's better to use the SAX interface of libxml. SAX is -a <strong>callback-based interface</strong> to the parser. Before parsing, -the application layer registers a customized set of callbacks which are -called by the library as it progresses through the XML input.</p><p>To get more detailed step-by-step guidance on using the SAX interface of -libxml, see the <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nice -documentation</a>.written by <a href="mailto:james@daa.com.au">James -Henstridge</a>.</p><p>You can debug the SAX behaviour by using the <strong>testSAX</strong> -program located in the gnome-xml module (it's usually not shipped in the -binary packages of libxml, but you can find it in the tar source -distribution). Here is the sequence of callbacks that would be reported by -testSAX when parsing the example XML document shown earlier:</p><pre>SAX.setDocumentLocator() +</style><title>The SAX interface</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The SAX interface</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Sometimes the DOM tree output is just too large to fit +reasonablyintomemory. In that case (and if you don't expect to save back the +XMLdocumentloaded using libxml), it's better to use the SAX interface of +libxml.SAX isa <strong>callback-based interface</strong>to the parser. +Beforeparsing,the application layer registers a customized set of callbacks +whicharecalled by the library as it progresses through the XML input.</p><p>To get more detailed step-by-step guidance on using the SAX +interfaceoflibxml, see the <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nicedocumentation</a>.writtenby +<a href="mailto:james@daa.com.au">JamesHenstridge</a>.</p><p>You can debug the SAX behaviour by using +the<strong>testSAX</strong>program located in the gnome-xml module (it's +usuallynot shipped in thebinary packages of libxml, but you can find it in +the tarsourcedistribution). Here is the sequence of callbacks that would be +reportedbytestSAX when parsing the example XML document shown earlier:</p><pre>SAX.setDocumentLocator() SAX.startDocument() SAX.getEntity(amp) SAX.startElement(EXAMPLE, prop1='gnome is great', prop2='&amp; linux too') @@ -52,8 +51,8 @@ SAX.characters( , 3) SAX.endElement(chapter) SAX.characters( , 1) SAX.endElement(EXAMPLE) -SAX.endDocument()</pre><p>Most of the other interfaces of libxml2 are based on the DOM tree-building -facility, so nearly everything up to the end of this document presupposes the -use of the standard DOM tree build. Note that the DOM tree itself is built by -a set of registered default callbacks, without internal specific -interface.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +SAX.endDocument()</pre><p>Most of the other interfaces of libxml2 are based on the +DOMtree-buildingfacility, so nearly everything up to the end of this +documentpresupposes theuse of the standard DOM tree build. Note that the DOM +treeitself is built bya set of registered default callbacks, without +internalspecificinterface.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/intro.html b/doc/intro.html index 650eccb..1ae322f 100644 --- a/doc/intro.html +++ b/doc/intro.html @@ -7,25 +7,23 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Introduction</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Introduction</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>This document describes libxml, the <a href="http://www.w3.org/XML/">XML</a> C parser and toolkit developed for the -<a href="http://www.gnome.org/">Gnome</a> project. <a href="http://www.w3.org/XML/">XML is a standard</a> for building tag-based -structured documents/data.</p><p>Here are some key points about libxml:</p><ul><li>Libxml2 exports Push (progressive) and Pull (blocking) type parser - interfaces for both XML and HTML.</li> - <li>Libxml2 can do DTD validation at parse time, using a parsed document - instance, or with an arbitrary DTD.</li> - <li>Libxml2 includes complete <a href="http://www.w3.org/TR/xpath">XPath</a>, <a href="http://www.w3.org/TR/xptr">XPointer</a> and <a href="http://www.w3.org/TR/xinclude">XInclude</a> implementations.</li> - <li>It is written in plain C, making as few assumptions as possible, and - sticking closely to ANSI C/POSIX for easy embedding. Works on - Linux/Unix/Windows, ported to a number of other platforms.</li> - <li>Basic support for HTTP and FTP client allowing applications to fetch - remote resources.</li> +</style><title>Introduction</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Introduction</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>This document describes libxml, the <a href="http://www.w3.org/XML/">XML</a>C parser and toolkit developed for the<a href="http://www.gnome.org/">Gnome</a>project. <a href="http://www.w3.org/XML/">XML is a standard</a>for +buildingtag-basedstructured documents/data.</p><p>Here are some key points about libxml:</p><ul><li>Libxml2 exports Push (progressive) and Pull (blocking) + typeparserinterfaces for both XML and HTML.</li> + <li>Libxml2 can do DTD validation at parse time, using a + parseddocumentinstance, or with an arbitrary DTD.</li> + <li>Libxml2 includes complete <a href="http://www.w3.org/TR/xpath">XPath</a>, <a href="http://www.w3.org/TR/xptr">XPointer</a>and <a href="http://www.w3.org/TR/xinclude">XInclude</a>implementations.</li> + <li>It is written in plain C, making as few assumptions as + possible,andsticking closely to ANSI C/POSIX for easy embedding. + WorksonLinux/Unix/Windows, ported to a number of other platforms.</li> + <li>Basic support for HTTP and FTP client allowing applications + tofetchremote resources.</li> <li>The design is modular, most of the extensions can be compiled out.</li> - <li>The internal document representation is as close as possible to the <a href="http://www.w3.org/DOM/">DOM</a> interfaces.</li> - <li>Libxml2 also has a <a href="http://www.megginson.com/SAX/index.html">SAX like interface</a>; - the interface is designed to be compatible with <a href="http://www.jclark.com/xml/expat.html">Expat</a>.</li> - <li>This library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a>. See the Copyright file in the distribution for the precise - wording.</li> -</ul><p>Warning: unless you are forced to because your application links with a -Gnome-1.X library requiring it, <strong><span style="background-color: #FF0000">Do Not Use libxml1</span></strong>, use -libxml2</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> + <li>The internal document representation is as close as possible to the <a href="http://www.w3.org/DOM/">DOM</a>interfaces.</li> + <li>Libxml2 also has a <a href="http://www.megginson.com/SAX/index.html">SAX like + interface</a>;theinterface is designed to be compatible with <a href="http://www.jclark.com/xml/expat.html">Expat</a>.</li> + <li>This library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>.See + the Copyright file in the distribution for the precisewording.</li> +</ul><p>Warning: unless you are forced to because your application links +withaGnome-1.X library requiring it, <strong><span style="background-color: #FF0000">Do Not Use +libxml1</span></strong>,uselibxml2</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/library.html b/doc/library.html index b5faade..afe4d77 100644 --- a/doc/library.html +++ b/doc/library.html @@ -7,27 +7,25 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>The parser interfaces</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The parser interfaces</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>This section is directly intended to help programmers getting bootstrapped -using the XML tollkit from the C language. It is not intended to be -extensive. I hope the automatically generated documents will provide the -completeness required, but as a separate set of documents. The interfaces of -the XML parser are by principle low level, Those interested in a higher level -API should <a href="#DOM">look at DOM</a>.</p><p>The <a href="html/libxml-parser.html">parser interfaces for XML</a> are -separated from the <a href="html/libxml-htmlparser.html">HTML parser -interfaces</a>. Let's have a look at how the XML parser can be called:</p><h3><a name="Invoking" id="Invoking">Invoking the parser : the pull method</a></h3><p>Usually, the first thing to do is to read an XML input. The parser accepts -documents either from in-memory strings or from files. The functions are -defined in "parser.h":</p><dl><dt><code>xmlDocPtr xmlParseMemory(char *buffer, int size);</code></dt> +</style><title>The parser interfaces</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The parser interfaces</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>This section is directly intended to help programmers +gettingbootstrappedusing the XML tollkit from the C language. It is not +intended tobeextensive. I hope the automatically generated documents will +providethecompleteness required, but as a separate set of documents. The +interfacesofthe XML parser are by principle low level, Those interested in a +higherlevelAPI should <a href="#DOM">look at DOM</a>.</p><p>The <a href="html/libxml-parser.html">parser interfaces +forXML</a>areseparated from the <a href="html/libxml-htmlparser.html">HTMLparserinterfaces</a>. Let's have a +look at how the XML parser can becalled:</p><h3><a name="Invoking" id="Invoking">Invoking the parser : the pull method</a></h3><p>Usually, the first thing to do is to read an XML input. The +parseracceptsdocuments either from in-memory strings or from files. The +functionsaredefined in "parser.h":</p><dl><dt><code>xmlDocPtr xmlParseMemory(char *buffer, int size);</code></dt> <dd><p>Parse a null-terminated string containing the document.</p> </dd> </dl><dl><dt><code>xmlDocPtr xmlParseFile(const char *filename);</code></dt> - <dd><p>Parse an XML document contained in a (possibly compressed) - file.</p> + <dd><p>Parse an XML document contained in a (possibly compressed)file.</p> </dd> -</dl><p>The parser returns a pointer to the document structure (or NULL in case of -failure).</p><h3 id="Invoking1">Invoking the parser: the push method</h3><p>In order for the application to keep the control when the document is -being fetched (which is common for GUI based programs) libxml2 provides a -push interface, too, as of version 1.8.3. Here are the interface -functions:</p><pre>xmlParserCtxtPtr xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, +</dl><p>The parser returns a pointer to the document structure (or NULL in +caseoffailure).</p><h3 id="Invoking1">Invoking the parser: the push method</h3><p>In order for the application to keep the control when the document +isbeingfetched (which is common for GUI based programs) libxml2 provides +apushinterface, too, as of version 1.8.3. Here are the interfacefunctions:</p><pre>xmlParserCtxtPtr xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, const char *chunk, int size, @@ -54,17 +52,17 @@ int xmlParseChunk (xmlParserCtxtPtr ctxt, doc = ctxt->myDoc; xmlFreeParserCtxt(ctxt); } - }</pre><p>The HTML parser embedded into libxml2 also has a push interface; the -functions are just prefixed by "html" rather than "xml".</p><h3 id="Invoking2">Invoking the parser: the SAX interface</h3><p>The tree-building interface makes the parser memory-hungry, first loading -the document in memory and then building the tree itself. Reading a document -without building the tree is possible using the SAX interfaces (see SAX.h and -<a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">James -Henstridge's documentation</a>). Note also that the push interface can be -limited to SAX: just use the two first arguments of -<code>xmlCreatePushParserCtxt()</code>.</p><h3><a name="Building" id="Building">Building a tree from scratch</a></h3><p>The other way to get an XML tree in memory is by building it. Basically -there is a set of functions dedicated to building new elements. (These are -also described in <libxml/tree.h>.) For example, here is a piece of -code that produces the XML document used in the previous examples:</p><pre> #include <libxml/tree.h> + }</pre><p>The HTML parser embedded into libxml2 also has a push +interface;thefunctions are just prefixed by "html" rather than "xml".</p><h3 id="Invoking2">Invoking the parser: the SAX interface</h3><p>The tree-building interface makes the parser memory-hungry, +firstloadingthe document in memory and then building the tree itself. Reading +adocumentwithout building the tree is possible using the SAX interfaces +(seeSAX.h and<a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">JamesHenstridge'sdocumentation</a>). +Note also that the push interface can belimited to SAX:just use the two first +arguments of<code>xmlCreatePushParserCtxt()</code>.</p><h3><a name="Building" id="Building">Building a tree from scratch</a></h3><p>The other way to get an XML tree in memory is by building +it.Basicallythere is a set of functions dedicated to building new +elements.(These arealso described in <libxml/tree.h>.) For example, +here is apiece ofcode that produces the XML document used in the previous +examples:</p><pre> #include <libxml/tree.h> xmlDocPtr doc; xmlNodePtr tree, subtree; @@ -78,59 +76,58 @@ code that produces the XML document used in the previous examples:</p><pre> # subtree = xmlNewChild(tree, NULL, "title", "The Linux adventure"); subtree = xmlNewChild(tree, NULL, "p", "bla bla bla ..."); subtree = xmlNewChild(tree, NULL, "image", NULL); - xmlSetProp(subtree, "href", "linus.gif");</pre><p>Not really rocket science ...</p><h3><a name="Traversing" id="Traversing">Traversing the tree</a></h3><p>Basically by <a href="html/libxml-tree.html">including "tree.h"</a> your -code has access to the internal structure of all the elements of the tree. -The names should be somewhat simple like <strong>parent</strong>, -<strong>children</strong>, <strong>next</strong>, <strong>prev</strong>, -<strong>properties</strong>, etc... For example, still with the previous -example:</p><pre><code>doc->children->children->children</code></pre><p>points to the title element,</p><pre>doc->children->children->next->children->children</pre><p>points to the text node containing the chapter title "The Linux -adventure".</p><p><strong>NOTE</strong>: XML allows <em>PI</em>s and <em>comments</em> to be -present before the document root, so <code>doc->children</code> may point -to an element which is not the document Root Element; a function -<code>xmlDocGetRootElement()</code> was added for this purpose.</p><h3><a name="Modifying" id="Modifying">Modifying the tree</a></h3><p>Functions are provided for reading and writing the document content. Here -is an excerpt from the <a href="html/libxml-tree.html">tree API</a>:</p><dl><dt><code>xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar *name, const - xmlChar *value);</code></dt> - <dd><p>This sets (or changes) an attribute carried by an ELEMENT node. - The value can be NULL.</p> + xmlSetProp(subtree, "href", "linus.gif");</pre><p>Not really rocket science ...</p><h3><a name="Traversing" id="Traversing">Traversing the tree</a></h3><p>Basically by <a href="html/libxml-tree.html">including"tree.h"</a>yourcode +has access to the internal structure of all the elementsof the tree.The names +should be somewhat simple +like<strong>parent</strong>,<strong>children</strong>, +<strong>next</strong>,<strong>prev</strong>,<strong>properties</strong>, +etc... For example, stillwith the previousexample:</p><pre><code>doc->children->children->children</code></pre><p>points to the title element,</p><pre>doc->children->children->next->children->children</pre><p>points to the text node containing the chapter title +"TheLinuxadventure".</p><p><strong>NOTE</strong>: XML allows <em>PI</em>s and +<em>comments</em>tobepresent before the document root, so +<code>doc->children</code>maypointto an element which is not the document +Root Element; afunction<code>xmlDocGetRootElement()</code>was added for this +purpose.</p><h3><a name="Modifying" id="Modifying">Modifying the tree</a></h3><p>Functions are provided for reading and writing the document content.Hereis +an excerpt from the <a href="html/libxml-tree.html">tree API</a>:</p><dl><dt><code>xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar + *name,constxmlChar *value);</code></dt> + <dd><p>This sets (or changes) an attribute carried by an ELEMENT + node.Thevalue can be NULL.</p> </dd> -</dl><dl><dt><code>const xmlChar *xmlGetProp(xmlNodePtr node, const xmlChar - *name);</code></dt> - <dd><p>This function returns a pointer to new copy of the property - content. Note that the user must deallocate the result.</p> +</dl><dl><dt><code>const xmlChar *xmlGetProp(xmlNodePtr node, + constxmlChar*name);</code></dt> + <dd><p>This function returns a pointer to new copy of thepropertycontent. + Note that the user must deallocate the result.</p> </dd> -</dl><p>Two functions are provided for reading and writing the text associated -with elements:</p><dl><dt><code>xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc, const xmlChar - *value);</code></dt> - <dd><p>This function takes an "external" string and converts it to one - text node or possibly to a list of entity and text nodes. All - non-predefined entity references like &Gnome; will be stored - internally as entity nodes, hence the result of the function may not be - a single node.</p> +</dl><p>Two functions are provided for reading and writing the text +associatedwithelements:</p><dl><dt><code>xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc, + constxmlChar*value);</code></dt> + <dd><p>This function takes an "external" string and converts it toonetext + node or possibly to a list of entity and text nodes.Allnon-predefined + entity references like &Gnome; will bestoredinternally as entity + nodes, hence the result of the function maynot bea single node.</p> </dd> -</dl><dl><dt><code>xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list, int - inLine);</code></dt> - <dd><p>This function is the inverse of - <code>xmlStringGetNodeList()</code>. It generates a new string - containing the content of the text and entity nodes. Note the extra - argument inLine. If this argument is set to 1, the function will expand - entity references. For example, instead of returning the &Gnome; - XML encoding in the string, it will substitute it with its value (say, - "GNU Network Object Model Environment").</p> +</dl><dl><dt><code>xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr + list,intinLine);</code></dt> + <dd><p>This function is the inverseof<code>xmlStringGetNodeList()</code>. + It generates a newstringcontaining the content of the text and entity + nodes. Note theextraargument inLine. If this argument is set to 1, the + function willexpandentity references. For example, instead of + returning the&Gnome;XML encoding in the string, it will substitute + it with itsvalue (say,"GNU Network Object Model Environment").</p> </dd> -</dl><h3><a name="Saving" id="Saving">Saving a tree</a></h3><p>Basically 3 options are possible:</p><dl><dt><code>void xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int - *size);</code></dt> +</dl><h3><a name="Saving" id="Saving">Saving a tree</a></h3><p>Basically 3 options are possible:</p><dl><dt><code>void xmlDocDumpMemory(xmlDocPtr cur, + xmlChar**mem,int*size);</code></dt> <dd><p>Returns a buffer into which the document has been saved.</p> </dd> </dl><dl><dt><code>extern void xmlDocDump(FILE *f, xmlDocPtr doc);</code></dt> <dd><p>Dumps a document to an open file descriptor.</p> </dd> </dl><dl><dt><code>int xmlSaveFile(const char *filename, xmlDocPtr cur);</code></dt> - <dd><p>Saves the document to a file. In this case, the compression - interface is triggered if it has been turned on.</p> + <dd><p>Saves the document to a file. In this case, + thecompressioninterface is triggered if it has been turned on.</p> </dd> -</dl><h3><a name="Compressio" id="Compressio">Compression</a></h3><p>The library transparently handles compression when doing file-based -accesses. The level of compression on saves can be turned on either globally -or individually for one file:</p><dl><dt><code>int xmlGetDocCompressMode (xmlDocPtr doc);</code></dt> +</dl><h3><a name="Compressio" id="Compressio">Compression</a></h3><p>The library transparently handles compression when +doingfile-basedaccesses. The level of compression on saves can be turned on +eithergloballyor individually for one file:</p><dl><dt><code>int xmlGetDocCompressMode (xmlDocPtr doc);</code></dt> <dd><p>Gets the document compression ratio (0-9).</p> </dd> </dl><dl><dt><code>void xmlSetDocCompressMode (xmlDocPtr doc, int mode);</code></dt> diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 1affb28..2dbf900 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -2270,6 +2270,7 @@ <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3' type='enum'/> <exports symbol='XML_ERR_ENCODING_NAME' type='enum'/> <exports symbol='XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5' type='enum'/> + <exports symbol='XML_SCHEMAV_MISC' type='enum'/> <exports symbol='XML_IO_ECONNREFUSED' type='enum'/> <exports symbol='XML_ERR_XMLDECL_NOT_FINISHED' type='enum'/> <exports symbol='XML_SCHEMAP_P_PROPS_CORRECT_1' type='enum'/> @@ -3498,6 +3499,7 @@ <exports symbol='xmlXPathFuncLookupFunc' type='function'/> <exports symbol='xmlXPathCastNodeToString' type='function'/> <exports symbol='xmlXPathIsNaN' type='function'/> + <exports symbol='xmlXPathContextSetCache' type='function'/> <exports symbol='xmlXPathConvertString' type='function'/> <exports symbol='xmlXPathConvertBoolean' type='function'/> <exports symbol='xmlXPathIsInf' type='function'/> @@ -5521,6 +5523,7 @@ <enum name='XML_SCHEMAV_INVALIDATTR' file='xmlerror' value='1814' type='xmlParserErrors' info='1814'/> <enum name='XML_SCHEMAV_INVALIDELEM' file='xmlerror' value='1815' type='xmlParserErrors' info='1815'/> <enum name='XML_SCHEMAV_ISABSTRACT' file='xmlerror' value='1808' type='xmlParserErrors' info='1808'/> + <enum name='XML_SCHEMAV_MISC' file='xmlerror' value='1879' type='xmlParserErrors' info='1879'/> <enum name='XML_SCHEMAV_MISSING' file='xmlerror' value='1804' type='xmlParserErrors' info='1804'/> <enum name='XML_SCHEMAV_NOROLLBACK' file='xmlerror' value='1807' type='xmlParserErrors' info='1807'/> <enum name='XML_SCHEMAV_NOROOT' file='xmlerror' value='1801' type='xmlParserErrors'/> @@ -6686,7 +6689,8 @@ Could we use @subtypes for this?'/> <field name='lastError' type='xmlError' info=' the last error'/> <field name='debugNode' type='xmlNodePtr' info=' the source node XSLT dictionnary'/> <field name='dict' type='xmlDictPtr' info=' dictionnary if any'/> - <field name='flags' type='int' info=' flags to control compilation'/> + <field name='flags' type='int' info=' flags to control compilation Cache for reusal of XPath objects'/> + <field name='cache' type='void *' info=''/> </struct> <typedef name='xmlXPathContextPtr' file='xpath' type='xmlXPathContext *'/> <typedef name='xmlXPathError' file='xpath' type='enum'/> @@ -16980,6 +16984,15 @@ Could we use @subtypes for this?'/> <arg name='ctxt' type='xmlXPathParserContextPtr' info='the XPath Parser context'/> <arg name='nargs' type='int' info='the number of arguments'/> </function> + <function name='xmlXPathContextSetCache' file='xpath' module='xpath'> + <cond>defined(LIBXML_XPATH_ENABLED)</cond> + <info>Creates/frees an object cache on the XPath context. If activates XPath objects (xmlXPathObject) will be cached internally to be reused. @options: 0: This will set the XPath object caching: @value: This will set the maximum number of XPath objects to be cached per slot There are 5 slots for: node-set, string, number, boolean, and misc objects. Use <0 for the default number (100). Other values for @options have currently no effect.</info> + <return type='int' info='0 if the setting succeeded, and -1 on API or internal errors.'/> + <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/> + <arg name='active' type='int' info='enables/disables (creates/frees) the cache'/> + <arg name='value' type='int' info='a value with semantics dependant on @options'/> + <arg name='options' type='int' info='options (currently only the value 0 is used)'/> + </function> <function name='xmlXPathConvertBoolean' file='xpath' module='xpath'> <cond>defined(LIBXML_XPATH_ENABLED)</cond> <info>Converts an existing object to its boolean() equivalent</info> diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa index 65374b2..0cfdca5 100644 --- a/doc/libxml2.xsa +++ b/doc/libxml2.xsa @@ -8,52 +8,9 @@ </vendor> <product id="libxml2"> <name>libxml2</name> - <version>2.6.23</version> - <last-release> Jan 5 2006</last-release> + <version>2.6.25</version> + <last-release> Jun 6 2006:</last-release> <info-url>http://xmlsoft.org/</info-url> - <changes> - portability fixes: Windows (Rob Richards), getaddrinfo on Windows - (Kolja Nowak, Rob Richards), icc warnings (Kjartan Maraas), - --with-minimum compilation fixes (William Brack), error case handling fix - on Solaris (Albert Chin), don't use 'list' as parameter name reported by - Samuel Diaz Garcia, more old Unices portability fixes (Albert Chin), - MinGW compilation (Mark Junker), HP-UX compiler warnings (Rick - Jones), - - code cleanup: xmlReportError (Adrian Mouat), remove xmlBufferClose - (Geert Jansen), unreachable code (Oleksandr Kononenko), refactoring - parsing code (Bjorn Reese) - - bug fixes: xmlBuildRelativeURI and empty path (William Brack), - combinatory explosion and performances in regexp code, leak in - xmlTextReaderReadString(), xmlStringLenDecodeEntities problem (Massimo - Morara), Identity Constraints bugs and a segfault (Kasimier Buchcik), - XPath pattern based evaluation bugs (DV & Kasimier), - xmlSchemaContentModelDump() memory leak (Kasimier), potential leak in - xmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() misuse of - vsnprintf (William Brack), XHTML serialization fix (Rob Richards), CRLF - split problem (William), issues with non-namespaced attributes in - xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards), - HTML parsing of script, Python must not output to stdout (Nic Ferrier), - exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype - totalDigits bug (Kasimier Buchcik), error handling when writing to an - xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi - Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix - XSI driven XSD validation (Kasimier), parsing of xs:decimal (Kasimier), - fix DTD writer output (Rob Richards), leak in xmlTextReaderReadInnerXml - (Gary Coady), regexp bug affecting schemas (Kasimier), configuration of - runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs - (Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair), - compilation and build fixes (Michael Day), removed dependancies on - xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath - pattern based evaluation fixes (Kasimier) - - improvements: XSD Schemas redefinitions/restrictions (Kasimier - Buchcik), node copy checks and fix for attribute (Rob Richards), counted - transition bug in regexps, ctxt->standalone = -2 to indicate no - standalone attribute was found, add xmlSchemaSetParserStructuredErrors() - (Kasimier Buchcik), add xmlTextReaderSchemaValidateCtxt() to API - (Kasimier), handle gzipped HTTP resources (Gary Coady), add - htmlDocDumpMemoryFormat. (Rob Richards), - - documentation: typo (Michael Day), libxml man page (Albert Chin), save - function to XML buffer (Geert Jansen), small doc fix (Aron Stansvik), - -</changes> + <changes>Do not use or package 2.6.25</changes> </product> </xsa> diff --git a/doc/namespaces.html b/doc/namespaces.html index 32c7787..a4d6ace 100644 --- a/doc/namespaces.html +++ b/doc/namespaces.html @@ -7,44 +7,44 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Namespaces</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Namespaces</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The libxml2 library implements <a href="http://www.w3.org/TR/REC-xml-names/">XML namespaces</a> support by -recognizing namespace constructs in the input, and does namespace lookup -automatically when building the DOM tree. A namespace declaration is -associated with an in-memory structure and all elements or attributes within -that namespace point to it. Hence testing the namespace is a simple and fast -equality operation at the user level.</p><p>I suggest that people using libxml2 use a namespace, and declare it in the -root element of their document as the default namespace. Then they don't need -to use the prefix in the content but we will have a basis for future semantic -refinement and merging of data from different sources. This doesn't increase -the size of the XML output significantly, but significantly increases its -value in the long-term. Example:</p><pre><mydoc xmlns="http://mydoc.example.org/schemas/"> +</style><title>Namespaces</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Namespaces</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The libxml2 library implements <a href="http://www.w3.org/TR/REC-xml-names/">XML +namespaces</a>supportbyrecognizing namespace constructs in the input, and +does namespacelookupautomatically when building the DOM tree. A namespace +declarationisassociated with an in-memory structure and all elements or +attributeswithinthat namespace point to it. Hence testing the namespace is a +simple andfastequality operation at the user level.</p><p>I suggest that people using libxml2 use a namespace, and declare it +intheroot element of their document as the default namespace. Then they +don'tneedto use the prefix in the content but we will have a basis for +futuresemanticrefinement and merging of data from different sources. This +doesn'tincreasethe size of the XML output significantly, but significantly +increasesitsvalue in the long-term. Example:</p><pre><mydoc xmlns="http://mydoc.example.org/schemas/"> <elem1>...</elem1> <elem2>...</elem2> -</mydoc></pre><p>The namespace value has to be an absolute URL, but the URL doesn't have to -point to any existing resource on the Web. It will bind all the element and -attributes with that URL. I suggest to use an URL within a domain you -control, and that the URL should contain some kind of version information if -possible. For example, <code>"http://www.gnome.org/gnumeric/1.0/"</code> is a -good namespace scheme.</p><p>Then when you load a file, make sure that a namespace carrying the -version-independent prefix is installed on the root element of your document, -and if the version information don't match something you know, warn the user -and be liberal in what you accept as the input. Also do *not* try to base -namespace checking on the prefix value. <foo:text> may be exactly the -same as <bar:text> in another document. What really matters is the URI -associated with the element or the attribute, not the prefix string (which is -just a shortcut for the full URI). In libxml, element and attributes have an -<code>ns</code> field pointing to an xmlNs structure detailing the namespace -prefix and its URI.</p><p>@@Interfaces@@</p><pre>xmlNodePtr node; +</mydoc></pre><p>The namespace value has to be an absolute URL, but the URL doesn't +havetopoint to any existing resource on the Web. It will bind all the +elementandattributes with that URL. I suggest to use an URL within a +domainyoucontrol, and that the URL should contain some kind of version +informationifpossible. For example, +<code>"http://www.gnome.org/gnumeric/1.0/"</code>isagood namespace scheme.</p><p>Then when you load a file, make sure that a namespace +carryingtheversion-independent prefix is installed on the root element of +yourdocument,and if the version information don't match something you know, +warnthe userand be liberal in what you accept as the input. Also do *not* try +tobasenamespace checking on the prefix value. <foo:text> may be +exactlythesame as <bar:text> in another document. What really matters +is theURIassociated with the element or the attribute, not the prefix string +(whichisjust a shortcut for the full URI). In libxml, element and attributes +havean<code>ns</code>field pointing to an xmlNs structure detailing +thenamespaceprefix and its URI.</p><p>@@Interfaces@@</p><pre>xmlNodePtr node; if(!strncmp(node->name,"mytag",5) && node->ns && !strcmp(node->ns->href,"http://www.mysite.com/myns/1.0")) { ... -}</pre><p>Usually people object to using namespaces together with validity checking. -I will try to make sure that using namespaces won't break validity checking, -so even if you plan to use or currently are using validation I strongly -suggest adding namespaces to your document. A default namespace scheme -<code>xmlns="http://...."</code> should not break validity even on less -flexible parsers. Using namespaces to mix and differentiate content coming -from multiple DTDs will certainly break current validation schemes. To check -such documents one needs to use schema-validation, which is supported in -libxml2 as well. See <a href="http://www.relaxng.org/">relagx-ng</a> and <a href="http://www.w3c.org/XML/Schema">w3c-schema</a>.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +}</pre><p>Usually people object to using namespaces together with validitychecking.I +will try to make sure that using namespaces won't break validitychecking,so +even if you plan to use or currently are using validation Istronglysuggest +adding namespaces to your document. A default +namespacescheme<code>xmlns="http://...."</code>should not break validity even +onlessflexible parsers. Using namespaces to mix and differentiate +contentcomingfrom multiple DTDs will certainly break current validation +schemes. Tochecksuch documents one needs to use schema-validation, which is +supportedinlibxml2 as well. See <a href="http://www.relaxng.org/">relagx-ng</a>and <a href="http://www.w3c.org/XML/Schema">w3c-schema</a>.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/news.html b/doc/news.html index a75db52..b67feaa 100644 --- a/doc/news.html +++ b/doc/news.html @@ -7,470 +7,489 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Releases</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Releases</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Items not finished and worked on, get in touch with the list if you want -to help those</p><ul><li>More testing on RelaxNG</li> - <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML - Schemas</a></li> -</ul><p>The <a href="ChangeLog.html">change log</a> describes the recents commits -to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p><p>There is the list of public releases:</p><h3>2.6.24: Apr 28 2006</h3><ul><li>Portability fixes: configure on Windows, testapi compile on windows - (Kasimier Buchcik, venkat naidu), Borland C++ 6 compile (Eric Zurcher), - HP-UX compiler workaround (Rick Jones), xml2-config bugfix, gcc-4.1 - cleanups, Python detection scheme (Joseph Sacco), UTF-8 file paths on - Windows (Roland Schwingel). - </li> - <li>Improvements: xmlDOMWrapReconcileNamespaces xmlDOMWrapCloneNode (Kasimier - Buchcik), XML catalog debugging (Rick Jones), update to Unicode 4.01.</li> - <li>Bug fixes: xmlParseChunk() problem in 2.6.23, xmlParseInNodeContext() - on HTML docs, URI behaviour on Windows (Rob Richards), comment streaming - bug, xmlParseComment (with William Brack), regexp bug fixes (DV & - Youri Golovanov), xmlGetNodePath on text/CDATA (Kasimier), - one Relax-NG interleave bug, xmllint --path and --valid, - XSD bugfixes (Kasimier), remove debug - left in Python bindings (Nic Ferrier), xmlCatalogAdd bug (Martin Cole), - xmlSetProp fixes (Rob Richards), HTML IDness (Rob Richards), a large - number of cleanups and small fixes based on Coverity reports, bug - in character ranges, Unicode tables const (Aivars Kalvans), schemas - fix (Stefan Kost), xmlRelaxNGParse error deallocation, - xmlSchemaAddSchemaDoc error deallocation, error handling on unallowed - code point, ixmllint --nonet to never reach the net (Gary Coady), - line break in writer after end PI (Jason Viers). </li> +</style><title>Releases</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Releases</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation & DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Items not finished and worked on, get in touch with the list if you +wanttohelp those</p><ul><li>More testing on RelaxNG</li> + <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XMLSchemas</a></li> +</ul><p>The <a href="ChangeLog.html">change log</a>describes the recents +commitstothe <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a>code +base.</p><p>There is the list of public releases:</p><h3>2.6.26: Jun 6 2006</h3><ul><li>portability fixes: Python detection (Joseph Sacco), compilation + error(William Brack and Graham Bennett), LynxOS patch (Olli Savia)</li> + <li>bug fixes: encoding buffer problem, mix of code and data in + xmlIO.c(Kjartan Maraas), entities in XSD validation (Kasimier Buchcik), + variousXSD validation fixes (Kasimier), memory leak in pattern (Rob + Richards andKasimier), attribute with colon in name (Rob Richards), XPath + leak inerror reporting (Aleksey Sanin), XInclude text include of + selfdocument.</li> + <li>improvements: Xpath optimizations (Kasimier), XPath object + cache(Kasimier)</li> +</ul><h3>2.6.25: Jun 6 2006:</h3><p>Do not use or package 2.6.25</p><h3>2.6.24: Apr 28 2006</h3><ul><li>Portability fixes: configure on Windows, testapi compile + onwindows(Kasimier Buchcik, venkat naidu), Borland C++ 6 compile + (EricZurcher),HP-UX compiler workaround (Rick Jones), xml2-config + bugfix,gcc-4.1cleanups, Python detection scheme (Joseph Sacco), UTF-8 + file pathsonWindows (Roland Schwingel).</li> + <li>Improvements: xmlDOMWrapReconcileNamespaces + xmlDOMWrapCloneNode(KasimierBuchcik), XML catalog debugging (Rick Jones), + update to Unicode4.01.</li> + <li>Bug fixes: xmlParseChunk() problem in 2.6.23, + xmlParseInNodeContext()onHTML docs, URI behaviour on Windows (Rob + Richards), comment streamingbug,xmlParseComment (with William Brack), + regexp bug fixes (DV &YouriGolovanov), xmlGetNodePath on text/CDATA + (Kasimier),one Relax-NGinterleave bug, xmllint --path and --valid,XSD + bugfixes (Kasimier),remove debugleft in Python bindings (Nic Ferrier), + xmlCatalogAdd bug(Martin Cole),xmlSetProp fixes (Rob Richards), HTML + IDness (RobRichards), a largenumber of cleanups and small fixes based on + Coverityreports, bugin character ranges, Unicode tables const (Aivars + Kalvans),schemasfix (Stefan Kost), xmlRelaxNGParse + errordeallocation,xmlSchemaAddSchemaDoc error deallocation, error + handling onunallowedcode point, ixmllint --nonet to never reach the net + (GaryCoady),line break in writer after end PI (Jason Viers).</li> <li>Documentation: man pages updates and cleanups (Daniel Leidert).</li> <li>New features: Relax NG structure error handlers.</li> -</ul><h3>2.6.23: Jan 5 2006</h3><ul><li>portability fixes: Windows (Rob Richards), getaddrinfo on Windows - (Kolja Nowak, Rob Richards), icc warnings (Kjartan Maraas), - --with-minimum compilation fixes (William Brack), error case handling fix - on Solaris (Albert Chin), don't use 'list' as parameter name reported by - Samuel Diaz Garcia, more old Unices portability fixes (Albert Chin), - MinGW compilation (Mark Junker), HP-UX compiler warnings (Rick - Jones),</li> - <li>code cleanup: xmlReportError (Adrian Mouat), remove xmlBufferClose - (Geert Jansen), unreachable code (Oleksandr Kononenko), refactoring - parsing code (Bjorn Reese)</li> - <li>bug fixes: xmlBuildRelativeURI and empty path (William Brack), - combinatory explosion and performances in regexp code, leak in - xmlTextReaderReadString(), xmlStringLenDecodeEntities problem (Massimo - Morara), Identity Constraints bugs and a segfault (Kasimier Buchcik), - XPath pattern based evaluation bugs (DV & Kasimier), - xmlSchemaContentModelDump() memory leak (Kasimier), potential leak in - xmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() misuse of - vsnprintf (William Brack), XHTML serialization fix (Rob Richards), CRLF - split problem (William), issues with non-namespaced attributes in - xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards), - HTML parsing of script, Python must not output to stdout (Nic Ferrier), - exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype - totalDigits bug (Kasimier Buchcik), error handling when writing to an - xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi - Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix - XSI driven XSD validation (Kasimier), parsing of xs:decimal (Kasimier), - fix DTD writer output (Rob Richards), leak in xmlTextReaderReadInnerXml - (Gary Coady), regexp bug affecting schemas (Kasimier), configuration of - runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs - (Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair), - compilation and build fixes (Michael Day), removed dependancies on - xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath - pattern based evaluation fixes (Kasimier)</li> - <li>improvements: XSD Schemas redefinitions/restrictions (Kasimier - Buchcik), node copy checks and fix for attribute (Rob Richards), counted - transition bug in regexps, ctxt->standalone = -2 to indicate no - standalone attribute was found, add xmlSchemaSetParserStructuredErrors() - (Kasimier Buchcik), add xmlTextReaderSchemaValidateCtxt() to API - (Kasimier), handle gzipped HTTP resources (Gary Coady), add - htmlDocDumpMemoryFormat. (Rob Richards),</li> - <li>documentation: typo (Michael Day), libxml man page (Albert Chin), save - function to XML buffer (Geert Jansen), small doc fix (Aron Stansvik),</li> +</ul><h3>2.6.23: Jan 5 2006</h3><ul><li>portability fixes: Windows (Rob Richards), getaddrinfo on + Windows(KoljaNowak, Rob Richards), icc warnings (Kjartan + Maraas),--with-minimumcompilation fixes (William Brack), error case + handling fixon Solaris(Albert Chin), don't use 'list' as parameter name + reported bySamuel DiazGarcia, more old Unices portability fixes (Albert + Chin),MinGW compilation(Mark Junker), HP-UX compiler warnings + (RickJones),</li> + <li>code cleanup: xmlReportError (Adrian Mouat), removexmlBufferClose(Geert + Jansen), unreachable code (Oleksandr Kononenko),refactoringparsing code + (Bjorn Reese)</li> + <li>bug fixes: xmlBuildRelativeURI and empty path + (WilliamBrack),combinatory explosion and performances in regexp code, + leakinxmlTextReaderReadString(), xmlStringLenDecodeEntities + problem(MassimoMorara), Identity Constraints bugs and a segfault + (KasimierBuchcik),XPath pattern based evaluation bugs (DV + &Kasimier),xmlSchemaContentModelDump() memory leak (Kasimier), + potentialleak inxmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() + misuseofvsnprintf (William Brack), XHTML serialization fix (Rob + Richards),CRLFsplit problem (William), issues with non-namespaced + attributesinxmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() + (RobRichards),HTML parsing of script, Python must not output to stdout + (NicFerrier),exclusive C14N namespace visibility (Aleksey Sanin), + XSDdataypetotalDigits bug (Kasimier Buchcik), error handling when writing + toanxmlBuffer (Rob Richards), runtest schemas error not + reported(HisashiFujinaka), signed/unsigned problem in date/time code + (AlbertChin), fixXSI driven XSD validation (Kasimier), parsing of + xs:decimal(Kasimier),fix DTD writer output (Rob Richards), leak + inxmlTextReaderReadInnerXml(Gary Coady), regexp bug affecting + schemas(Kasimier), configuration ofruntime debugging + (Kasimier),xmlNodeBufGetContent bug on entity refs(Oleksandr + Kononenko),xmlRegExecPushString2 bug (Sreeni Nair),compilation and build + fixes(Michael Day), removed dependancies onxmlSchemaValidError + (Kasimier), bugwith <xml:foo/>, more XPathpattern based evaluation + fixes(Kasimier)</li> + <li>improvements: XSD Schemas redefinitions/restrictions + (KasimierBuchcik),node copy checks and fix for attribute (Rob Richards), + countedtransitionbug in regexps, ctxt->standalone = -2 to indicate + nostandaloneattribute was found, add + xmlSchemaSetParserStructuredErrors()(KasimierBuchcik), add + xmlTextReaderSchemaValidateCtxt() to API(Kasimier), handlegzipped HTTP + resources (Gary Coady), addhtmlDocDumpMemoryFormat. (RobRichards),</li> + <li>documentation: typo (Michael Day), libxml man page (Albert + Chin),savefunction to XML buffer (Geert Jansen), small doc fix + (AronStansvik),</li> </ul><h3>2.6.22: Sep 12 2005</h3><ul><li>build fixes: compile without schematron (Stéphane Bidoul)</li> - <li>bug fixes: xmlDebugDumpNode on namespace node (Oleg Paraschenko)i, - CDATA push parser bug, xmlElemDump problem with XHTML1 doc, - XML_FEATURE_xxx clash with expat headers renamed XML_WITH_xxx, fix some - output formatting for meta element (Rob Richards), script and style - XHTML1 serialization (David Madore), Attribute derivation fixups in XSD - (Kasimier Buchcik), better IDC error reports (Kasimier Buchcik)</li> - <li>improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob Richards), add - XML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements preparing for - derive (Kasimier Buchcik).</li> - <li>documentation: generation of gtk-doc like docs, integration with - devhelp.</li> -</ul><h3>2.6.21: Sep 4 2005</h3><ul><li>build fixes: Cygwin portability fixes (Gerrit P. Haase), calling - convention problems on Windows (Marcus Boerger), cleanups based on Linus' - sparse tool, update of win32/configure.js (Rob Richards), remove warnings - on Windows(Marcus Boerger), compilation without SAX1, detection of the - Python binary, use $GCC inestad of $CC = 'gcc' (Andrew W. Nosenko), - compilation/link with threads and old gcc, compile problem by C370 on - Z/OS,</li> - <li>bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8 - bug (Jiri Netolicky), XPath NaN compare bug (William Brack), - htmlParseScript potential bug, Schemas regexp handling of spaces, Base64 - Schemas comparisons NIST passes, automata build error xsd:all, - xmlGetNodePath for namespaced attributes (Alexander Pohoyda), xmlSchemas - foreign namespaces handling, XML Schemas facet comparison (Kupriyanov - Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier Buchcik), xml: - namespace ahndling in Schemas (Kasimier), empty model group in Schemas - (Kasimier), wilcard in Schemas (Kasimier), URI composition (William), - xs:anyType in Schemas (Kasimier), Python resolver emmitting error - messages directly, Python xmlAttr.parent (Jakub Piotr Clapa), trying to - fix the file path/URI conversion, xmlTextReaderGetAttribute fix (Rob - Richards), xmlSchemaFreeAnnot memleak (Kasimier), HTML UTF-8 - serialization, streaming XPath, Schemas determinism detection problem, - XInclude bug, Schemas context type (Dean Hill), validation fix (Derek - Poon), xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards), Schemas - type fix (Kuba Nowakowski), UTF-8 parser bug, error in encoding handling, - xmlGetLineNo fixes, bug on entities handling, entity name extraction in - error handling with XInclude, text nodes in HTML body tags (Gary Coady), - xml:id and IDness at the treee level fixes, XPath streaming patterns - bugs.</li> - <li>improvements: structured interfaces for schemas and RNG error reports - (Marcus Boerger), optimization of the char data inner loop parsing - (thanks to Behdad Esfahbod for the idea), schematron validation though - not finished yet, xmlSaveOption to omit XML declaration, keyref match - error reports (Kasimier), formal expression handling code not plugged - yet, more lax mode for the HTML parser, parser XML_PARSE_COMPACT option - for text nodes allocation.</li> + <li>bug fixes: xmlDebugDumpNode on namespace node (Oleg + Paraschenko)i,CDATApush parser bug, xmlElemDump problem with XHTML1 + doc,XML_FEATURE_xxxclash with expat headers renamed XML_WITH_xxx, fix + someoutput formattingfor meta element (Rob Richards), script and + styleXHTML1 serialization(David Madore), Attribute derivation fixups in + XSD(Kasimier Buchcik),better IDC error reports (Kasimier Buchcik)</li> + <li>improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob + Richards),addXML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements + preparingforderive (Kasimier Buchcik).</li> + <li>documentation: generation of gtk-doc like docs, + integrationwithdevhelp.</li> +</ul><h3>2.6.21: Sep 4 2005</h3><ul><li>build fixes: Cygwin portability fixes (Gerrit P. + Haase),callingconvention problems on Windows (Marcus Boerger), cleanups + based onLinus'sparse tool, update of win32/configure.js (Rob Richards), + removewarningson Windows(Marcus Boerger), compilation without SAX1, + detectionof thePython binary, use $GCC inestad of $CC = 'gcc' (Andrew + W.Nosenko),compilation/link with threads and old gcc, compile problem + byC370 onZ/OS,</li> + <li>bug fixes: http_proxy environments (Peter Breitenlohner), HTML + UTF-8bug(Jiri Netolicky), XPath NaN compare bug (William + Brack),htmlParseScriptpotential bug, Schemas regexp handling of spaces, + Base64Schemascomparisons NIST passes, automata build error + xsd:all,xmlGetNodePath fornamespaced attributes (Alexander Pohoyda), + xmlSchemasforeign namespaceshandling, XML Schemas facet comparison + (KupriyanovAnatolij),xmlSchemaPSimpleTypeErr error report (Kasimier + Buchcik), xml:namespaceahndling in Schemas (Kasimier), empty model group + in Schemas(Kasimier),wilcard in Schemas (Kasimier), URI composition + (William),xs:anyType inSchemas (Kasimier), Python resolver emmitting + errormessages directly,Python xmlAttr.parent (Jakub Piotr Clapa), trying + tofix the file path/URIconversion, xmlTextReaderGetAttribute fix + (RobRichards),xmlSchemaFreeAnnot memleak (Kasimier), HTML + UTF-8serialization, streamingXPath, Schemas determinism detection + problem,XInclude bug, Schemascontext type (Dean Hill), validation fix + (DerekPoon),xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards), + Schemastype fix(Kuba Nowakowski), UTF-8 parser bug, error in + encodinghandling,xmlGetLineNo fixes, bug on entities handling, entity + nameextraction inerror handling with XInclude, text nodes in HTML body + tags(Gary Coady),xml:id and IDness at the treee level fixes, XPath + streamingpatternsbugs.</li> + <li>improvements: structured interfaces for schemas and RNG + errorreports(Marcus Boerger), optimization of the char data inner + loopparsing(thanks to Behdad Esfahbod for the idea), schematron + validationthoughnot finished yet, xmlSaveOption to omit XML declaration, + keyrefmatcherror reports (Kasimier), formal expression handling code + notpluggedyet, more lax mode for the HTML parser, parser + XML_PARSE_COMPACToptionfor text nodes allocation.</li> <li>documentation: xmllint man page had --nonet duplicated</li> -</ul><h3>2.6.20: Jul 10 2005</h3><ul><li>build fixes: Windows build (Rob Richards), Mingw compilation (Igor - Zlatkovic), Windows Makefile (Igor), gcc warnings (Kasimier and - andriy@google.com), use gcc weak references to pthread to avoid the - pthread dependancy on Linux, compilation problem (Steve Nairn), compiling - of subset (Morten Welinder), IPv6/ss_family compilation (William Brack), - compilation when disabling parts of the library, standalone test - distribution.</li> - <li>bug fixes: bug in lang(), memory cleanup on errors (William Brack), - HTTP query strings (Aron Stansvik), memory leak in DTD (William), integer - overflow in XPath (William), nanoftp buffer size, pattern "." apth fixup - (Kasimier), leak in tree reported by Malcolm Rowe, replaceNode patch - (Brent Hendricks), CDATA with NULL content (Mark Vakoc), xml:base fixup - on XInclude (William), pattern fixes (William), attribute bug in - exclusive c14n (Aleksey Sanin), xml:space and xml:lang with SAX2 (Rob - Richards), namespace trouble in complex parsing (Malcolm Rowe), XSD type - QNames fixes (Kasimier), XPath streaming fixups (William), RelaxNG bug - (Rob Richards), Schemas for Schemas fixes (Kasimier), removal of ID (Rob - Richards), a small RelaxNG leak, HTML parsing in push mode bug (James - Bursa), failure to detect UTF-8 parsing bugs in CDATA sections, - areBlanks() heuristic failure, duplicate attributes in DTD bug - (William).</li> - <li>improvements: lot of work on Schemas by Kasimier Buchcik both on - conformance and streaming, Schemas validation messages (Kasimier Buchcik, - Matthew Burgess), namespace removal at the python level (Brent - Hendricks), Update to new Schemas regression tests from W3C/Nist - (Kasimier), xmlSchemaValidateFile() (Kasimier), implementation of - xmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml (James Wert), - standalone test framework and programs, new DOM import APIs - xmlDOMWrapReconcileNamespaces() xmlDOMWrapAdoptNode() and - xmlDOMWrapRemoveNode(), extension of xmllint capabilities for SAX and - Schemas regression tests, xmlStopParser() available in pull mode too, - ienhancement to xmllint --shell namespaces support, Windows port of the - standalone testing tools (Kasimier and William), - xmlSchemaValidateStream() xmlSchemaSAXPlug() and xmlSchemaSAXUnplug() SAX - Schemas APIs, Schemas xmlReader support.</li> -</ul><h3>2.6.19: Apr 02 2005</h3><ul><li>build fixes: drop .la from RPMs, --with-minimum build fix (William - Brack), use XML_SOCKLEN_T instead of SOCKLEN_T because it breaks with AIX - 5.3 compiler, fixed elfgcchack.h generation and PLT reduction code on - Linux/ELF/gcc4</li> - <li>bug fixes: schemas type decimal fixups (William Brack), xmmlint return - code (Gerry Murphy), small schemas fixes (Matthew Burgess and GUY - Fabrice), workaround "DAV:" namespace brokeness in c14n (Aleksey Sanin), - segfault in Schemas (Kasimier Buchcik), Schemas attribute validation - (Kasimier), Prop related functions and xmlNewNodeEatName (Rob Richards), - HTML serialization of name attribute on a elements, Python error handlers - leaks and improvement (Brent Hendricks), uninitialized variable in - encoding code, Relax-NG validation bug, potential crash if - gnorableWhitespace is NULL, xmlSAXParseDoc and xmlParseDoc signatures, - switched back to assuming UTF-8 in case no encoding is given at - serialization time</li> - <li>improvements: lot of work on Schemas by Kasimier Buchcik on facets - checking and also mixed handling.</li> +</ul><h3>2.6.20: Jul 10 2005</h3><ul><li>build fixes: Windows build (Rob Richards), Mingw + compilation(IgorZlatkovic), Windows Makefile (Igor), gcc warnings + (Kasimierandandriy@google.com), use gcc weak references to pthread to + avoidthepthread dependancy on Linux, compilation problem (Steve + Nairn),compilingof subset (Morten Welinder), IPv6/ss_family compilation + (WilliamBrack),compilation when disabling parts of the library, + standalonetestdistribution.</li> + <li>bug fixes: bug in lang(), memory cleanup on errors (William + Brack),HTTPquery strings (Aron Stansvik), memory leak in DTD + (William),integeroverflow in XPath (William), nanoftp buffer size, + pattern "." apthfixup(Kasimier), leak in tree reported by Malcolm Rowe, + replaceNodepatch(Brent Hendricks), CDATA with NULL content (Mark Vakoc), + xml:basefixupon XInclude (William), pattern fixes (William), attribute + buginexclusive c14n (Aleksey Sanin), xml:space and xml:lang with + SAX2(RobRichards), namespace trouble in complex parsing (Malcolm Rowe), + XSDtypeQNames fixes (Kasimier), XPath streaming fixups (William), + RelaxNGbug(Rob Richards), Schemas for Schemas fixes (Kasimier), removal + of ID(RobRichards), a small RelaxNG leak, HTML parsing in push mode + bug(JamesBursa), failure to detect UTF-8 parsing bugs in + CDATAsections,areBlanks() heuristic failure, duplicate attributes in + DTDbug(William).</li> + <li>improvements: lot of work on Schemas by Kasimier Buchcik + bothonconformance and streaming, Schemas validation messages + (KasimierBuchcik,Matthew Burgess), namespace removal at the python + level(BrentHendricks), Update to new Schemas regression tests + fromW3C/Nist(Kasimier), xmlSchemaValidateFile() (Kasimier), + implementationofxmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml + (JamesWert),standalone test framework and programs, new DOM + importAPIsxmlDOMWrapReconcileNamespaces() + xmlDOMWrapAdoptNode()andxmlDOMWrapRemoveNode(), extension of xmllint + capabilities for SAXandSchemas regression tests, xmlStopParser() + available in pull modetoo,ienhancement to xmllint --shell namespaces + support, Windows port ofthestandalone testing tools (Kasimier + andWilliam),xmlSchemaValidateStream() xmlSchemaSAXPlug() + andxmlSchemaSAXUnplug() SAXSchemas APIs, Schemas xmlReader support.</li> +</ul><h3>2.6.19: Apr 02 2005</h3><ul><li>build fixes: drop .la from RPMs, --with-minimum build + fix(WilliamBrack), use XML_SOCKLEN_T instead of SOCKLEN_T because it + breakswith AIX5.3 compiler, fixed elfgcchack.h generation and PLT + reductioncode onLinux/ELF/gcc4</li> + <li>bug fixes: schemas type decimal fixups (William Brack), + xmmlintreturncode (Gerry Murphy), small schemas fixes (Matthew Burgess + andGUYFabrice), workaround "DAV:" namespace brokeness in c14n + (AlekseySanin),segfault in Schemas (Kasimier Buchcik), Schemas + attributevalidation(Kasimier), Prop related functions and + xmlNewNodeEatName (RobRichards),HTML serialization of name attribute on a + elements, Pythonerror handlersleaks and improvement (Brent Hendricks), + uninitializedvariable inencoding code, Relax-NG validation bug, potential + crashifgnorableWhitespace is NULL, xmlSAXParseDoc and + xmlParseDocsignatures,switched back to assuming UTF-8 in case no encoding + is givenatserialization time</li> + <li>improvements: lot of work on Schemas by Kasimier Buchcik + onfacetschecking and also mixed handling.</li> <li></li> -</ul><h3>2.6.18: Mar 13 2005</h3><ul><li>build fixes: warnings (Peter Breitenlohner), testapi.c generation, - Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed), - some gcc4 fixes, HP-UX portability fixes (Rick Jones).</li> - <li>bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and - xmlreader stopping on non-fatal errors, thread support for dictionnaries - reference counting (Gary Coady), internal subset and push problem, URL - saved in xmlCopyDoc, various schemas bug fixes (Kasimier), Python paths - fixup (Stephane Bidoul), xmlGetNodePath and namespaces, xmlSetNsProp fix - (Mike Hommey), warning should not count as error (William Brack), - xmlCreatePushParser empty chunk, XInclude parser flags (William), cleanup - FTP and HTTP code to reuse the uri parsing and IPv6 (William), - xmlTextWriterStartAttributeNS fix (Rob Richards), XMLLINT_INDENT being - empty (William), xmlWriter bugs (Rob Richards), multithreading on Windows - (Rich Salz), xmlSearchNsByHref fix (Kasimier), Python binding leak (Brent - Hendricks), aliasing bug exposed by gcc4 on s390, xmlTextReaderNext bug - (Rob Richards), Schemas decimal type fixes (William Brack), - xmlByteConsumed static buffer (Ben Maurer).</li> - <li>improvement: speedup parsing comments and DTDs, dictionnary support for - hash tables, Schemas Identity constraints (Kasimier), streaming XPath - subset, xmlTextReaderReadString added (Bjorn Reese), Schemas canonical - values handling (Kasimier), add xmlTextReaderByteConsumed (Aron - Stansvik),</li> +</ul><h3>2.6.18: Mar 13 2005</h3><ul><li>build fixes: warnings (Peter Breitenlohner), + testapi.cgeneration,Bakefile support (Francesco Montorsi), Windows + compilation(Joel Reed),some gcc4 fixes, HP-UX portability fixes (Rick + Jones).</li> + <li>bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), + pushandxmlreader stopping on non-fatal errors, thread support + fordictionnariesreference counting (Gary Coady), internal subset and + pushproblem, URLsaved in xmlCopyDoc, various schemas bug fixes + (Kasimier),Python pathsfixup (Stephane Bidoul), xmlGetNodePath and + namespaces,xmlSetNsProp fix(Mike Hommey), warning should not count as + error (WilliamBrack),xmlCreatePushParser empty chunk, XInclude parser + flags (William),cleanupFTP and HTTP code to reuse the uri parsing and + IPv6(William),xmlTextWriterStartAttributeNS fix (Rob + Richards),XMLLINT_INDENT beingempty (William), xmlWriter bugs (Rob + Richards),multithreading on Windows(Rich Salz), xmlSearchNsByHref fix + (Kasimier),Python binding leak (BrentHendricks), aliasing bug exposed by + gcc4 ons390, xmlTextReaderNext bug(Rob Richards), Schemas decimal type + fixes(William Brack),xmlByteConsumed static buffer (Ben Maurer).</li> + <li>improvement: speedup parsing comments and DTDs, dictionnary + supportforhash tables, Schemas Identity constraints (Kasimier), + streamingXPathsubset, xmlTextReaderReadString added (Bjorn Reese), + Schemascanonicalvalues handling (Kasimier), add + xmlTextReaderByteConsumed(AronStansvik),</li> <li>Documentation: Wiki support (Joel Reed)</li> -</ul><h3>2.6.17: Jan 16 2005</h3><ul><li>build fixes: Windows, warnings removal (William Brack), - maintainer-clean dependency(William), build in a different directory - (William), fixing --with-minimum configure build (William), BeOS build - (Marcin Konicki), Python-2.4 detection (William), compilation on AIX (Dan - McNichol)</li> - <li>bug fixes: xmlTextReaderHasAttributes (Rob Richards), xmlCtxtReadFile() - to use the catalog(s), loop on output (William Brack), XPath memory leak, - ID deallocation problem (Steve Shepard), debugDumpNode crash (William), - warning not using error callback (William), xmlStopParser bug (William), - UTF-16 with BOM on DTDs (William), namespace bug on empty elements in - push mode (Rob Richards), line and col computations fixups (Aleksey - Sanin), xmlURIEscape fix (William), xmlXPathErr on bad range (William), - patterns with too many steps, bug in RNG choice optimization, line number - sometimes missing.</li> - <li>improvements: XSD Schemas (Kasimier Buchcik), python generator - (William), xmlUTF8Strpos speedup (William), unicode Python strings - (William), XSD error reports (Kasimier Buchcik), Python __str__ call - serialize().</li> - <li>new APIs: added xmlDictExists(), GetLineNumber and GetColumnNumber for - the xmlReader (Aleksey Sanin), Dynamic Shared Libraries APIs (mostly Joel - Reed), error extraction API from regexps, new XMLSave option for format - (Phil Shafer)</li> - <li>documentation: site improvement (John Fleck), FAQ entries - (William).</li> -</ul><h3>2.6.16: Nov 10 2004</h3><ul><li>general hardening and bug fixing crossing all the API based on new - automated regression testing</li> +</ul><h3>2.6.17: Jan 16 2005</h3><ul><li>build fixes: Windows, warnings removal (William + Brack),maintainer-cleandependency(William), build in a different + directory(William), fixing--with-minimum configure build (William), BeOS + build(Marcin Konicki),Python-2.4 detection (William), compilation on AIX + (DanMcNichol)</li> + <li>bug fixes: xmlTextReaderHasAttributes (Rob + Richards),xmlCtxtReadFile()to use the catalog(s), loop on output (William + Brack),XPath memory leak,ID deallocation problem (Steve Shepard), + debugDumpNodecrash (William),warning not using error callback (William), + xmlStopParserbug (William),UTF-16 with BOM on DTDs (William), namespace + bug on emptyelements inpush mode (Rob Richards), line and col + computations fixups(AlekseySanin), xmlURIEscape fix (William), + xmlXPathErr on bad range(William),patterns with too many steps, bug in + RNG choice optimization,line numbersometimes missing.</li> + <li>improvements: XSD Schemas (Kasimier Buchcik), pythongenerator(William), + xmlUTF8Strpos speedup (William), unicode Pythonstrings(William), XSD + error reports (Kasimier Buchcik), Python __str__callserialize().</li> + <li>new APIs: added xmlDictExists(), GetLineNumber and + GetColumnNumberforthe xmlReader (Aleksey Sanin), Dynamic Shared Libraries + APIs (mostlyJoelReed), error extraction API from regexps, new XMLSave + option forformat(Phil Shafer)</li> + <li>documentation: site improvement (John Fleck), FAQ entries(William).</li> +</ul><h3>2.6.16: Nov 10 2004</h3><ul><li>general hardening and bug fixing crossing all the API based + onnewautomated regression testing</li> <li>build fix: IPv6 build and test on AIX (Dodji Seketeli)</li> - <li>bug fixes: problem with XML::Libxml reported by Petr Pajas, encoding - conversion functions return values, UTF-8 bug affecting XPath reported by - Markus Bertheau, catalog problem with NULL entries (William Brack)</li> - <li>documentation: fix to xmllint man page, some API function descritpion - were updated.</li> - <li>improvements: DTD validation APIs provided at the Python level (Brent - Hendricks)</li> + <li>bug fixes: problem with XML::Libxml reported by Petr + Pajas,encodingconversion functions return values, UTF-8 bug affecting + XPathreported byMarkus Bertheau, catalog problem with NULL entries + (WilliamBrack)</li> + <li>documentation: fix to xmllint man page, some API + functiondescritpionwere updated.</li> + <li>improvements: DTD validation APIs provided at the Python + level(BrentHendricks)</li> </ul><h3>2.6.15: Oct 27 2004</h3><ul><li>security fixes on the nanoftp and nanohttp modules</li> - <li>build fixes: xmllint detection bug in configure, building outside the - source tree (Thomas Fitzsimmons)</li> - <li>bug fixes: HTML parser on broken ASCII chars in names (William), Python - paths (Malcolm Tredinnick), xmlHasNsProp and default namespace (William), - saving to python file objects (Malcolm Tredinnick), DTD lookup fix - (Malcolm), save back <group> in catalogs (William), tree build - fixes (DV and Rob Richards), Schemas memory bug, structured error handler - on Python 64bits, thread local memory deallocation, memory leak reported - by Volker Roth, xmlValidateDtd in the presence of an internal subset, - entities and _private problem (William), xmlBuildRelativeURI error - (William).</li> - <li>improvements: better XInclude error reports (William), tree debugging - module and tests, convenience functions at the Reader API (Graham - Bennett), add support for PI in the HTML parser.</li> -</ul><h3>2.6.14: Sep 29 2004</h3><ul><li>build fixes: configure paths for xmllint and xsltproc, compilation - without HTML parser, compilation warning cleanups (William Brack & - Malcolm Tredinnick), VMS makefile update (Craig Berry),</li> - <li>bug fixes: xmlGetUTF8Char (William Brack), QName properties (Kasimier - Buchcik), XInclude testing, Notation serialization, UTF8ToISO8859x - transcoding (Mark Itzcovitz), lots of XML Schemas cleanup and fixes - (Kasimier), ChangeLog cleanup (Stepan Kasal), memory fixes (Mark Vakoc), - handling of failed realloc(), out of bound array adressing in Schemas - date handling, Python space/tabs cleanups (Malcolm Tredinnick), NMTOKENS - E20 validation fix (Malcolm),</li> - <li>improvements: added W3C XML Schemas testsuite (Kasimier Buchcik), add - xmlSchemaValidateOneElement (Kasimier), Python exception hierearchy - (Malcolm Tredinnick), Python libxml2 driver improvement (Malcolm - Tredinnick), Schemas support for xsi:schemaLocation, - xsi:noNamespaceSchemaLocation, xsi:type (Kasimier Buchcik)</li> -</ul><h3>2.6.13: Aug 31 2004</h3><ul><li>build fixes: Windows and zlib (Igor Zlatkovic), -O flag with gcc, - Solaris compiler warning, fixing RPM BuildRequires,</li> - <li>fixes: DTD loading on Windows (Igor), Schemas error reports APIs - (Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack - and Julius Mittenzwei), Schemas facet check (Kasimier), default namespace - problem (William), Schemas hexbinary empty values, encoding error could - genrate a serialization loop.</li> - <li>Improvements: Schemas validity improvements (Kasimier), added --path - and --load-trace options to xmllint</li> + <li>build fixes: xmllint detection bug in configure, building + outsidethesource tree (Thomas Fitzsimmons)</li> + <li>bug fixes: HTML parser on broken ASCII chars in names + (William),Pythonpaths (Malcolm Tredinnick), xmlHasNsProp and default + namespace(William),saving to python file objects (Malcolm Tredinnick), + DTD lookupfix(Malcolm), save back <group> in catalogs (William), + treebuildfixes (DV and Rob Richards), Schemas memory bug, structured + errorhandleron Python 64bits, thread local memory deallocation, memory + leakreportedby Volker Roth, xmlValidateDtd in the presence of an + internalsubset,entities and _private problem (William), + xmlBuildRelativeURIerror(William).</li> + <li>improvements: better XInclude error reports (William), + treedebuggingmodule and tests, convenience functions at the Reader + API(GrahamBennett), add support for PI in the HTML parser.</li> +</ul><h3>2.6.14: Sep 29 2004</h3><ul><li>build fixes: configure paths for xmllint and + xsltproc,compilationwithout HTML parser, compilation warning cleanups + (WilliamBrack &Malcolm Tredinnick), VMS makefile update (Craig + Berry),</li> + <li>bug fixes: xmlGetUTF8Char (William Brack), QName + properties(KasimierBuchcik), XInclude testing, Notation + serialization,UTF8ToISO8859xtranscoding (Mark Itzcovitz), lots of XML + Schemas cleanupand fixes(Kasimier), ChangeLog cleanup (Stepan Kasal), + memory fixes (MarkVakoc),handling of failed realloc(), out of bound array + adressing inSchemasdate handling, Python space/tabs cleanups (Malcolm + Tredinnick),NMTOKENSE20 validation fix (Malcolm),</li> + <li>improvements: added W3C XML Schemas testsuite (Kasimier + Buchcik),addxmlSchemaValidateOneElement (Kasimier), Python + exceptionhierearchy(Malcolm Tredinnick), Python libxml2 driver + improvement(MalcolmTredinnick), Schemas support + forxsi:schemaLocation,xsi:noNamespaceSchemaLocation, xsi:type + (KasimierBuchcik)</li> +</ul><h3>2.6.13: Aug 31 2004</h3><ul><li>build fixes: Windows and zlib (Igor Zlatkovic), -O flag withgcc,Solaris + compiler warning, fixing RPM BuildRequires,</li> + <li>fixes: DTD loading on Windows (Igor), Schemas error + reportsAPIs(Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 + (WilliamBrackand Julius Mittenzwei), Schemas facet check (Kasimier), + defaultnamespaceproblem (William), Schemas hexbinary empty values, + encodingerror couldgenrate a serialization loop.</li> + <li>Improvements: Schemas validity improvements (Kasimier), added + --pathand--load-trace options to xmllint</li> <li>documentation: tutorial update (John Fleck)</li> -</ul><h3>2.6.12: Aug 22 2004</h3><ul><li>build fixes: fix --with-minimum, elfgcchack.h fixes (Peter - Breitenlohner), perl path lookup (William), diff on Solaris (Albert - Chin), some 64bits cleanups.</li> - <li>Python: avoid a warning with 2.3 (William Brack), tab and space mixes - (William), wrapper generator fixes (William), Cygwin support (Gerrit P. - Haase), node wrapper fix (Marc-Antoine Parent), XML Schemas support - (Torkel Lyng)</li> +</ul><h3>2.6.12: Aug 22 2004</h3><ul><li>build fixes: fix --with-minimum, elfgcchack.h + fixes(PeterBreitenlohner), perl path lookup (William), diff on + Solaris(AlbertChin), some 64bits cleanups.</li> + <li>Python: avoid a warning with 2.3 (William Brack), tab and + spacemixes(William), wrapper generator fixes (William), Cygwin support + (GerritP.Haase), node wrapper fix (Marc-Antoine Parent), XML + Schemassupport(Torkel Lyng)</li> <li>Schemas: a lot of bug fixes and improvements from Kasimier Buchcik</li> - <li>fixes: RVT fixes (William), XPath context resets bug (William), memory - debug (Steve Hay), catalog white space handling (Peter Breitenlohner), - xmlReader state after attribute reading (William), structured error - handler (William), XInclude generated xml:base fixup (William), Windows - memory reallocation problem (Steve Hay), Out of Memory conditions - handling (William and Olivier Andrieu), htmlNewDoc() charset bug, - htmlReadMemory init (William), a posteriori validation DTD base - (William), notations serialization missing, xmlGetNodePath (Dodji), - xmlCheckUTF8 (Diego Tartara), missing line numbers on entity - (William)</li> - <li>improvements: DocBook catalog build scrip (William), xmlcatalog tool - (Albert Chin), xmllint --c14n option, no_proxy environment (Mike Hommey), - xmlParseInNodeContext() addition, extend xmllint --shell, allow XInclude - to not generate start/end nodes, extend xmllint --version to include CVS - tag (William)</li> - <li>documentation: web pages fixes, validity API docs fixes (William) - schemas API fix (Eric Haszlakiewicz), xmllint man page (John Fleck)</li> -</ul><h3>2.6.11: July 5 2004</h3><ul><li>Schemas: a lot of changes and improvements by Kasimier Buchcik for - attributes, namespaces and simple types.</li> - <li>build fixes: --with-minimum (William Brack), some gcc cleanup - (William), --with-thread-alloc (William)</li> - <li>portability: Windows binary package change (Igor Zlatkovic), Catalog - path on Windows</li> - <li>documentation: update to the tutorial (John Fleck), xmllint return code - (John Fleck), man pages (Ville Skytta),</li> - <li>bug fixes: C14N bug serializing namespaces (Aleksey Sanin), testSAX - properly initialize the library (William), empty node set in XPath - (William), xmlSchemas errors (William), invalid charref problem pointed - by Morus Walter, XInclude xml:base generation (William), Relax-NG bug - with div processing (William), XPointer and xml:base problem(William), - Reader and entities, xmllint return code for schemas (William), reader - streaming problem (Steve Ball), DTD serialization problem (William), - libxml.m4 fixes (Mike Hommey), do not provide destructors as methods on - Python classes, xmlReader buffer bug, Python bindings memory interfaces - improvement (with Stéphane Bidoul), Fixed the push parser to be back to - synchronous behaviour.</li> - <li>improvement: custom per-thread I/O enhancement (Rob Richards), register - namespace in debug shell (Stefano Debenedetti), Python based regression - test for non-Unix users (William), dynamically increase the number of - XPath extension functions in Python and fix a memory leak (Marc-Antoine - Parent and William)</li> - <li>performance: hack done with Arjan van de Ven to reduce ELF footprint - and generated code on Linux, plus use gcc runtime profiling to optimize - the code generated in the RPM packages.</li> + <li>fixes: RVT fixes (William), XPath context resets bug + (William),memorydebug (Steve Hay), catalog white space handling + (PeterBreitenlohner),xmlReader state after attribute reading + (William),structured errorhandler (William), XInclude generated xml:base + fixup(William), Windowsmemory reallocation problem (Steve Hay), Out of + Memoryconditionshandling (William and Olivier Andrieu), htmlNewDoc() + charsetbug,htmlReadMemory init (William), a posteriori validation + DTDbase(William), notations serialization missing, + xmlGetNodePath(Dodji),xmlCheckUTF8 (Diego Tartara), missing line numbers + onentity(William)</li> + <li>improvements: DocBook catalog build scrip (William), + xmlcatalogtool(Albert Chin), xmllint --c14n option, no_proxy environment + (MikeHommey),xmlParseInNodeContext() addition, extend xmllint --shell, + allowXIncludeto not generate start/end nodes, extend xmllint --version + toinclude CVStag (William)</li> + <li>documentation: web pages fixes, validity API docs fixes(William)schemas + API fix (Eric Haszlakiewicz), xmllint man page (JohnFleck)</li> +</ul><h3>2.6.11: July 5 2004</h3><ul><li>Schemas: a lot of changes and improvements by Kasimier + Buchcikforattributes, namespaces and simple types.</li> + <li>build fixes: --with-minimum (William Brack), some gcccleanup(William), + --with-thread-alloc (William)</li> + <li>portability: Windows binary package change (Igor Zlatkovic),Catalogpath + on Windows</li> + <li>documentation: update to the tutorial (John Fleck), xmllint + returncode(John Fleck), man pages (Ville Skytta),</li> + <li>bug fixes: C14N bug serializing namespaces (Aleksey + Sanin),testSAXproperly initialize the library (William), empty node set + inXPath(William), xmlSchemas errors (William), invalid charref + problempointedby Morus Walter, XInclude xml:base generation (William), + Relax-NGbugwith div processing (William), XPointer and + xml:baseproblem(William),Reader and entities, xmllint return code for + schemas(William), readerstreaming problem (Steve Ball), DTD + serializationproblem (William),libxml.m4 fixes (Mike Hommey), do not + providedestructors as methods onPython classes, xmlReader buffer bug, + Pythonbindings memory interfacesimprovement (with Stéphane Bidoul), Fixed + thepush parser to be back tosynchronous behaviour.</li> + <li>improvement: custom per-thread I/O enhancement (Rob + Richards),registernamespace in debug shell (Stefano Debenedetti), Python + basedregressiontest for non-Unix users (William), dynamically increase + thenumber ofXPath extension functions in Python and fix a memory + leak(Marc-AntoineParent and William)</li> + <li>performance: hack done with Arjan van de Ven to reduce ELF + footprintandgenerated code on Linux, plus use gcc runtime profiling to + optimizethecode generated in the RPM packages.</li> </ul><h3>2.6.10: May 17 2004</h3><ul><li>Web page generated for ChangeLog</li> <li>build fixes: --without-html problems, make check without make all</li> - <li>portability: problem with xpath.c on Windows (MSC and Borland), memcmp - vs. strncmp on Solaris, XPath tests on Windows (Mark Vakoc), C++ do not - use "list" as parameter name, make tests work with Python 1.5 (Ed - Davis),</li> - <li>improvements: made xmlTextReaderMode public, small buffers resizing - (Morten Welinder), add --maxmem option to xmllint, add - xmlPopInputCallback() for Matt Sergeant, refactoring of serialization - escaping, added escaping customization</li> - <li>bugfixes: xsd:extension (Taihei Goi), assorted regexp bugs (William - Brack), xmlReader end of stream problem, node deregistration with reader, - URI escaping and filemanes, XHTML1 formatting (Nick Wellnhofer), regexp - transition reduction (William), various XSD Schemas fixes (Kasimier - Buchcik), XInclude fallback problem (William), weird problems with DTD - (William), structured error handler callback context (William), reverse - xmlEncodeSpecialChars() behaviour back to escaping '"'</li> + <li>portability: problem with xpath.c on Windows (MSC and + Borland),memcmpvs. strncmp on Solaris, XPath tests on Windows (Mark + Vakoc), C++ donotuse "list" as parameter name, make tests work with + Python 1.5(EdDavis),</li> + <li>improvements: made xmlTextReaderMode public, small + buffersresizing(Morten Welinder), add --maxmem option to + xmllint,addxmlPopInputCallback() for Matt Sergeant, refactoring + ofserializationescaping, added escaping customization</li> + <li>bugfixes: xsd:extension (Taihei Goi), assorted regexp + bugs(WilliamBrack), xmlReader end of stream problem, node deregistration + withreader,URI escaping and filemanes, XHTML1 formatting (Nick + Wellnhofer),regexptransition reduction (William), various XSD Schemas + fixes(KasimierBuchcik), XInclude fallback problem (William), weird + problemswith DTD(William), structured error handler callback context + (William),reversexmlEncodeSpecialChars() behaviour back to escaping + '"'</li> </ul><h3>2.6.9: Apr 18 2004</h3><ul><li>implement xml:id Working Draft, relaxed XPath id() checking</li> - <li>bugfixes: xmlCtxtReset (Brent Hendricks), line number and CDATA (Dave - Beckett), Relax-NG compilation (William Brack), Regexp patches (with - William), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed problem (with - William), Relax-NG name classes compares (William), XInclude duplicate - fallback (William), external DTD encoding detection (William), a DTD - validation bug (William), xmlReader Close() fix, recusive extention - schemas</li> - <li>improvements: use xmlRead* APIs in test tools (Mark Vakoc), indenting - save optimization, better handle IIS broken HTTP redirect behaviour (Ian - Hummel), HTML parser frameset (James Bursa), libxml2-python RPM - dependancy, XML Schemas union support (Kasimier Buchcik), warning removal - clanup (William), keep ChangeLog compressed when installing from RPMs</li> - <li>documentation: examples and xmlDocDumpMemory docs (John Fleck), new - example (load, xpath, modify, save), xmlCatalogDump() comments,</li> - <li>Windows: Borland C++ builder (Eric Zurcher), work around Microsoft - compiler NaN handling bug (Mark Vakoc)</li> + <li>bugfixes: xmlCtxtReset (Brent Hendricks), line number and + CDATA(DaveBeckett), Relax-NG compilation (William Brack), Regexp + patches(withWilliam), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed + problem(withWilliam), Relax-NG name classes compares (William), + XIncludeduplicatefallback (William), external DTD encoding detection + (William), aDTDvalidation bug (William), xmlReader Close() fix, + recusiveextentionschemas</li> + <li>improvements: use xmlRead* APIs in test tools (Mark + Vakoc),indentingsave optimization, better handle IIS broken HTTP + redirectbehaviour (IanHummel), HTML parser frameset (James Bursa), + libxml2-pythonRPMdependancy, XML Schemas union support (Kasimier + Buchcik), warningremovalclanup (William), keep ChangeLog compressed when + installing fromRPMs</li> + <li>documentation: examples and xmlDocDumpMemory docs (John + Fleck),newexample (load, xpath, modify, save), xmlCatalogDump() + comments,</li> + <li>Windows: Borland C++ builder (Eric Zurcher), work + aroundMicrosoftcompiler NaN handling bug (Mark Vakoc)</li> </ul><h3>2.6.8: Mar 23 2004</h3><ul><li>First step of the cleanup of the serialization code and APIs</li> - <li>XML Schemas: mixed content (Adam Dickmeiss), QName handling fixes (Adam - Dickmeiss), anyURI for "" (John Belmonte)</li> + <li>XML Schemas: mixed content (Adam Dickmeiss), QName handling + fixes(AdamDickmeiss), anyURI for "" (John Belmonte)</li> <li>Python: Canonicalization C14N support added (Anthony Carrico)</li> <li>xmlDocCopyNode() extension (William)</li> - <li>Relax-NG: fix when processing XInclude results (William), external - reference in interleave (William), missing error on <choice> - failure (William), memory leak in schemas datatype facets.</li> + <li>Relax-NG: fix when processing XInclude results + (William),externalreference in interleave (William), missing error + on<choice>failure (William), memory leak in schemas + datatypefacets.</li> <li>xmlWriter: patch for better DTD support (Alfred Mickautsch)</li> - <li>bug fixes: xmlXPathLangFunction memory leak (Mike Hommey and William - Brack), no ID errors if using HTML_PARSE_NOERROR, xmlcatalog fallbacks to - URI on SYSTEM lookup failure, XInclude parse flags inheritance (William), - XInclude and XPointer fixes for entities (William), XML parser bug - reported by Holger Rauch, nanohttp fd leak (William), regexps char - groups '-' handling (William), dictionnary reference counting problems, - do not close stderr.</li> + <li>bug fixes: xmlXPathLangFunction memory leak (Mike Hommey + andWilliamBrack), no ID errors if using HTML_PARSE_NOERROR, + xmlcatalogfallbacks toURI on SYSTEM lookup failure, XInclude parse + flagsinheritance (William),XInclude and XPointer fixes for entities + (William),XML parser bugreported by Holger Rauch, nanohttp fd leak + (William),regexps chargroups '-' handling (William), dictionnary + reference countingproblems,do not close stderr.</li> <li>performance patches from Petr Pajas</li> <li>Documentation fixes: XML_CATALOG_FILES in man pages (Mike Hommey)</li> - <li>compilation and portability fixes: --without-valid, catalog cleanups - (Peter Breitenlohner), MingW patch (Roland Schwingel), cross-compilation - to Windows (Christophe de Vienne), --with-html-dir fixup (Julio Merino - Vidal), Windows build (Eric Zurcher)</li> + <li>compilation and portability fixes: --without-valid, + catalogcleanups(Peter Breitenlohner), MingW patch (Roland + Schwingel),cross-compilationto Windows (Christophe de Vienne), + --with-html-dirfixup (Julio MerinoVidal), Windows build (Eric + Zurcher)</li> </ul><h3>2.6.7: Feb 23 2004</h3><ul><li>documentation: tutorial updates (John Fleck), benchmark results</li> <li>xmlWriter: updates and fixes (Alfred Mickautsch, Lucas Brasilino)</li> <li>XPath optimization (Petr Pajas)</li> <li>DTD ID handling optimization</li> - <li>bugfixes: xpath number with > 19 fractional (William Brack), push - mode with unescaped '>' characters, fix xmllint --stream --timing, fix - xmllint --memory --stream memory usage, xmlAttrSerializeTxtContent - handling NULL, trying to fix Relax-NG/Perl interface.</li> + <li>bugfixes: xpath number with > 19 fractional (William + Brack),pushmode with unescaped '>' characters, fix xmllint --stream + --timing,fixxmllint --memory --stream memory + usage,xmlAttrSerializeTxtContenthandling NULL, trying to fix + Relax-NG/Perlinterface.</li> <li>python: 2.3 compatibility, whitespace fixes (Malcolm Tredinnick)</li> <li>Added relaxng option to xmllint --shell</li> -</ul><h3>2.6.6: Feb 12 2004</h3><ul><li>nanohttp and nanoftp: buffer overflow error on URI parsing (Igor and - William) reported by Yuuichi Teranishi</li> - <li>bugfixes: make test and path issues, xmlWriter attribute serialization - (William Brack), xmlWriter indentation (William), schemas validation - (Eric Haszlakiewicz), XInclude dictionnaries issues (William and Oleg - Paraschenko), XInclude empty fallback (William), HTML warnings (William), - XPointer in XInclude (William), Python namespace serialization, - isolat1ToUTF8 bound error (Alfred Mickautsch), output of parameter - entities in internal subset (William), internal subset bug in push mode, - <xs:all> fix (Alexey Sarytchev)</li> - <li>Build: fix for automake-1.8 (Alexander Winston), warnings removal - (Philip Ludlam), SOCKLEN_T detection fixes (Daniel Richard), fix - --with-minimum configuration.</li> +</ul><h3>2.6.6: Feb 12 2004</h3><ul><li>nanohttp and nanoftp: buffer overflow error on URI parsing + (IgorandWilliam) reported by Yuuichi Teranishi</li> + <li>bugfixes: make test and path issues, xmlWriter + attributeserialization(William Brack), xmlWriter indentation (William), + schemasvalidation(Eric Haszlakiewicz), XInclude dictionnaries issues + (Williamand OlegParaschenko), XInclude empty fallback (William), HTML + warnings(William),XPointer in XInclude (William), Python + namespaceserialization,isolat1ToUTF8 bound error (Alfred Mickautsch), + output ofparameterentities in internal subset (William), internal subset + bug inpush mode,<xs:all> fix (Alexey Sarytchev)</li> + <li>Build: fix for automake-1.8 (Alexander Winston), warningsremoval(Philip + Ludlam), SOCKLEN_T detection fixes (Daniel Richard),fix--with-minimum + configuration.</li> <li>XInclude: allow the 2001 namespace without warning.</li> - <li>Documentation: missing example/index.html (John Fleck), version - dependancies (John Fleck)</li> + <li>Documentation: missing example/index.html (John + Fleck),versiondependancies (John Fleck)</li> <li>reader API: structured error reporting (Steve Ball)</li> - <li>Windows compilation: mingw, msys (Mikhail Grushinskiy), function - prototype (Cameron Johnson), MSVC6 compiler warnings, _WINSOCKAPI_ - patch</li> - <li>Parsers: added xmlByteConsumed(ctxt) API to get the byte offest in - input.</li> -</ul><h3>2.6.5: Jan 25 2004</h3><ul><li>Bugfixes: dictionnaries for schemas (William Brack), regexp segfault - (William), xs:all problem (William), a number of XPointer bugfixes - (William), xmllint error go to stderr, DTD validation problem with - namespace, memory leak (William), SAX1 cleanup and minimal options fixes - (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union - evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin), - XML Schemas double free (Steve Ball), XInclude with no href, argument - callbacks order for XPath callbacks (Frederic Peters)</li> - <li>Documentation: python scripts (William Brack), xslt stylesheets (John - Fleck), doc (Sven Zimmerman), I/O example.</li> - <li>Python bindings: fixes (William), enum support (Stéphane Bidoul), - structured error reporting (Stéphane Bidoul)</li> - <li>XInclude: various fixes for conformance, problem related to dictionnary - references (William & me), recursion (William)</li> - <li>xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred - Mickautsch),</li> + <li>Windows compilation: mingw, msys (Mikhail + Grushinskiy),functionprototype (Cameron Johnson), MSVC6 compiler + warnings,_WINSOCKAPI_patch</li> + <li>Parsers: added xmlByteConsumed(ctxt) API to get the byte + offestininput.</li> +</ul><h3>2.6.5: Jan 25 2004</h3><ul><li>Bugfixes: dictionnaries for schemas (William Brack), + regexpsegfault(William), xs:all problem (William), a number of + XPointerbugfixes(William), xmllint error go to stderr, DTD validation + problemwithnamespace, memory leak (William), SAX1 cleanup and minimal + optionsfixes(Mark Vadoc), parser context reset on error (Shaun McCance), + XPathunionevaluation problem (William) , xmlReallocLoc with NULL + (AlekseySanin),XML Schemas double free (Steve Ball), XInclude with no + href,argumentcallbacks order for XPath callbacks (Frederic Peters)</li> + <li>Documentation: python scripts (William Brack), xslt + stylesheets(JohnFleck), doc (Sven Zimmerman), I/O example.</li> + <li>Python bindings: fixes (William), enum support + (StéphaneBidoul),structured error reporting (Stéphane Bidoul)</li> + <li>XInclude: various fixes for conformance, problem related + todictionnaryreferences (William & me), recursion (William)</li> + <li>xmlWriter: indentation (Lucas Brasilino), memory + leaks(AlfredMickautsch),</li> <li>xmlSchemas: normalizedString datatype (John Belmonte)</li> <li>code cleanup for strings functions (William)</li> <li>Windows: compiler patches (Mark Vakoc)</li> - <li>Parser optimizations, a few new XPath and dictionnary APIs for future - XSLT optimizations.</li> + <li>Parser optimizations, a few new XPath and dictionnary APIs + forfutureXSLT optimizations.</li> </ul><h3>2.6.4: Dec 24 2003</h3><ul><li>Windows build fixes (Igor Zlatkovic)</li> <li>Some serious XInclude problems reported by Oleg Paraschenko and</li> <li>Unix and Makefile packaging fixes (me, William Brack,</li> - <li>Documentation improvements (John Fleck, William Brack), example fix - (Lucas Brasilino)</li> - <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of - NULL strings (William Brack) , API building reader or parser from - filedescriptor should not close it, changed XPath sorting to be stable - again (William Brack), xmlGetNodePath() generating '(null)' (William - Brack), DTD validation and namespace bug (William Brack), XML Schemas - double inclusion behaviour</li> + <li>Documentation improvements (John Fleck, William Brack), + examplefix(Lucas Brasilino)</li> + <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath + handlingofNULL strings (William Brack) , API building reader or + parserfromfiledescriptor should not close it, changed XPath sorting to + bestableagain (William Brack), xmlGetNodePath() generating + '(null)'(WilliamBrack), DTD validation and namespace bug (William Brack), + XMLSchemasdouble inclusion behaviour</li> </ul><h3>2.6.3: Dec 10 2003</h3><ul><li>documentation updates and cleanup (DV, William Brack, John Fleck)</li> - <li>added a repository of examples, examples from Aleksey Sanin, Dodji - Seketeli, Alfred Mickautsch</li> - <li>Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw - (Kenneth Haley)</li> + <li>added a repository of examples, examples from Aleksey + Sanin,DodjiSeketeli, Alfred Mickautsch</li> + <li>Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher,Mingw(Kenneth + Haley)</li> <li>Unicode range checking (William Brack)</li> <li>code cleanup (William Brack)</li> <li>Python bindings: doc (John Fleck), bug fixes</li> <li>UTF-16 cleanup and BOM issues (William Brack)</li> - <li>bug fixes: ID and xmlReader validation, XPath (William Brack), - xmlWriter (Alfred Mickautsch), hash.h inclusion problem, HTML parser - (James Bursa), attribute defaulting and validation, some serialization - cleanups, XML_GET_LINE macro, memory debug when using threads (William - Brack), serialization of attributes and entities content, xmlWriter - (Daniel Schulman)</li> - <li>XInclude bugfix, new APIs and update to the last version including the - namespace change.</li> - <li>XML Schemas improvements: include (Robert Stepanek), import and - namespace handling, fixed the regression tests troubles, added examples - based on Eric van der Vlist book, regexp fixes</li> - <li>preliminary pattern support for streaming (needed for schemas - constraints), added xmlTextReaderPreservePattern() to collect subdocument - when streaming.</li> + <li>bug fixes: ID and xmlReader validation, XPath (William + Brack),xmlWriter(Alfred Mickautsch), hash.h inclusion problem, HTML + parser(James Bursa),attribute defaulting and validation, some + serializationcleanups,XML_GET_LINE macro, memory debug when using threads + (WilliamBrack),serialization of attributes and entities content, + xmlWriter(DanielSchulman)</li> + <li>XInclude bugfix, new APIs and update to the last version + includingthenamespace change.</li> + <li>XML Schemas improvements: include (Robert Stepanek), importandnamespace + handling, fixed the regression tests troubles, addedexamplesbased on Eric + van der Vlist book, regexp fixes</li> + <li>preliminary pattern support for streaming (needed + forschemasconstraints), added xmlTextReaderPreservePattern() to + collectsubdocumentwhen streaming.</li> <li>various fixes in the structured error handling</li> </ul><h3>2.6.2: Nov 4 2003</h3><ul><li>XPath context unregistration fixes</li> <li>text node coalescing fixes (Mark Lilback)</li> @@ -482,117 +501,118 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p><p> <li>a posteriori DTD validation fixes</li> <li>xmlReader bug fixes: Walker fixes, python bindings</li> <li>fixed xmlStopParser() to really stop the parser and errors</li> - <li>always generate line numbers when using the new xmlReadxxx - functions</li> + <li>always generate line numbers when using the new xmlReadxxxfunctions</li> <li>added XInclude support to the xmlReader interface</li> <li>implemented XML_PARSE_NONET parser option</li> <li>DocBook XSLT processing bug fixed</li> <li>HTML serialization for <p> elements (William Brack and me)</li> <li>XPointer failure in XInclude are now handled as resource errors</li> - <li>fixed xmllint --html to use the HTML serializer on output (added - --xmlout to implement the previous behaviour of saving it using the XML - serializer)</li> + <li>fixed xmllint --html to use the HTML serializer on output(added--xmlout + to implement the previous behaviour of saving it using + theXMLserializer)</li> </ul><h3>2.6.1: Oct 28 2003</h3><ul><li>Mostly bugfixes after the big 2.6.0 changes</li> - <li>Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup - (William Brack)</li> - <li>Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor - Zlatkovic)</li> + <li>Unix compilation patches: libxml.m4 (Patrick Welche), + warningscleanup(William Brack)</li> + <li>Windows compilation patches (Joachim Bauch, Stephane + Bidoul,IgorZlatkovic)</li> <li>xmlWriter bugfix (Alfred Mickautsch)</li> <li>chvalid.[ch]: couple of fixes from Stephane Bidoul</li> - <li>context reset: error state reset, push parser reset (Graham - Bennett)</li> + <li>context reset: error state reset, push parser reset (GrahamBennett)</li> <li>context reuse: generate errors if file is not readable</li> - <li>defaulted attributes for element coming from internal entities - (Stephane Bidoul)</li> + <li>defaulted attributes for element coming from internal + entities(StephaneBidoul)</li> <li>Python: tab and spaces mix (William Brack)</li> <li>Error handler could crash in DTD validation in 2.6.0</li> <li>xmlReader: do not use the document or element _private field</li> <li>testSAX.c: avoid a problem with some PIs (Massimo Morara)</li> - <li>general bug fixes: mandatory encoding in text decl, serializing - Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik), - XPath errors not reported, slow HTML parsing of large documents.</li> -</ul><h3>2.6.0: Oct 20 2003</h3><ul><li>Major revision release: should be API and ABI compatible but got a lot - of change</li> - <li>Increased the library modularity, far more options can be stripped out, - a --with-minimum configuration will weight around 160KBytes</li> - <li>Use per parser and per document dictionnary, allocate names and small - text nodes from the dictionnary</li> - <li>Switch to a SAX2 like parser rewrote most of the XML parser core, - provides namespace resolution and defaulted attributes, minimize memory - allocations and copies, namespace checking and specific error handling, - immutable buffers, make predefined entities static structures, etc...</li> - <li>rewrote all the error handling in the library, all errors can be - intercepted at a structured level, with precise information - available.</li> - <li>New simpler and more generic XML and HTML parser APIs, allowing to - easilly modify the parsing options and reuse parser context for multiple - consecutive documents.</li> - <li>Similar new APIs for the xmlReader, for options and reuse, provided new - functions to access content as const strings, use them for Python - bindings</li> - <li>a lot of other smaller API improvements: xmlStrPrintf (Aleksey Sanin), - Walker i.e. reader on a document tree based on Alfred Mickautsch code, - make room in nodes for line numbers, reference counting and future PSVI - extensions, generation of character ranges to be checked with faster - algorithm (William), xmlParserMaxDepth (Crutcher Dunnavant), buffer - access</li> + <li>general bug fixes: mandatory encoding in text decl, + serializingDocumentFragment nodes, xmlSearchNs 2.6.0 problem (Kasimier + Buchcik),XPath errorsnot reported, slow HTML parsing of large + documents.</li> +</ul><h3>2.6.0: Oct 20 2003</h3><ul><li>Major revision release: should be API and ABI compatible but got alotof + change</li> + <li>Increased the library modularity, far more options can be strippedout,a + --with-minimum configuration will weight around 160KBytes</li> + <li>Use per parser and per document dictionnary, allocate names + andsmalltext nodes from the dictionnary</li> + <li>Switch to a SAX2 like parser rewrote most of the XML + parsercore,provides namespace resolution and defaulted attributes, + minimizememoryallocations and copies, namespace checking and specific + errorhandling,immutable buffers, make predefined entities static + structures,etc...</li> + <li>rewrote all the error handling in the library, all errors + canbeintercepted at a structured level, with + preciseinformationavailable.</li> + <li>New simpler and more generic XML and HTML parser APIs, + allowingtoeasilly modify the parsing options and reuse parser context + formultipleconsecutive documents.</li> + <li>Similar new APIs for the xmlReader, for options and reuse, + providednewfunctions to access content as const strings, use them + forPythonbindings</li> + <li>a lot of other smaller API improvements: xmlStrPrintf + (AlekseySanin),Walker i.e. reader on a document tree based on Alfred + Mickautschcode,make room in nodes for line numbers, reference counting + and futurePSVIextensions, generation of character ranges to be checked + withfasteralgorithm (William), xmlParserMaxDepth (Crutcher + Dunnavant),bufferaccess</li> <li>New xmlWriter API provided by Alfred Mickautsch</li> <li>Schemas: base64 support by Anthony Carrico</li> - <li>Parser<->HTTP integration fix, proper processing of the Mime-Type - and charset informations if available.</li> - <li>Relax-NG: bug fixes including the one reported by Martijn Faassen and - zeroOrMore, better error reporting.</li> - <li>Python bindings (Stéphane Bidoul), never use stdout for errors - output</li> - <li>Portability: all the headers have macros for export and calling - convention definitions (Igor Zlatkovic), VMS update (Craig A. Berry), - Windows: threads (Jesse Pelton), Borland compiler (Eric Zurcher, Igor), - Mingw (Igor), typos (Mark Vakoc), beta version (Stephane Bidoul), - warning cleanups on AIX and MIPS compilers (William Brack), BeOS (Marcin - 'Shard' Konicki)</li> - <li>Documentation fixes and README (William Brack), search fix (William), - tutorial updates (John Fleck), namespace docs (Stefan Kost)</li> - <li>Bug fixes: xmlCleanupParser (Dave Beckett), threading uninitialized - mutexes, HTML doctype lowercase, SAX/IO (William), compression detection - and restore (William), attribute declaration in DTDs (William), namespace - on attribute in HTML output (William), input filename (Rob Richards), - namespace DTD validation, xmlReplaceNode (Chris Ryland), I/O callbacks - (Markus Keim), CDATA serialization (Shaun McCance), xmlReader (Peter - Derr), high codepoint charref like &#x10FFFF;, buffer access in push - mode (Justin Fletcher), TLS threads on Windows (Jesse Pelton), XPath bug - (William), xmlCleanupParser (Marc Liyanage), CDATA output (William), HTTP - error handling.</li> - <li>xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 for compat - testing, --nodict for building without tree dictionnary, --nocdata to - replace CDATA by text, --nsclean to remove surperfluous namespace - declarations</li> + <li>Parser<->HTTP integration fix, proper processing of + theMime-Typeand charset informations if available.</li> + <li>Relax-NG: bug fixes including the one reported by Martijn + FaassenandzeroOrMore, better error reporting.</li> + <li>Python bindings (Stéphane Bidoul), never use stdout forerrorsoutput</li> + <li>Portability: all the headers have macros for export + andcallingconvention definitions (Igor Zlatkovic), VMS update (Craig + A.Berry),Windows: threads (Jesse Pelton), Borland compiler (Eric + Zurcher,Igor),Mingw (Igor), typos (Mark Vakoc), beta version + (StephaneBidoul),warning cleanups on AIX and MIPS compilers (William + Brack), BeOS(Marcin'Shard' Konicki)</li> + <li>Documentation fixes and README (William Brack), search + fix(William),tutorial updates (John Fleck), namespace docs (Stefan + Kost)</li> + <li>Bug fixes: xmlCleanupParser (Dave Beckett), + threadinguninitializedmutexes, HTML doctype lowercase, SAX/IO + (William),compression detectionand restore (William), attribute + declaration in DTDs(William), namespaceon attribute in HTML output + (William), input filename(Rob Richards),namespace DTD validation, + xmlReplaceNode (Chris Ryland),I/O callbacks(Markus Keim), CDATA + serialization (Shaun McCance),xmlReader (PeterDerr), high codepoint + charref like &#x10FFFF;, bufferaccess in pushmode (Justin Fletcher), + TLS threads on Windows (JessePelton), XPath bug(William), + xmlCleanupParser (Marc Liyanage), CDATAoutput (William), HTTPerror + handling.</li> + <li>xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 + forcompattesting, --nodict for building without tree dictionnary, + --nocdatatoreplace CDATA by text, --nsclean to remove + surperfluousnamespacedeclarations</li> <li>added xml2-config --libtool-libs option from Kevin P. Fleming</li> - <li>a lot of profiling and tuning of the code, speedup patch for - xmlSearchNs() by Luca Padovani. The xmlReader should do far less - allocation and it speed should get closer to SAX. Chris Anderson worked - on speeding and cleaning up repetitive checking code.</li> + <li>a lot of profiling and tuning of the code, speedup + patchforxmlSearchNs() by Luca Padovani. The xmlReader should do + farlessallocation and it speed should get closer to SAX. Chris + Andersonworkedon speeding and cleaning up repetitive checking code.</li> <li>cleanup of "make tests"</li> <li>libxml-2.0-uninstalled.pc from Malcolm Tredinnick</li> - <li>deactivated the broken docBook SGML parser code and plugged the XML - parser instead.</li> + <li>deactivated the broken docBook SGML parser code and plugged + theXMLparser instead.</li> </ul><h3>2.5.11: Sep 9 2003</h3><p>A bugfix only release:</p><ul><li>risk of crash in Relax-NG</li> <li>risk of crash when using multithreaded programs</li> </ul><h3>2.5.10: Aug 15 2003</h3><p>A bugfixes only release</p><ul><li>Windows Makefiles (William Brack)</li> <li>UTF-16 support fixes (Mark Itzcovitz)</li> - <li>Makefile and portability (William Brack) automake, Linux alpha, Mingw - on Windows (Mikhail Grushinskiy)</li> + <li>Makefile and portability (William Brack) automake, Linux alpha, + MingwonWindows (Mikhail Grushinskiy)</li> <li>HTML parser (Oliver Stoeneberg)</li> <li>XInclude performance problem reported by Kevin Ruscoe</li> <li>XML parser performance problem reported by Grant Goodale</li> <li>xmlSAXParseDTD() bug fix from Malcolm Tredinnick</li> <li>and a couple other cleanup</li> -</ul><h3>2.5.9: Aug 9 2003</h3><ul><li>bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build - (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading - (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli), - xmlReader, Relax-NG schemas compilation, namespace handling, EXSLT (Sean - Griffin), HTML parsing problem (William Brack), DTD validation for mixed - content + namespaces, HTML serialization, library initialization, - progressive HTML parser</li> +</ul><h3>2.5.9: Aug 9 2003</h3><ul><li>bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), + Windowsbuild(Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter + Sobisch),threading(Rob Richards), hexBinary type (), UTF-16 BOM + (DodjiSeketeli),xmlReader, Relax-NG schemas compilation, namespace + handling,EXSLT (SeanGriffin), HTML parsing problem (William Brack), DTD + validationfor mixedcontent + namespaces, HTML serialization, + libraryinitialization,progressive HTML parser</li> <li>better interfaces for Relax-NG error handling (Joachim Bauch, )</li> <li>adding xmlXIncludeProcessTree() for XInclud'ing in a subtree</li> <li>doc fixes and improvements (John Fleck)</li> @@ -600,122 +620,121 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p><p> <li>couple of new UTF-8 helper functions (William Brack)</li> <li>general encoding cleanup + ISO-8859-x without iconv (Peter Jacobi)</li> <li>xmlTextReader cleanup + enum for node types (Bjorn Reese)</li> - <li>general compilation/warning cleanup Solaris/HP-UX/... (William - Brack)</li> -</ul><h3>2.5.8: Jul 6 2003</h3><ul><li>bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark - Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack), - PI related memleak, compilation without schemas or without xpath (Joerg - Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs, - rpm problem on , i86_64, removed a few compilation problems from 2.5.7, - xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)</li> + <li>general compilation/warning cleanup Solaris/HP-UX/...(WilliamBrack)</li> +</ul><h3>2.5.8: Jul 6 2003</h3><ul><li>bugfixes: XPath, XInclude, file/URI mapping, UTF-16 + save(MarkItzcovitz), UTF-8 checking, URI saving, error printing + (WilliamBrack),PI related memleak, compilation without schemas or without + xpath(JoergSchmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem + withDTDs,rpm problem on , i86_64, removed a few compilation problems + from2.5.7,xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)</li> <li>portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)</li> <li>William Brack fixed multithreading lock problems</li> <li>IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)</li> - <li>Windows fixes (Igor Zlatkovic, Eric Zurcher), threading (Stéphane - Bidoul)</li> + <li>Windows fixes (Igor Zlatkovic, Eric Zurcher), + threading(StéphaneBidoul)</li> <li>A few W3C Schemas Structure improvements</li> <li>W3C Schemas Datatype improvements (Charlie Bozeman)</li> - <li>Python bindings for thread globals (Stéphane Bidoul), and method/class - generator</li> + <li>Python bindings for thread globals (Stéphane Bidoul), + andmethod/classgenerator</li> <li>added --nonet option to xmllint</li> <li>documentation improvements (John Fleck)</li> -</ul><h3>2.5.7: Apr 25 2003</h3><ul><li>Relax-NG: Compiling to regexp and streaming validation on top of the - xmlReader interface, added to xmllint --stream</li> +</ul><h3>2.5.7: Apr 25 2003</h3><ul><li>Relax-NG: Compiling to regexp and streaming validation on top + ofthexmlReader interface, added to xmllint --stream</li> <li>xmlReader: Expand(), Next() and DOM access glue, bug fixes</li> <li>Support for large files: RGN validated a 4.5GB instance</li> <li>Thread support is now configured in by default</li> - <li>Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes - (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser - and zero bytes handling, some missing Windows file path conversions, - behaviour of the parser and validator in the presence of "out of memory" - error conditions</li> - <li>extended the API to be able to plug a garbage collecting memory - allocator, added xmlMallocAtomic() and modified the allocations - accordingly.</li> - <li>Performances: removed excessive malloc() calls, speedup of the push and - xmlReader interfaces, removed excessive thread locking</li> + <li>Fixes: update of the Trio code (Bjorn), WXS Date and + Durationfixes(Charles Bozeman), DTD and namespaces (Brent Hendricks), + HTML pushparserand zero bytes handling, some missing Windows file + pathconversions,behaviour of the parser and validator in the presence of + "outof memory"error conditions</li> + <li>extended the API to be able to plug a garbage + collectingmemoryallocator, added xmlMallocAtomic() and modified + theallocationsaccordingly.</li> + <li>Performances: removed excessive malloc() calls, speedup of the + pushandxmlReader interfaces, removed excessive thread locking</li> <li>Documentation: man page (John Fleck), xmlReader documentation</li> <li>Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)</li> -</ul><h3>2.5.6: Apr 1 2003</h3><ul><li>Fixed W3C XML Schemas datatype, should be compliant now except for - binHex and base64 which are not supported yet.</li> - <li>bug fixes: non-ASCII IDs, HTML output, XInclude on large docs and - XInclude entities handling, encoding detection on external subsets, XML - Schemas bugs and memory leaks, HTML parser (James Bursa)</li> +</ul><h3>2.5.6: Apr 1 2003</h3><ul><li>Fixed W3C XML Schemas datatype, should be compliant now exceptforbinHex + and base64 which are not supported yet.</li> + <li>bug fixes: non-ASCII IDs, HTML output, XInclude on large + docsandXInclude entities handling, encoding detection on external + subsets,XMLSchemas bugs and memory leaks, HTML parser (James Bursa)</li> <li>portability: python/trio (Albert Chin), Sun compiler warnings</li> <li>documentation: added --relaxng option to xmllint man page (John)</li> - <li>improved error reporting: xml:space, start/end tag mismatches, Relax NG - errors</li> -</ul><h3>2.5.5: Mar 24 2003</h3><ul><li>Lot of fixes on the Relax NG implementation. More testing including - DocBook and TEI examples.</li> + <li>improved error reporting: xml:space, start/end tag mismatches, + RelaxNGerrors</li> +</ul><h3>2.5.5: Mar 24 2003</h3><ul><li>Lot of fixes on the Relax NG implementation. More + testingincludingDocBook and TEI examples.</li> <li>Increased the support for W3C XML Schemas datatype</li> <li>Several bug fixes in the URI handling layer</li> - <li>Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding - conversion, line counting in the parser.</li> + <li>Bug fixes: HTML parser, xmlReader, DTD validation, + XPath,encodingconversion, line counting in the parser.</li> <li>Added support for $XMLLINT_INDENT environment variable, FTP delete</li> <li>Fixed the RPM spec file name</li> -</ul><h3>2.5.4: Feb 20 2003</h3><ul><li>Conformance testing and lot of fixes on Relax NG and XInclude - implementation</li> +</ul><h3>2.5.4: Feb 20 2003</h3><ul><li>Conformance testing and lot of fixes on Relax NG + andXIncludeimplementation</li> <li>Implementation of XPointer element() scheme</li> - <li>Bug fixes: XML parser, XInclude entities merge, validity checking on - namespaces, - <p>2 serialization bugs, node info generation problems, a DTD regexp - generation problem.</p> + <li>Bug fixes: XML parser, XInclude entities merge, validity + checkingonnamespaces, + <p>2 serialization bugs, node info generation problems, a + DTDregexpgeneration problem.</p> </li> <li>Portability: windows updates and path canonicalization (Igor)</li> <li>A few typo fixes (Kjartan Maraas)</li> <li>Python bindings generator fixes (Stephane Bidoul)</li> -</ul><h3>2.5.3: Feb 10 2003</h3><ul><li>RelaxNG and XML Schemas datatypes improvements, and added a first - version of RelaxNG Python bindings</li> - <li>Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API fix for - serializing namespace nodes, encoding conversion bug, XHTML1 - serialization</li> +</ul><h3>2.5.3: Feb 10 2003</h3><ul><li>RelaxNG and XML Schemas datatypes improvements, and added afirstversion + of RelaxNG Python bindings</li> + <li>Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API + fixforserializing namespace nodes, encoding conversion + bug,XHTML1serialization</li> <li>Portability fixes: Windows (Igor), AMD 64bits RPM spec file</li> </ul><h3>2.5.2: Feb 5 2003</h3><ul><li>First implementation of RelaxNG, added --relaxng flag to xmllint</li> <li>Schemas support now compiled in by default.</li> - <li>Bug fixes: DTD validation, namespace checking, XInclude and entities, - delegateURI in XML Catalogs, HTML parser, XML reader (Stéphane Bidoul), - XPath parser and evaluation, UTF8ToUTF8 serialization, XML reader memory - consumption, HTML parser, HTML serialization in the presence of - namespaces</li> + <li>Bug fixes: DTD validation, namespace checking, XInclude + andentities,delegateURI in XML Catalogs, HTML parser, XML reader + (StéphaneBidoul),XPath parser and evaluation, UTF8ToUTF8 serialization, + XMLreader memoryconsumption, HTML parser, HTML serialization in the + presenceofnamespaces</li> <li>added an HTML API to check elements and attributes.</li> - <li>Documentation improvement, PDF for the tutorial (John Fleck), doc - patches (Stefan Kost)</li> + <li>Documentation improvement, PDF for the tutorial (John Fleck),docpatches + (Stefan Kost)</li> <li>Portability fixes: NetBSD (Julio Merino), Windows (Igor Zlatkovic)</li> - <li>Added python bindings for XPointer, contextual error reporting - (Stéphane Bidoul)</li> + <li>Added python bindings for XPointer, contextual error + reporting(StéphaneBidoul)</li> <li>URI/file escaping problems (Stefano Zacchiroli)</li> </ul><h3>2.5.1: Jan 8 2003</h3><ul><li>Fixes a memory leak and configuration/compilation problems in 2.5.0</li> <li>documentation updates (John)</li> <li>a couple of XmlTextReader fixes</li> -</ul><h3>2.5.0: Jan 6 2003</h3><ul><li>New <a href="xmlreader.html">XmltextReader interface</a> based on C# - API (with help of Stéphane Bidoul)</li> +</ul><h3>2.5.0: Jan 6 2003</h3><ul><li>New <a href="xmlreader.html">XmltextReader interface</a>based on + C#API(with help of Stéphane Bidoul)</li> <li>Windows: more exports, including the new API (Igor)</li> <li>XInclude fallback fix</li> - <li>Python: bindings for the new API, packaging (Stéphane Bidoul), - drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), fixes, speedup - and iterators for Python-2.2 (Hannu Krosing)</li> - <li>Tutorial fixes (john Fleck and Niraj Tolia) xmllint man update - (John)</li> + <li>Python: bindings for the new API, packaging + (StéphaneBidoul),drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), + fixes,speedupand iterators for Python-2.2 (Hannu Krosing)</li> + <li>Tutorial fixes (john Fleck and Niraj Tolia) xmllint manupdate(John)</li> <li>Fix an XML parser bug raised by Vyacheslav Pindyura</li> <li>Fix for VMS serialization (Nigel Hall) and config (Craig A. Berry)</li> <li>Entities handling fixes</li> - <li>new API to optionally track node creation and deletion (Lukas - Schroeder)</li> + <li>new API to optionally track node creation and + deletion(LukasSchroeder)</li> <li>Added documentation for the XmltextReader interface and some <a href="guidelines.html">XML guidelines</a></li> </ul><h3>2.4.30: Dec 12 2002</h3><ul><li>2.4.29 broke the python bindings, rereleasing</li> - <li>Improvement/fixes of the XML API generator, and couple of minor code - fixes.</li> -</ul><h3>2.4.29: Dec 11 2002</h3><ul><li>Windows fixes (Igor): Windows CE port, pthread linking, python bindings - (Stéphane Bidoul), Mingw (Magnus Henoch), and export list updates</li> + <li>Improvement/fixes of the XML API generator, and couple of + minorcodefixes.</li> +</ul><h3>2.4.29: Dec 11 2002</h3><ul><li>Windows fixes (Igor): Windows CE port, pthread linking, + pythonbindings(Stéphane Bidoul), Mingw (Magnus Henoch), and export + listupdates</li> <li>Fix for prev in python bindings (ERDI Gergo)</li> <li>Fix for entities handling (Marcus Clarke)</li> - <li>Refactored the XML and HTML dumps to a single code path, fixed XHTML1 - dump</li> + <li>Refactored the XML and HTML dumps to a single code path, + fixedXHTML1dump</li> <li>Fix for URI parsing when handling URNs with fragment identifiers</li> <li>Fix for HTTP URL escaping problem</li> <li>added an TextXmlReader (C#) like API (work in progress)</li> - <li>Rewrote the API in XML generation script, includes a C parser and saves - more informations needed for C# bindings</li> + <li>Rewrote the API in XML generation script, includes a C parser + andsavesmore informations needed for C# bindings</li> </ul><h3>2.4.28: Nov 22 2002</h3><ul><li>a couple of python binding fixes</li> <li>2 bug fixes in the XML push parser</li> <li>potential memory leak removed (Martin Stoilov)</li> @@ -724,41 +743,41 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p><p> <li>autodetection of XHTML1 and specific serialization rules added</li> <li>nasty threading bug fixed (William Brack)</li> </ul><h3>2.4.27: Nov 17 2002</h3><ul><li>fixes for the Python bindings</li> - <li>a number of bug fixes: SGML catalogs, xmlParseBalancedChunkMemory(), - HTML parser, Schemas (Charles Bozeman), document fragment support - (Christian Glahn), xmlReconciliateNs (Brian Stafford), XPointer, - xmlFreeNode(), xmlSAXParseMemory (Peter Jones), xmlGetNodePath (Petr - Pajas), entities processing</li> + <li>a number of bug fixes: SGML catalogs,xmlParseBalancedChunkMemory(),HTML + parser, Schemas (Charles Bozeman),document fragment support(Christian + Glahn), xmlReconciliateNs (BrianStafford), XPointer,xmlFreeNode(), + xmlSAXParseMemory (Peter Jones),xmlGetNodePath (PetrPajas), entities + processing</li> <li>added grep to xmllint --shell</li> <li>VMS update patch from Craig A. Berry</li> - <li>cleanup of the Windows build with support for more compilers (Igor), - better thread support on Windows</li> + <li>cleanup of the Windows build with support for more + compilers(Igor),better thread support on Windows</li> <li>cleanup of Unix Makefiles and spec file</li> <li>Improvements to the documentation (John Fleck)</li> </ul><h3>2.4.26: Oct 18 2002</h3><ul><li>Patches for Windows CE port, improvements on Windows paths handling</li> - <li>Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() , - HTML serialization, Namespace compliance, and a number of small - problems</li> -</ul><h3>2.4.25: Sep 26 2002</h3><ul><li>A number of bug fixes: XPath, validation, Python bindings, DOM and - tree, xmlI/O, Html</li> + <li>Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() + ,HTMLserialization, Namespace compliance, and a number of + smallproblems</li> +</ul><h3>2.4.25: Sep 26 2002</h3><ul><li>A number of bug fixes: XPath, validation, Python bindings, DOM + andtree,xmlI/O, Html</li> <li>Serious rewrite of XInclude</li> - <li>Made XML Schemas regexp part of the default build and APIs, small fix - and improvement of the regexp core</li> + <li>Made XML Schemas regexp part of the default build and APIs, smallfixand + improvement of the regexp core</li> <li>Changed the validation code to reuse XML Schemas regexp APIs</li> - <li>Better handling of Windows file paths, improvement of Makefiles (Igor, - Daniel Gehriger, Mark Vakoc)</li> - <li>Improved the python I/O bindings, the tests, added resolver and regexp - APIs</li> + <li>Better handling of Windows file paths, improvement of + Makefiles(Igor,Daniel Gehriger, Mark Vakoc)</li> + <li>Improved the python I/O bindings, the tests, added resolver + andregexpAPIs</li> <li>New logos from Marc Liyanage</li> <li>Tutorial improvements: John Fleck, Christopher Harris</li> - <li>Makefile: Fixes for AMD x86_64 (Mandrake), DESTDIR (Christophe - Merlet)</li> + <li>Makefile: Fixes for AMD x86_64 (Mandrake), + DESTDIR(ChristopheMerlet)</li> <li>removal of all stderr/perror use for error reporting</li> <li>Better error reporting: XPath and DTD validation</li> <li>update of the trio portability layer (Bjorn Reese)</li> </ul><p><strong>2.4.24: Aug 22 2002</strong></p><ul><li>XPath fixes (William), xf:escape-uri() (Wesley Terpstra)</li> - <li>Python binding fixes: makefiles (William), generator, rpm build, x86-64 - (fcrozat)</li> + <li>Python binding fixes: makefiles (William), generator, rpm + build,x86-64(fcrozat)</li> <li>HTML <style> and boolean attributes serializer fixes</li> <li>C14N improvements by Aleksey</li> <li>doc cleanups: Rick Jones</li> @@ -768,96 +787,98 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p><p> <li>c14n fixes, testsuite and performances: Aleksey Sanin</li> <li>added xmlDocFormatDump: Chema Celorio</li> <li>new tutorial: John Fleck</li> - <li>new hash functions and performances: Sander Vesik, portability fix from - Peter Jacobi</li> - <li>a number of bug fixes: XPath (William Brack, Richard Jinks), XML and - HTML parsers, ID lookup function</li> + <li>new hash functions and performances: Sander Vesik, portability + fixfromPeter Jacobi</li> + <li>a number of bug fixes: XPath (William Brack, Richard Jinks), XMLandHTML + parsers, ID lookup function</li> <li>removal of all remaining sprintf: Aleksey Sanin</li> -</ul><h3>2.4.22: May 27 2002</h3><ul><li>a number of bug fixes: configure scripts, base handling, parser, memory - usage, HTML parser, XPath, documentation (Christian Cornelssen), - indentation, URI parsing</li> - <li>Optimizations for XMLSec, fixing and making public some of the network - protocol handlers (Aleksey)</li> +</ul><h3>2.4.22: May 27 2002</h3><ul><li>a number of bug fixes: configure scripts, base handling, + parser,memoryusage, HTML parser, XPath, documentation + (ChristianCornelssen),indentation, URI parsing</li> + <li>Optimizations for XMLSec, fixing and making public some of + thenetworkprotocol handlers (Aleksey)</li> <li>performance patch from Gary Pennington</li> - <li>Charles Bozeman provided date and time support for XML Schemas - datatypes</li> -</ul><h3>2.4.21: Apr 29 2002</h3><p>This release is both a bug fix release and also contains the early XML -Schemas <a href="http://www.w3.org/TR/xmlschema-1/">structures</a> and <a href="http://www.w3.org/TR/xmlschema-2/">datatypes</a> code, beware, all -interfaces are likely to change, there is huge holes, it is clearly a work in -progress and don't even think of putting this code in a production system, -it's actually not compiled in by default. The real fixes are:</p><ul><li>a couple of bugs or limitations introduced in 2.4.20</li> + <li>Charles Bozeman provided date and time support for + XMLSchemasdatatypes</li> +</ul><h3>2.4.21: Apr 29 2002</h3><p>This release is both a bug fix release and also contains the +earlyXMLSchemas <a href="http://www.w3.org/TR/xmlschema-1/">structures</a>and +<a href="http://www.w3.org/TR/xmlschema-2/">datatypes</a>code, +beware,allinterfaces are likely to change, there is huge holes, it is clearly +a workinprogress and don't even think of putting this code in a +productionsystem,it's actually not compiled in by default. The real fixes +are:</p><ul><li>a couple of bugs or limitations introduced in 2.4.20</li> <li>patches for Borland C++ and MSC by Igor</li> - <li>some fixes on XPath strings and conformance patches by Richard - Jinks</li> + <li>some fixes on XPath strings and conformance patches by RichardJinks</li> <li>patch from Aleksey for the ExcC14N specification</li> <li>OSF/1 bug fix by Bjorn</li> </ul><h3>2.4.20: Apr 15 2002</h3><ul><li>bug fixes: file descriptor leak, XPath, HTML output, DTD validation</li> <li>XPath conformance testing by Richard Jinks</li> - <li>Portability fixes: Solaris, MPE/iX, Windows, OSF/1, python bindings, - libxml.m4</li> -</ul><h3>2.4.19: Mar 25 2002</h3><ul><li>bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8 - encoder</li> + <li>Portability fixes: Solaris, MPE/iX, Windows, OSF/1, + pythonbindings,libxml.m4</li> +</ul><h3>2.4.19: Mar 25 2002</h3><ul><li>bug fixes: half a dozen XPath bugs, Validation, ISO-Latin + toUTF8encoder</li> <li>portability fixes in the HTTP code</li> <li>memory allocation checks using valgrind, and profiling tests</li> <li>revamp of the Windows build and Makefiles</li> -</ul><h3>2.4.18: Mar 18 2002</h3><ul><li>bug fixes: tree, SAX, canonicalization, validation, portability, - XPath</li> +</ul><h3>2.4.18: Mar 18 2002</h3><ul><li>bug fixes: tree, SAX, canonicalization, + validation,portability,XPath</li> <li>removed the --with-buffer option it was becoming unmaintainable</li> <li>serious cleanup of the Python makefiles</li> <li>speedup patch to XPath very effective for DocBook stylesheets</li> <li>Fixes for Windows build, cleanup of the documentation</li> -</ul><h3>2.4.17: Mar 8 2002</h3><ul><li>a lot of bug fixes, including "namespace nodes have no parents in - XPath"</li> - <li>fixed/improved the Python wrappers, added more examples and more - regression tests, XPath extension functions can now return node-sets</li> +</ul><h3>2.4.17: Mar 8 2002</h3><ul><li>a lot of bug fixes, including "namespace nodes have no + parentsinXPath"</li> + <li>fixed/improved the Python wrappers, added more examples + andmoreregression tests, XPath extension functions can now + returnnode-sets</li> <li>added the XML Canonicalization support from Aleksey Sanin</li> -</ul><h3>2.4.16: Feb 20 2002</h3><ul><li>a lot of bug fixes, most of them were triggered by the XML Testsuite - from OASIS and W3C. Compliance has been significantly improved.</li> +</ul><h3>2.4.16: Feb 20 2002</h3><ul><li>a lot of bug fixes, most of them were triggered by the XMLTestsuitefrom + OASIS and W3C. Compliance has been significantlyimproved.</li> <li>a couple of portability fixes too.</li> </ul><h3>2.4.15: Feb 11 2002</h3><ul><li>Fixed the Makefiles, especially the python module ones</li> <li>A few bug fixes and cleanup</li> <li>Includes cleanup</li> -</ul><h3>2.4.14: Feb 8 2002</h3><ul><li>Change of License to the <a href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a> basically for integration in XFree86 codebase, and removing - confusion around the previous dual-licensing</li> - <li>added Python bindings, beta software but should already be quite - complete</li> - <li>a large number of fixes and cleanups, especially for all tree - manipulations</li> - <li>cleanup of the headers, generation of a reference API definition in - XML</li> +</ul><h3>2.4.14: Feb 8 2002</h3><ul><li>Change of License to the <a href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>basicallyfor + integration in XFree86 codebase, and removingconfusion around theprevious + dual-licensing</li> + <li>added Python bindings, beta software but should already + bequitecomplete</li> + <li>a large number of fixes and cleanups, especially for + alltreemanipulations</li> + <li>cleanup of the headers, generation of a reference API + definitioninXML</li> </ul><h3>2.4.13: Jan 14 2002</h3><ul><li>update of the documentation: John Fleck and Charlie Bozeman</li> <li>cleanup of timing code from Justin Fletcher</li> - <li>fixes for Windows and initial thread support on Win32: Igor and Serguei - Narojnyi</li> + <li>fixes for Windows and initial thread support on Win32: Igor + andSergueiNarojnyi</li> <li>Cygwin patch from Robert Collins</li> <li>added xmlSetEntityReferenceFunc() for Keith Isdale work on xsldbg</li> -</ul><h3>2.4.12: Dec 7 2001</h3><ul><li>a few bug fixes: thread (Gary Pennington), xmllint (Geert Kloosterman), - XML parser (Robin Berjon), XPointer (Danny Jamshy), I/O cleanups - (robert)</li> +</ul><h3>2.4.12: Dec 7 2001</h3><ul><li>a few bug fixes: thread (Gary Pennington), xmllint + (GeertKloosterman),XML parser (Robin Berjon), XPointer (Danny Jamshy), + I/Ocleanups(robert)</li> <li>Eric Lavigne contributed project files for MacOS</li> <li>some makefiles cleanups</li> -</ul><h3>2.4.11: Nov 26 2001</h3><ul><li>fixed a couple of errors in the includes, fixed a few bugs, some code - cleanups</li> +</ul><h3>2.4.11: Nov 26 2001</h3><ul><li>fixed a couple of errors in the includes, fixed a few bugs, + somecodecleanups</li> <li>xmllint man pages improvement by Heiko Rupp</li> <li>updated VMS build instructions from John A Fotheringham</li> <li>Windows Makefiles updates from Igor</li> </ul><h3>2.4.10: Nov 10 2001</h3><ul><li>URI escaping fix (Joel Young)</li> <li>added xmlGetNodePath() (for paths or XPointers generation)</li> <li>Fixes namespace handling problems when using DTD and validation</li> - <li>improvements on xmllint: Morus Walter patches for --format and - --encode, Stefan Kost and Heiko Rupp improvements on the --shell</li> + <li>improvements on xmllint: Morus Walter patches for --format + and--encode,Stefan Kost and Heiko Rupp improvements on the --shell</li> <li>fixes for xmlcatalog linking pointed by Weiqi Gao</li> <li>fixes to the HTML parser</li> </ul><h3>2.4.9: Nov 6 2001</h3><ul><li>fixes more catalog bugs</li> <li>avoid a compilation problem, improve xmlGetLineNo()</li> -</ul><h3>2.4.8: Nov 4 2001</h3><ul><li>fixed SGML catalogs broken in previous release, updated xmlcatalog - tool</li> +</ul><h3>2.4.8: Nov 4 2001</h3><ul><li>fixed SGML catalogs broken in previous release, + updatedxmlcatalogtool</li> <li>fixed a compile errors and some includes troubles.</li> </ul><h3>2.4.7: Oct 30 2001</h3><ul><li>exported some debugging interfaces</li> <li>serious rewrite of the catalog code</li> - <li>integrated Gary Pennington thread safety patch, added configure option - and regression tests</li> + <li>integrated Gary Pennington thread safety patch, added + configureoptionand regression tests</li> <li>removed an HTML parser bug</li> <li>fixed a couple of potentially serious validation bugs</li> <li>integrated the SGML DocBook support in xmllint</li> @@ -873,12 +894,11 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>fixed half a dozen bugs reported for libxml or libxslt</li> <li>updated xmlcatalog to be able to modify SGML super catalogs</li> </ul><h3>2.4.5: Sep 14 2001</h3><ul><li>Remove a few annoying bugs in 2.4.4</li> - <li>forces the HTML serializer to output decimal charrefs since some - version of Netscape can't handle hexadecimal ones</li> -</ul><h3>1.8.16: Sep 14 2001</h3><ul><li>maintenance release of the old libxml1 branch, couple of bug and - portability fixes</li> -</ul><h3>2.4.4: Sep 12 2001</h3><ul><li>added --convert to xmlcatalog, bug fixes and cleanups of XML - Catalog</li> + <li>forces the HTML serializer to output decimal charrefs since + someversionof Netscape can't handle hexadecimal ones</li> +</ul><h3>1.8.16: Sep 14 2001</h3><ul><li>maintenance release of the old libxml1 branch, couple of + bugandportability fixes</li> +</ul><h3>2.4.4: Sep 12 2001</h3><ul><li>added --convert to xmlcatalog, bug fixes and cleanups of XMLCatalog</li> <li>a few bug fixes and some portability changes</li> <li>some documentation cleanups</li> </ul><h3>2.4.3: Aug 23 2001</h3><ul><li>XML Catalog support see the doc</li> @@ -896,13 +916,13 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>cleanup for alpha and ia64 targets</li> <li>patch to allow saving through HTTP PUT or POST</li> </ul><h3>2.4.0: July 10 2001</h3><ul><li>Fixed a few bugs in XPath, validation, and tree handling.</li> - <li>Fixed XML Base implementation, added a couple of examples to the - regression tests</li> + <li>Fixed XML Base implementation, added a couple of examples + totheregression tests</li> <li>A bit of cleanup</li> -</ul><h3>2.3.14: July 5 2001</h3><ul><li>fixed some entities problems and reduce memory requirement when - substituting them</li> - <li>lots of improvements in the XPath queries interpreter can be - substantially faster</li> +</ul><h3>2.3.14: July 5 2001</h3><ul><li>fixed some entities problems and reduce memory + requirementwhensubstituting them</li> + <li>lots of improvements in the XPath queries interpreter + canbesubstantially faster</li> <li>Makefiles and configure cleanups</li> <li>Fixes to XPath variable eval, and compare on empty node set</li> <li>HTML tag closing bug fixed</li> @@ -916,37 +936,38 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>fixed line number counting</li> <li>fixed serious problems in the XInclude processing</li> <li>added support for UTF8 BOM at beginning of entities</li> - <li>fixed a strange gcc optimizer bugs in xpath handling of float, gcc-3.0 - miscompile uri.c (William), Thomas Leitner provided a fix for the - optimizer on Tru64</li> - <li>incorporated Yon Derek and Igor Zlatkovic fixes and improvements for - compilation on Windows MSC</li> + <li>fixed a strange gcc optimizer bugs in xpath handling of + float,gcc-3.0miscompile uri.c (William), Thomas Leitner provided a fix + fortheoptimizer on Tru64</li> + <li>incorporated Yon Derek and Igor Zlatkovic fixes and + improvementsforcompilation on Windows MSC</li> <li>update of libxml-doc.el (Felix Natter)</li> <li>fixed 2 bugs in URI normalization code</li> -</ul><h3>2.3.11: June 17 2001</h3><ul><li>updates to trio, Makefiles and configure should fix some portability - problems (alpha)</li> - <li>fixed some HTML serialization problems (pre, script, and block/inline - handling), added encoding aware APIs, cleanup of this code</li> +</ul><h3>2.3.11: June 17 2001</h3><ul><li>updates to trio, Makefiles and configure should fix + someportabilityproblems (alpha)</li> + <li>fixed some HTML serialization problems (pre, script, + andblock/inlinehandling), added encoding aware APIs, cleanup of + thiscode</li> <li>added xmlHasNsProp()</li> - <li>implemented a specific PI for encoding support in the DocBook SGML - parser</li> - <li>some XPath fixes (-Infinity, / as a function parameter and namespaces - node selection)</li> + <li>implemented a specific PI for encoding support in the + DocBookSGMLparser</li> + <li>some XPath fixes (-Infinity, / as a function parameter + andnamespacesnode selection)</li> <li>fixed a performance problem and an error in the validation code</li> <li>fixed XInclude routine to implement the recursive behaviour</li> <li>fixed xmlFreeNode problem when libxml is included statically twice</li> <li>added --version to xmllint for bug reports</li> </ul><h3>2.3.10: June 1 2001</h3><ul><li>fixed the SGML catalog support</li> - <li>a number of reported bugs got fixed, in XPath, iconv detection, - XInclude processing</li> + <li>a number of reported bugs got fixed, in XPath, iconv + detection,XIncludeprocessing</li> <li>XPath string function should now handle unicode correctly</li> </ul><h3>2.3.9: May 19 2001</h3><p>Lots of bugfixes, and added a basic SGML catalog support:</p><ul><li>HTML push bugfix #54891 and another patch from Jonas Borgström</li> <li>some serious speed optimization again</li> <li>some documentation cleanups</li> <li>trying to get better linking on Solaris (-R)</li> <li>XPath API cleanup from Thomas Broyer</li> - <li>Validation bug fixed #54631, added a patch from Gary Pennington, fixed - xmlValidGetValidElements()</li> + <li>Validation bug fixed #54631, added a patch from Gary + Pennington,fixedxmlValidGetValidElements()</li> <li>Added an INSTALL file</li> <li>Attribute removal added to API: #54433</li> <li>added a basic support for SGML catalogs</li> @@ -957,10 +978,10 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl </ul><h3>1.8.13: May 14 2001</h3><ul><li>bugfixes release of the old libxml1 branch used by Gnome</li> </ul><h3>2.3.8: May 3 2001</h3><ul><li>Integrated an SGML DocBook parser for the Gnome project</li> <li>Fixed a few things in the HTML parser</li> - <li>Fixed some XPath bugs raised by XSLT use, tried to fix the floating - point portability issue</li> - <li>Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s for - DOM+validation using the XML REC as input and a 700MHz celeron).</li> + <li>Fixed some XPath bugs raised by XSLT use, tried to fix thefloatingpoint + portability issue</li> + <li>Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s + forDOM+validationusing the XML REC as input and a 700MHz celeron).</li> <li>incorporated more Windows cleanup</li> <li>added xmlSaveFormatFile()</li> <li>fixed problems in copying nodes with entities references (gdome)</li> @@ -975,32 +996,33 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>Improved validation speed sensible for DocBook</li> <li>fixed a big bug with ID declared in external parsed entities</li> <li>portability fixes, update of Trio from Bjorn Reese</li> -</ul><h3>2.3.6: April 8 2001</h3><ul><li>Code cleanup using extreme gcc compiler warning options, found and - cleared half a dozen potential problem</li> +</ul><h3>2.3.6: April 8 2001</h3><ul><li>Code cleanup using extreme gcc compiler warning options, + foundandcleared half a dozen potential problem</li> <li>the Eazel team found an XML parser bug</li> - <li>cleaned up the user of some of the string formatting function. used the - trio library code to provide the one needed when the platform is missing - them</li> - <li>xpath: removed a memory leak and fixed the predicate evaluation - problem, extended the testsuite and cleaned up the result. XPointer seems - broken ...</li> -</ul><h3>2.3.5: Mar 23 2001</h3><ul><li>Biggest change is separate parsing and evaluation of XPath expressions, - there is some new APIs for this too</li> - <li>included a number of bug fixes(XML push parser, 51876, notations, - 52299)</li> + <li>cleaned up the user of some of the string formatting function. + usedthetrio library code to provide the one needed when the platform + ismissingthem</li> + <li>xpath: removed a memory leak and fixed the predicate + evaluationproblem,extended the testsuite and cleaned up the result. + XPointer seemsbroken...</li> +</ul><h3>2.3.5: Mar 23 2001</h3><ul><li>Biggest change is separate parsing and evaluation of + XPathexpressions,there is some new APIs for this too</li> + <li>included a number of bug fixes(XML push parser, + 51876,notations,52299)</li> <li>Fixed some portability issues</li> </ul><h3>2.3.4: Mar 10 2001</h3><ul><li>Fixed bugs #51860 and #51861</li> - <li>Added a global variable xmlDefaultBufferSize to allow default buffer - size to be application tunable.</li> - <li>Some cleanup in the validation code, still a bug left and this part - should probably be rewritten to support ambiguous content model :-\</li> - <li>Fix a couple of serious bugs introduced or raised by changes in 2.3.3 - parser</li> + <li>Added a global variable xmlDefaultBufferSize to allow defaultbuffersize + to be application tunable.</li> + <li>Some cleanup in the validation code, still a bug left and + thispartshould probably be rewritten to support ambiguous content + model:-\</li> + <li>Fix a couple of serious bugs introduced or raised by changes + in2.3.3parser</li> <li>Fixed another bug in xmlNodeGetContent()</li> <li>Bjorn fixed XPath node collection and Number formatting</li> <li>Fixed a loop reported in the HTML parsing</li> - <li>blank space are reported even if the Dtd content model proves that they - are formatting spaces, this is for XML conformance</li> + <li>blank space are reported even if the Dtd content model proves + thattheyare formatting spaces, this is for XML conformance</li> </ul><h3>2.3.3: Mar 1 2001</h3><ul><li>small change in XPath for XSLT</li> <li>documentation cleanups</li> <li>fix in validation by Gary Pennington</li> @@ -1010,18 +1032,17 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>fixed a bug in xmlNodeGetContent</li> <li>ID/IDREF support partly rewritten by Gary Pennington</li> </ul><h3>2.3.1: Feb 15 2001</h3><ul><li>some XPath and HTML bug fixes for XSLT</li> - <li>small extension of the hash table interfaces for DOM gdome2 - implementation</li> + <li>small extension of the hash table interfaces for + DOMgdome2implementation</li> <li>A few bug fixes</li> </ul><h3>2.3.0: Feb 8 2001 (2.2.12 was on 25 Jan but I didn't kept track)</h3><ul><li>Lots of XPath bug fixes</li> - <li>Add a mode with Dtd lookup but without validation error reporting for - XSLT</li> + <li>Add a mode with Dtd lookup but without validation error + reportingforXSLT</li> <li>Add support for text node without escaping (XSLT)</li> <li>bug fixes for xmlCheckFilename</li> <li>validation code bug fixes from Gary Pennington</li> <li>Patch from Paul D. Smith correcting URI path normalization</li> - <li>Patch to allow simultaneous install of libxml-devel and - libxml2-devel</li> + <li>Patch to allow simultaneous install of libxml-develandlibxml2-devel</li> <li>the example Makefile is now fixed</li> <li>added HTML to the RPM packages</li> <li>tree copying bugfixes</li> @@ -1038,8 +1059,7 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>Improved the XPointer implementation</li> <li>integrate a number of provided patches</li> </ul><h3>2.2.9: Nov 25 2000</h3><ul><li>erroneous release :-(</li> -</ul><h3>2.2.8: Nov 13 2000</h3><ul><li>First version of <a href="http://www.w3.org/TR/xinclude">XInclude</a> - support</li> +</ul><h3>2.2.8: Nov 13 2000</h3><ul><li>First version of <a href="http://www.w3.org/TR/xinclude">XInclude</a>support</li> <li>Patch in conditional section handling</li> <li>updated MS compiler project</li> <li>fixed some XPath problems</li> @@ -1050,19 +1070,19 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>xmlIOParseDTD() added</li> <li>various small fixes in the HTML, URI, HTTP and XPointer support</li> <li>some cleanup of the Makefile, autoconf and the distribution content</li> -</ul><h3>2.2.6: Oct 25 2000:</h3><ul><li>Added an hash table module, migrated a number of internal structure to - those</li> +</ul><h3>2.2.6: Oct 25 2000:</h3><ul><li>Added an hash table module, migrated a number of internal + structuretothose</li> <li>Fixed a posteriori validation problems</li> <li>HTTP module cleanups</li> - <li>HTML parser improvements (tag errors, script/style handling, attribute - normalization)</li> + <li>HTML parser improvements (tag errors, script/style + handling,attributenormalization)</li> <li>coalescing of adjacent text nodes</li> <li>couple of XPath bug fixes, exported the internal API</li> </ul><h3>2.2.5: Oct 15 2000:</h3><ul><li>XPointer implementation and testsuite</li> - <li>Lot of XPath fixes, added variable and functions registration, more - tests</li> - <li>Portability fixes, lots of enhancements toward an easy Windows build - and release</li> + <li>Lot of XPath fixes, added variable and functions + registration,moretests</li> + <li>Portability fixes, lots of enhancements toward an easy Windows + buildandrelease</li> <li>Late validation fixes</li> <li>Integrated a lot of contributed patches</li> <li>added memory management docs</li> @@ -1072,115 +1092,113 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>Serious bug fixes on the URI and HTML code</li> </ul><h3>2.2.3: Sep 17 2000</h3><ul><li>bug fixes</li> <li>cleanup of entity handling code</li> - <li>overall review of all loops in the parsers, all sprintf usage has been - checked too</li> - <li>Far better handling of larges Dtd. Validating against DocBook XML Dtd - works smoothly now.</li> + <li>overall review of all loops in the parsers, all sprintf usage + hasbeenchecked too</li> + <li>Far better handling of larges Dtd. Validating against DocBook + XMLDtdworks smoothly now.</li> </ul><h3>1.8.10: Sep 6 2000</h3><ul><li>bug fix release for some Gnome projects</li> </ul><h3>2.2.2: August 12 2000</h3><ul><li>mostly bug fixes</li> <li>started adding routines to access xml parser context options</li> </ul><h3>2.2.1: July 21 2000</h3><ul><li>a purely bug fixes release</li> <li>fixed an encoding support problem when parsing from a memory block</li> <li>fixed a DOCTYPE parsing problem</li> - <li>removed a bug in the function allowing to override the memory - allocation routines</li> + <li>removed a bug in the function allowing to override the + memoryallocationroutines</li> </ul><h3>2.2.0: July 14 2000</h3><ul><li>applied a lot of portability fixes</li> - <li>better encoding support/cleanup and saving (content is now always - encoded in UTF-8)</li> + <li>better encoding support/cleanup and saving (content is nowalwaysencoded + in UTF-8)</li> <li>the HTML parser now correctly handles encodings</li> <li>added xmlHasProp()</li> <li>fixed a serious problem with &#38;</li> <li>propagated the fix to FTP client</li> <li>cleanup, bugfixes, etc ...</li> - <li>Added a page about <a href="encoding.html">libxml Internationalization - support</a></li> + <li>Added a page about <a href="encoding.html">libxmlInternationalizationsupport</a></li> </ul><h3>1.8.9: July 9 2000</h3><ul><li>fixed the spec the RPMs should be better</li> - <li>fixed a serious bug in the FTP implementation, released 1.8.9 to solve - rpmfind users problem</li> + <li>fixed a serious bug in the FTP implementation, released 1.8.9 + tosolverpmfind users problem</li> </ul><h3>2.1.1: July 1 2000</h3><ul><li>fixes a couple of bugs in the 2.1.0 packaging</li> <li>improvements on the HTML parser</li> -</ul><h3>2.1.0 and 1.8.8: June 29 2000</h3><ul><li>1.8.8 is mostly a commodity package for upgrading to libxml2 according - to <a href="upgrade.html">new instructions</a>. It fixes a nasty problem - about &#38; charref parsing</li> - <li>2.1.0 also ease the upgrade from libxml v1 to the recent version. it - also contains numerous fixes and enhancements: +</ul><h3>2.1.0 and 1.8.8: June 29 2000</h3><ul><li>1.8.8 is mostly a commodity package for upgrading to libxml2accordingto + <a href="upgrade.html">new instructions</a>. It fixes a nastyproblemabout + &#38; charref parsing</li> + <li>2.1.0 also ease the upgrade from libxml v1 to the recent version.italso + contains numerous fixes and enhancements: <ul><li>added xmlStopParser() to stop parsing</li> <li>improved a lot parsing speed when there is large CDATA blocs</li> <li>includes XPath patches provided by Picdar Technology</li> - <li>tried to fix as much as possible DTD validation and namespace - related problems</li> + <li>tried to fix as much as possible DTD validation andnamespacerelated + problems</li> <li>output to a given encoding has been added/tested</li> <li>lot of various fixes</li> </ul></li> -</ul><h3>2.0.0: Apr 12 2000</h3><ul><li>First public release of libxml2. If you are using libxml, it's a good - idea to check the 1.x to 2.x upgrade instructions. NOTE: while initially - scheduled for Apr 3 the release occurred only on Apr 12 due to massive - workload.</li> - <li>The include are now located under $prefix/include/libxml (instead of - $prefix/include/gnome-xml), they also are referenced by +</ul><h3>2.0.0: Apr 12 2000</h3><ul><li>First public release of libxml2. If you are using libxml, it's + agoodidea to check the 1.x to 2.x upgrade instructions. NOTE: + whileinitiallyscheduled for Apr 3 the release occurred only on Apr 12 due + tomassiveworkload.</li> + <li>The include are now located under $prefix/include/libxml + (insteadof$prefix/include/gnome-xml), they also are referenced by <pre>#include <libxml/xxx.h></pre> <p>instead of</p> <pre>#include "xxx.h"</pre> </li> <li>a new URI module for parsing URIs and following strictly RFC 2396</li> - <li>the memory allocation routines used by libxml can now be overloaded - dynamically by using xmlMemSetup()</li> - <li>The previously CVS only tool tester has been renamed - <strong>xmllint</strong> and is now installed as part of the libxml2 - package</li> - <li>The I/O interface has been revamped. There is now ways to plug in - specific I/O modules, either at the URI scheme detection level using - xmlRegisterInputCallbacks() or by passing I/O functions when creating a - parser context using xmlCreateIOParserCtxt()</li> - <li>there is a C preprocessor macro LIBXML_VERSION providing the version - number of the libxml module in use</li> - <li>a number of optional features of libxml can now be excluded at - configure time (FTP/HTTP/HTML/XPath/Debug)</li> + <li>the memory allocation routines used by libxml can now + beoverloadeddynamically by using xmlMemSetup()</li> + <li>The previously CVS only tool tester has + beenrenamed<strong>xmllint</strong>and is now installed as part of + thelibxml2package</li> + <li>The I/O interface has been revamped. There is now ways to + pluginspecific I/O modules, either at the URI scheme detection + levelusingxmlRegisterInputCallbacks() or by passing I/O functions + whencreating aparser context using xmlCreateIOParserCtxt()</li> + <li>there is a C preprocessor macro LIBXML_VERSION providing + theversionnumber of the libxml module in use</li> + <li>a number of optional features of libxml can now be excluded + atconfiguretime (FTP/HTTP/HTML/XPath/Debug)</li> </ul><h3>2.0.0beta: Mar 14 2000</h3><ul><li>This is a first Beta release of libxml version 2</li> - <li>It's available only from<a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org - FTP</a>, it's packaged as libxml2-2.0.0beta and available as tar and - RPMs</li> - <li>This version is now the head in the Gnome CVS base, the old one is - available under the tag LIB_XML_1_X</li> - <li>This includes a very large set of changes. From a programmatic point - of view applications should not have to be modified too much, check the - <a href="upgrade.html">upgrade page</a></li> + <li>It's available only from<a href="ftp://xmlsoft.org/libxml2/">xmlsoft.orgFTP</a>, it's packaged + aslibxml2-2.0.0beta and available as tar andRPMs</li> + <li>This version is now the head in the Gnome CVS base, the old + oneisavailable under the tag LIB_XML_1_X</li> + <li>This includes a very large set of changes. From a programmatic + pointofview applications should not have to be modified too much, check + the<a href="upgrade.html">upgrade page</a></li> <li>Some interfaces may changes (especially a bit about encoding).</li> <li>the updates includes: - <ul><li>fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly) seems correctly - handled now</li> - <li>Better handling of entities, especially well-formedness checking - and proper PEref extensions in external subsets</li> + <ul><li>fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly) + seemscorrectlyhandled now</li> + <li>Better handling of entities, especially well-formedness + checkingandproper PEref extensions in external subsets</li> <li>DTD conditional sections</li> <li>Validation now correctly handle entities content</li> - <li><a href="http://rpmfind.net/tools/gdome/messages/0039.html">change - structures to accommodate DOM</a></li> + <li><a href="http://rpmfind.net/tools/gdome/messages/0039.html">changestructuresto + accommodate DOM</a></li> </ul></li> - <li>Serious progress were made toward compliance, <a href="conf/result.html">here are the result of the test</a> against the - OASIS testsuite (except the Japanese tests since I don't support that - encoding yet). This URL is rebuilt every couple of hours using the CVS - head version.</li> + <li>Serious progress were made toward compliance, <a href="conf/result.html">here are the result of the + test</a>againsttheOASIS testsuite (except the Japanese tests since I + don't supportthatencoding yet). This URL is rebuilt every couple of hours + using theCVShead version.</li> </ul><h3>1.8.7: Mar 6 2000</h3><ul><li>This is a bug fix release:</li> - <li>It is possible to disable the ignorable blanks heuristic used by - libxml-1.x, a new function xmlKeepBlanksDefault(0) will allow this. Note - that for adherence to XML spec, this behaviour will be disabled by - default in 2.x . The same function will allow to keep compatibility for - old code.</li> - <li>Blanks in <a> </a> constructs are not ignored anymore, - avoiding heuristic is really the Right Way :-\</li> - <li>The unchecked use of snprintf which was breaking libxml-1.8.6 - compilation on some platforms has been fixed</li> - <li>nanoftp.c nanohttp.c: Fixed '#' and '?' stripping when processing - URIs</li> -</ul><h3>1.8.6: Jan 31 2000</h3><ul><li>added a nanoFTP transport module, debugged until the new version of <a href="http://rpmfind.net/linux/rpm2html/rpmfind.html">rpmfind</a> can use - it without troubles</li> -</ul><h3>1.8.5: Jan 21 2000</h3><ul><li>adding APIs to parse a well balanced chunk of XML (production <a href="http://www.w3.org/TR/REC-xml#NT-content">[43] content</a> of the - XML spec)</li> + <li>It is possible to disable the ignorable blanks heuristic + usedbylibxml-1.x, a new function xmlKeepBlanksDefault(0) will allow + this.Notethat for adherence to XML spec, this behaviour will be + disabledbydefault in 2.x . The same function will allow to keep + compatibilityforold code.</li> + <li>Blanks in <a> </a> constructs are not + ignoredanymore,avoiding heuristic is really the Right Way :-\</li> + <li>The unchecked use of snprintf which was breakinglibxml-1.8.6compilation + on some platforms has been fixed</li> + <li>nanoftp.c nanohttp.c: Fixed '#' and '?' stripping + whenprocessingURIs</li> +</ul><h3>1.8.6: Jan 31 2000</h3><ul><li>added a nanoFTP transport module, debugged until the new version of <a href="http://rpmfind.net/linux/rpm2html/rpmfind.html">rpmfind</a>canuseit + without troubles</li> +</ul><h3>1.8.5: Jan 21 2000</h3><ul><li>adding APIs to parse a well balanced chunk of XML (production <a href="http://www.w3.org/TR/REC-xml#NT-content">[43] content</a>of + theXMLspec)</li> <li>fixed a hideous bug in xmlGetProp pointed by Rune.Djurhuus@fast.no</li> - <li>Jody Goldberg <jgoldberg@home.com> provided another patch trying - to solve the zlib checks problems</li> - <li>The current state in gnome CVS base is expected to ship as 1.8.5 with - gnumeric soon</li> + <li>Jody Goldberg <jgoldberg@home.com> provided another patchtryingto + solve the zlib checks problems</li> + <li>The current state in gnome CVS base is expected to ship as + 1.8.5withgnumeric soon</li> </ul><h3>1.8.4: Jan 13 2000</h3><ul><li>bug fixes, reintroduced xmlNewGlobalNs(), fixed xmlNewNs()</li> <li>all exit() call should have been removed from libxml</li> <li>fixed a problem with INCLUDE_WINSOCK on WIN32 platform</li> @@ -1191,52 +1209,52 @@ it's actually not compiled in by default. The real fixes are:</p><ul><li>a coupl <li>fixed the DTD parsing code to work with the xhtml DTD</li> <li>added xmlRemoveProp(), xmlRemoveID() and xmlRemoveRef()</li> <li>Fixed bugs in xmlNewNs()</li> - <li>External entity loading code has been revamped, now it uses - xmlLoadExternalEntity(), some fix on entities processing were added</li> + <li>External entity loading code has been revamped, now + itusesxmlLoadExternalEntity(), some fix on entities processing + wereadded</li> <li>cleaned up WIN32 includes of socket stuff</li> -</ul><h3>1.8.2: Dec 21 1999</h3><ul><li>I got another problem with includes and C++, I hope this issue is fixed - for good this time</li> - <li>Added a few tree modification functions: xmlReplaceNode, - xmlAddPrevSibling, xmlAddNextSibling, xmlNodeSetName and - xmlDocSetRootElement</li> +</ul><h3>1.8.2: Dec 21 1999</h3><ul><li>I got another problem with includes and C++, I hope this issue + isfixedfor good this time</li> + <li>Added a few tree modification + functions:xmlReplaceNode,xmlAddPrevSibling, xmlAddNextSibling, + xmlNodeSetNameandxmlDocSetRootElement</li> <li>Tried to improve the HTML output with help from <a href="mailto:clahey@umich.edu">Chris Lahey</a></li> -</ul><h3>1.8.1: Dec 18 1999</h3><ul><li>various patches to avoid troubles when using libxml with C++ compilers - the "namespace" keyword and C escaping in include files</li> +</ul><h3>1.8.1: Dec 18 1999</h3><ul><li>various patches to avoid troubles when using libxml with + C++compilersthe "namespace" keyword and C escaping in include files</li> <li>a problem in one of the core macros IS_CHAR was corrected</li> - <li>fixed a bug introduced in 1.8.0 breaking default namespace processing, - and more specifically the Dia application</li> - <li>fixed a posteriori validation (validation after parsing, or by using a - Dtd not specified in the original document)</li> + <li>fixed a bug introduced in 1.8.0 breaking default + namespaceprocessing,and more specifically the Dia application</li> + <li>fixed a posteriori validation (validation after parsing, or by + usingaDtd not specified in the original document)</li> <li>fixed a bug in</li> </ul><h3>1.8.0: Dec 12 1999</h3><ul><li>cleanup, especially memory wise</li> - <li>the parser should be more reliable, especially the HTML one, it should - not crash, whatever the input !</li> - <li>Integrated various patches, especially a speedup improvement for large - dataset from <a href="mailto:cnygard@bellatlantic.net">Carl Nygard</a>, - configure with --with-buffers to enable them.</li> + <li>the parser should be more reliable, especially the HTML one, + itshouldnot crash, whatever the input !</li> + <li>Integrated various patches, especially a speedup improvement + forlargedataset from <a href="mailto:cnygard@bellatlantic.net">CarlNygard</a>,configure with + --with-buffers to enable them.</li> <li>attribute normalization, oops should have been added long ago !</li> - <li>attributes defaulted from DTDs should be available, xmlSetProp() now - does entities escaping by default.</li> + <li>attributes defaulted from DTDs should be available, xmlSetProp()nowdoes + entities escaping by default.</li> </ul><h3>1.7.4: Oct 25 1999</h3><ul><li>Lots of HTML improvement</li> <li>Fixed some errors when saving both XML and HTML</li> <li>More examples, the regression tests should now look clean</li> <li>Fixed a bug with contiguous charref</li> </ul><h3>1.7.3: Sep 29 1999</h3><ul><li>portability problems fixed</li> - <li>snprintf was used unconditionally, leading to link problems on system - were it's not available, fixed</li> -</ul><h3>1.7.1: Sep 24 1999</h3><ul><li>The basic type for strings manipulated by libxml has been renamed in - 1.7.1 from <strong>CHAR</strong> to <strong>xmlChar</strong>. The reason - is that CHAR was conflicting with a predefined type on Windows. However - on non WIN32 environment, compatibility is provided by the way of a - <strong>#define </strong>.</li> - <li>Changed another error : the use of a structure field called errno, and - leading to troubles on platforms where it's a macro</li> -</ul><h3>1.7.0: Sep 23 1999</h3><ul><li>Added the ability to fetch remote DTD or parsed entities, see the <a href="html/libxml-nanohttp.html">nanohttp</a> module.</li> - <li>Added an errno to report errors by another mean than a simple printf - like callback</li> + <li>snprintf was used unconditionally, leading to link problems + onsystemwere it's not available, fixed</li> +</ul><h3>1.7.1: Sep 24 1999</h3><ul><li>The basic type for strings manipulated by libxml has been + renamedin1.7.1 from <strong>CHAR</strong>to <strong>xmlChar</strong>. + Thereasonis that CHAR was conflicting with a predefined type on + Windows.Howeveron non WIN32 environment, compatibility is provided by the + way ofa<strong>#define </strong>.</li> + <li>Changed another error : the use of a structure field called + errno,andleading to troubles on platforms where it's a macro</li> +</ul><h3>1.7.0: Sep 23 1999</h3><ul><li>Added the ability to fetch remote DTD or parsed entities, see the <a href="html/libxml-nanohttp.html">nanohttp</a>module.</li> + <li>Added an errno to report errors by another mean than a simpleprintflike + callback</li> <li>Finished ID/IDREF support and checking when validation</li> - <li>Serious memory leaks fixed (there is now a <a href="html/libxml-xmlmemory.html">memory wrapper</a> module)</li> - <li>Improvement of <a href="http://www.w3.org/TR/xpath">XPath</a> - implementation</li> + <li>Serious memory leaks fixed (there is now a <a href="html/libxml-xmlmemory.html">memory wrapper</a>module)</li> + <li>Improvement of <a href="http://www.w3.org/TR/xpath">XPath</a>implementation</li> <li>Added an HTML parser front-end</li> </ul><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/python.html b/doc/python.html index 5910766..adb3d36 100644 --- a/doc/python.html +++ b/doc/python.html @@ -7,73 +7,66 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Python and bindings</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Python and bindings</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>There are a number of language bindings and wrappers available for -libxml2, the list below is not exhaustive. Please contact the <a href="http://mail.gnome.org/mailman/listinfo/xml-bindings">xml-bindings@gnome.org</a> -(<a href="http://mail.gnome.org/archives/xml-bindings/">archives</a>) in -order to get updates to this list or to discuss the specific topic of libxml2 -or libxslt wrappers or bindings:</p><ul><li><a href="http://libxmlplusplus.sourceforge.net/">Libxml++</a> seems the - most up-to-date C++ bindings for libxml2, check the <a href="http://libxmlplusplus.sourceforge.net/reference/html/hierarchy.html">documentation</a> - and the <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/libxmlplusplus/libxml%2b%2b/examples/">examples</a>.</li> - <li>There is another <a href="http://libgdome-cpp.berlios.de/">C++ wrapper - based on the gdome2 bindings</a> maintained by Tobias Peters.</li> +</style><title>Python and bindings</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Python and bindings</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>There are a number of language bindings and wrappers available +forlibxml2,the list below is not exhaustive. Please contact the <a href="http://mail.gnome.org/mailman/listinfo/xml-bindings">xml-bindings@gnome.org</a>(<a href="http://mail.gnome.org/archives/xml-bindings/">archives</a>) inorder +toget updates to this list or to discuss the specific topic of +libxml2orlibxslt wrappers or bindings:</p><ul><li><a href="http://libxmlplusplus.sourceforge.net/">Libxml++</a>seemsthemost + up-to-date C++ bindings for libxml2, check the <a href="http://libxmlplusplus.sourceforge.net/reference/html/hierarchy.html">documentation</a>andthe + <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/libxmlplusplus/libxml%2b%2b/examples/">examples</a>.</li> + <li>There is another <a href="http://libgdome-cpp.berlios.de/">C++wrapperbased on the gdome2 + bindings</a>maintained by Tobias Peters.</li> <li>and a third C++ wrapper by Peter Jones <pjones@pmade.org> <p>Website: <a href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a></p> </li> - <li><a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt - Sergeant</a> developed <a href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl wrapper for - libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML - application server</a>.</li> - <li>If you're interested into scripting XML processing, have a look at <a href="http://xsh.sourceforge.net/">XSH</a> an XML editing shell based on - Libxml2 Perl bindings.</li> - <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides an - earlier version of the libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a>.</li> - <li>Gopal.V and Peter Minten develop <a href="http://savannah.gnu.org/projects/libxmlsharp">libxml#</a>, a set of - C# libxml2 bindings.</li> - <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue - libxml2</a> with Kylix, Delphi and other Pascal compilers.</li> - <li>Uwe Fechner also provides <a href="http://sourceforge.net/projects/idom2-pas/">idom2</a>, a DOM2 - implementation for Kylix2/D5/D6 from Borland.</li> - <li>There is <a href="http://libxml.rubyforge.org/">bindings for Ruby</a> - and libxml2 bindings are also available in Ruby through the <a href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a> module - maintained by Tobias Peters.</li> - <li>Steve Ball and contributors maintains <a href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for - Tcl</a>.</li> + <li><a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">MattSergeant</a>developed<a href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl + wrapperforlibxml2/libxslt as part of the <a href="http://axkit.com/">AxKitXMLapplication server</a>.</li> + <li>If you're interested into scripting XML processing, have a look at <a href="http://xsh.sourceforge.net/">XSH</a>an XML editing shell + basedonLibxml2 Perl bindings.</li> + <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave + Kuhlman</a>providesanearlier version of the libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a>.</li> + <li>Gopal.V and Peter Minten develop <a href="http://savannah.gnu.org/projects/libxmlsharp">libxml#</a>, a + setofC# libxml2 bindings.</li> + <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units + togluelibxml2</a>with Kylix, Delphi and other Pascal compilers.</li> + <li>Uwe Fechner also provides <a href="http://sourceforge.net/projects/idom2-pas/">idom2</a>, + aDOM2implementation for Kylix2/D5/D6 from Borland.</li> + <li>There is <a href="http://libxml.rubyforge.org/">bindings forRuby</a>and + libxml2 bindings are also available in Ruby through the <a href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a>modulemaintainedby + Tobias Peters.</li> + <li>Steve Ball and contributors maintains <a href="http://tclxml.sourceforge.net/">libxml2 and libxslt + bindingsforTcl</a>.</li> <li>libxml2 and libxslt is the default XML library for PHP5.</li> - <li><a href="http://savannah.gnu.org/projects/classpathx/">LibxmlJ</a> is - an effort to create a 100% JAXP-compatible Java wrapper for libxml2 and - libxslt as part of GNU ClasspathX project.</li> - <li>Patrick McPhee provides Rexx bindings fof libxml2 and libxslt, look for - <a href="http://www.interlog.com/~ptjm/software.html">RexxXML</a>.</li> - <li><a href="http://www.satimage.fr/software/en/xml_suite.html">Satimage</a> - provides <a href="http://www.satimage.fr/software/en/downloads_osaxen.html">XMLLib - osax</a>. This is an osax for Mac OS X with a set of commands to - implement in AppleScript the XML DOM, XPATH and XSLT. Also includes - commands for Property-lists (Apple's fast lookup table XML format.)</li> - <li>Francesco Montorsi developped <a href="https://sourceforge.net/project/showfiles.php?group_id=51305&package_id=45182">wxXml2</a> - wrappers that interface libxml2, allowing wxWidgets applications to - load/save/edit XML instances.</li> -</ul><p>The distribution includes a set of Python bindings, which are guaranteed -to be maintained as part of the library in the future, though the Python -interface have not yet reached the completeness of the C API.</p><p>Note that some of the Python purist dislike the default set of Python -bindings, rather than complaining I suggest they have a look at <a href="http://codespeak.net/lxml/">lxml the more pythonic bindings for libxml2 -and libxslt</a> and <a href="http://codespeak.net/mailman/listinfo/lxml-dev">help Martijn -Faassen</a> complete those.</p><p><a href="mailto:stephane.bidoul@softwareag.com">Stéphane Bidoul</a> -maintains <a href="http://users.skynet.be/sbi/libxml-python/">a Windows port -of the Python bindings</a>.</p><p>Note to people interested in building bindings, the API is formalized as -<a href="libxml2-api.xml">an XML API description file</a> which allows to -automate a large part of the Python bindings, this includes function -descriptions, enums, structures, typedefs, etc... The Python script used to -build the bindings is python/generator.py in the source distribution.</p><p>To install the Python bindings there are 2 options:</p><ul><li>If you use an RPM based distribution, simply install the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-python - RPM</a> (and if needed the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-python - RPM</a>).</li> - <li>Otherwise use the <a href="ftp://xmlsoft.org/libxml2/python/">libxml2-python - module distribution</a> corresponding to your installed version of - libxml2 and libxslt. Note that to install it you will need both libxml2 - and libxslt installed and run "python setup.py build install" in the - module tree.</li> -</ul><p>The distribution includes a set of examples and regression tests for the -python bindings in the <code>python/tests</code> directory. Here are some -excerpts from those tests:</p><h3>tst.py:</h3><p>This is a basic test of the file interface and DOM navigation:</p><pre>import libxml2, sys + <li><a href="http://savannah.gnu.org/projects/classpathx/">LibxmlJ</a>isaneffort + to create a 100% JAXP-compatible Java wrapper for libxml2andlibxslt as + part of GNU ClasspathX project.</li> + <li>Patrick McPhee provides Rexx bindings fof libxml2 and libxslt, + lookfor<a href="http://www.interlog.com/~ptjm/software.html">RexxXML</a>.</li> + <li><a href="http://www.satimage.fr/software/en/xml_suite.html">Satimage</a>provides<a href="http://www.satimage.fr/software/en/downloads_osaxen.html">XMLLibosax</a>.This + is an osax for Mac OS X with a set of commands toimplement inAppleScript + the XML DOM, XPATH and XSLT. Also includescommands forProperty-lists + (Apple's fast lookup table XML format.)</li> + <li>Francesco Montorsi developped <a href="https://sourceforge.net/project/showfiles.php?group_id=51305&package_id=45182">wxXml2</a>wrappersthat + interface libxml2, allowing wxWidgets applications toload/save/editXML + instances.</li> +</ul><p>The distribution includes a set of Python bindings, which are +guaranteedtobe maintained as part of the library in the future, though +thePythoninterface have not yet reached the completeness of the C API.</p><p>Note that some of the Python purist dislike the default set +ofPythonbindings, rather than complaining I suggest they have a look at <a href="http://codespeak.net/lxml/">lxml the more pythonic bindings +forlibxml2and libxslt</a>and <a href="http://codespeak.net/mailman/listinfo/lxml-dev">helpMartijnFaassen</a>complete +those.</p><p><a href="mailto:stephane.bidoul@softwareag.com">StéphaneBidoul</a>maintains <a href="http://users.skynet.be/sbi/libxml-python/">aWindows portof the Python +bindings</a>.</p><p>Note to people interested in building bindings, the API is formalized as<a href="libxml2-api.xml">an XML API description file</a>which allows +toautomatea large part of the Python bindings, this includes +functiondescriptions,enums, structures, typedefs, etc... The Python script +used tobuild thebindings is python/generator.py in the source +distribution.</p><p>To install the Python bindings there are 2 options:</p><ul><li>If you use an RPM based distribution, simply install the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-pythonRPM</a>(andif + needed the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-pythonRPM</a>).</li> + <li>Otherwise use the <a href="ftp://xmlsoft.org/libxml2/python/">libxml2-pythonmoduledistribution</a>corresponding + to your installed version oflibxml2 andlibxslt. Note that to install it + you will need both libxml2and libxsltinstalled and run "python setup.py + build install" in themodule tree.</li> +</ul><p>The distribution includes a set of examples and regression tests +forthepython bindings in the <code>python/tests</code>directory. Here +aresomeexcerpts from those tests:</p><h3>tst.py:</h3><p>This is a basic test of the file interface and DOM navigation:</p><pre>import libxml2, sys doc = libxml2.parseFile("tst.xml") if doc.name != "tst.xml": @@ -87,24 +80,25 @@ child = root.children if child.name != "foo": print "child.name failed" sys.exit(1) -doc.freeDoc()</pre><p>The Python module is called libxml2; parseFile is the equivalent of -xmlParseFile (most of the bindings are automatically generated, and the xml -prefix is removed and the casing convention are kept). All node seen at the -binding level share the same subset of accessors:</p><ul><li><code>name</code> : returns the node name</li> - <li><code>type</code> : returns a string indicating the node type</li> - <li><code>content</code> : returns the content of the node, it is based on - xmlNodeGetContent() and hence is recursive.</li> - <li><code>parent</code> , <code>children</code>, <code>last</code>, - <code>next</code>, <code>prev</code>, <code>doc</code>, - <code>properties</code>: pointing to the associated element in the tree, - those may return None in case no such link exists.</li> -</ul><p>Also note the need to explicitly deallocate documents with freeDoc() . -Reference counting for libxml2 trees would need quite a lot of work to -function properly, and rather than risk memory leaks if not implemented -correctly it sounds safer to have an explicit function to free a tree. The -wrapper python objects like doc, root or child are them automatically garbage -collected.</p><h3>validate.py:</h3><p>This test check the validation interfaces and redirection of error -messages:</p><pre>import libxml2 +doc.freeDoc()</pre><p>The Python module is called libxml2; parseFile is the +equivalentofxmlParseFile (most of the bindings are automatically generated, +and thexmlprefix is removed and the casing convention are kept). All node +seen atthebinding level share the same subset of accessors:</p><ul><li><code>name</code>: returns the node name</li> + <li><code>type</code>: returns a string indicating the node type</li> + <li><code>content</code>: returns the content of the node, it is + basedonxmlNodeGetContent() and hence is recursive.</li> + <li><code>parent</code>, + <code>children</code>,<code>last</code>,<code>next</code>, + <code>prev</code>,<code>doc</code>,<code>properties</code>: pointing to + the associatedelement in the tree,those may return None in case no such + linkexists.</li> +</ul><p>Also note the need to explicitly deallocate documents with +freeDoc().Reference counting for libxml2 trees would need quite a lot of +worktofunction properly, and rather than risk memory leaks if +notimplementedcorrectly it sounds safer to have an explicit function to free +atree. Thewrapper python objects like doc, root or child are +themautomatically garbagecollected.</p><h3>validate.py:</h3><p>This test check the validation interfaces and redirection +oferrormessages:</p><pre>import libxml2 #deactivate error messages from the validation def noerr(ctx, str): @@ -119,27 +113,29 @@ doc = ctxt.doc() valid = ctxt.isValid() doc.freeDoc() if valid != 0: - print "validity check failed"</pre><p>The first thing to notice is the call to registerErrorHandler(), it -defines a new error handler global to the library. It is used to avoid seeing -the error messages when trying to validate the invalid document.</p><p>The main interest of that test is the creation of a parser context with -createFileParserCtxt() and how the behaviour can be changed before calling -parseDocument() . Similarly the informations resulting from the parsing phase -are also available using context methods.</p><p>Contexts like nodes are defined as class and the libxml2 wrappers maps the -C function interfaces in terms of objects method as much as possible. The -best to get a complete view of what methods are supported is to look at the -libxml2.py module containing all the wrappers.</p><h3>push.py:</h3><p>This test show how to activate the push parser interface:</p><pre>import libxml2 + print "validity check failed"</pre><p>The first thing to notice is the call to registerErrorHandler(), +itdefinesa new error handler global to the library. It is used to avoid +seeingtheerror messages when trying to validate the invalid document.</p><p>The main interest of that test is the creation of a parser +contextwithcreateFileParserCtxt() and how the behaviour can be changed +beforecallingparseDocument() . Similarly the informations resulting from +theparsing phaseare also available using context methods.</p><p>Contexts like nodes are defined as class and the libxml2 wrappers mapstheC +function interfaces in terms of objects method as much as possible.Thebest to +get a complete view of what methods are supported is to look atthelibxml2.py +module containing all the wrappers.</p><h3>push.py:</h3><p>This test show how to activate the push parser interface:</p><pre>import libxml2 ctxt = libxml2.createPushParser(None, "<foo", 4, "test.xml") ctxt.parseChunk("/>", 2, 1) doc = ctxt.doc() -doc.freeDoc()</pre><p>The context is created with a special call based on the -xmlCreatePushParser() from the C library. The first argument is an optional -SAX callback object, then the initial set of data, the length and the name of -the resource in case URI-References need to be computed by the parser.</p><p>Then the data are pushed using the parseChunk() method, the last call -setting the third argument terminate to 1.</p><h3>pushSAX.py:</h3><p>this test show the use of the event based parsing interfaces. In this case -the parser does not build a document, but provides callback information as -the parser makes progresses analyzing the data being provided:</p><pre>import libxml2 +doc.freeDoc()</pre><p>The context is created with a special call based +onthexmlCreatePushParser() from the C library. The first argument is +anoptionalSAX callback object, then the initial set of data, the length and +thename ofthe resource in case URI-References need to be computed by +theparser.</p><p>Then the data are pushed using the parseChunk() method, the +lastcallsetting the third argument terminate to 1.</p><h3>pushSAX.py:</h3><p>this test show the use of the event based parsing interfaces. In +thiscasethe parser does not build a document, but provides callback +informationasthe parser makes progresses analyzing the data being +provided:</p><pre>import libxml2 log = "" class callback: @@ -187,15 +183,16 @@ reference = "startDocument:startElement foo {'url': 'tst'}:" + \ "characters: bar:endElement foo:endDocument:" if log != reference: print "Error got: %s" % log - print "Expected: %s" % reference</pre><p>The key object in that test is the handler, it provides a number of entry -points which can be called by the parser as it makes progresses to indicate -the information set obtained. The full set of callback is larger than what -the callback class in that specific example implements (see the SAX -definition for a complete list). The wrapper will only call those supplied by -the object when activated. The startElement receives the names of the element -and a dictionary containing the attributes carried by this element.</p><p>Also note that the reference string generated from the callback shows a -single character call even though the string "bar" is passed to the parser -from 2 different call to parseChunk()</p><h3>xpath.py:</h3><p>This is a basic test of XPath wrappers support</p><pre>import libxml2 + print "Expected: %s" % reference</pre><p>The key object in that test is the handler, it provides a number +ofentrypoints which can be called by the parser as it makes progresses +toindicatethe information set obtained. The full set of callback is larger +thanwhatthe callback class in that specific example implements (see +theSAXdefinition for a complete list). The wrapper will only call those +suppliedbythe object when activated. The startElement receives the names of +theelementand a dictionary containing the attributes carried by this +element.</p><p>Also note that the reference string generated from the callback +showsasingle character call even though the string "bar" is passed to +theparserfrom 2 different call to parseChunk()</p><h3>xpath.py:</h3><p>This is a basic test of XPath wrappers support</p><pre>import libxml2 doc = libxml2.parseFile("tst.xml") ctxt = doc.xpathNewContext() @@ -207,14 +204,15 @@ if res[0].name != "doc" or res[1].name != "foo": print "xpath query: wrong node set value" sys.exit(1) doc.freeDoc() -ctxt.xpathFreeContext()</pre><p>This test parses a file, then create an XPath context to evaluate XPath -expression on it. The xpathEval() method execute an XPath query and returns -the result mapped in a Python way. String and numbers are natively converted, -and node sets are returned as a tuple of libxml2 Python nodes wrappers. Like -the document, the XPath context need to be freed explicitly, also not that -the result of the XPath query may point back to the document tree and hence -the document must be freed after the result of the query is used.</p><h3>xpathext.py:</h3><p>This test shows how to extend the XPath engine with functions written in -python:</p><pre>import libxml2 +ctxt.xpathFreeContext()</pre><p>This test parses a file, then create an XPath context to +evaluateXPathexpression on it. The xpathEval() method execute an XPath query +andreturnsthe result mapped in a Python way. String and numbers are +nativelyconverted,and node sets are returned as a tuple of libxml2 Python +nodeswrappers. Likethe document, the XPath context need to be freed +explicitly,also not thatthe result of the XPath query may point back to the +documenttree and hencethe document must be freed after the result of the +query isused.</p><h3>xpathext.py:</h3><p>This test shows how to extend the XPath engine with functions +writteninpython:</p><pre>import libxml2 def foo(ctx, x): return x + 1 @@ -226,9 +224,10 @@ res = ctxt.xpathEval("foo(1)") if res != 2: print "xpath extension failure" doc.freeDoc() -ctxt.xpathFreeContext()</pre><p>Note how the extension function is registered with the context (but that -part is not yet finalized, this may change slightly in the future).</p><h3>tstxpath.py:</h3><p>This test is similar to the previous one but shows how the extension -function can access the XPath evaluation context:</p><pre>def foo(ctx, x): +ctxt.xpathFreeContext()</pre><p>Note how the extension function is registered with the context +(butthatpart is not yet finalized, this may change slightly in the +future).</p><h3>tstxpath.py:</h3><p>This test is similar to the previous one but shows how +theextensionfunction can access the XPath evaluation context:</p><pre>def foo(ctx, x): global called # @@ -237,16 +236,16 @@ function can access the XPath evaluation context:</p><pre>def foo(ctx, x): pctxt = libxml2.xpathParserContext(_obj=ctx) ctxt = pctxt.context() called = ctxt.function() - return x + 1</pre><p>All the interfaces around the XPath parser(or rather evaluation) context -are not finalized, but it should be sufficient to do contextual work at the -evaluation point.</p><h3>Memory debugging:</h3><p>last but not least, all tests starts with the following prologue:</p><pre>#memory debug specific + return x + 1</pre><p>All the interfaces around the XPath parser(or rather evaluation)contextare +not finalized, but it should be sufficient to do contextual workat +theevaluation point.</p><h3>Memory debugging:</h3><p>last but not least, all tests starts with the following prologue:</p><pre>#memory debug specific libxml2.debugMemory(1)</pre><p>and ends with the following epilogue:</p><pre>#memory debug specific libxml2.cleanupParser() if libxml2.debugMemory(1) == 0: print "OK" else: print "Memory leak %d bytes" % (libxml2.debugMemory(1)) - libxml2.dumpMemory()</pre><p>Those activate the memory debugging interface of libxml2 where all -allocated block in the library are tracked. The prologue then cleans up the -library state and checks that all allocated memory has been freed. If not it -calls dumpMemory() which saves that list in a <code>.memdump</code> file.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> + libxml2.dumpMemory()</pre><p>Those activate the memory debugging interface of libxml2 whereallallocated +block in the library are tracked. The prologue then cleans upthelibrary state +and checks that all allocated memory has been freed. If notitcalls +dumpMemory() which saves that list in a <code>.memdump</code>file.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/threads.html b/doc/threads.html index 8082dbd..e6fe497 100644 --- a/doc/threads.html +++ b/doc/threads.html @@ -7,15 +7,16 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Thread safety</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Thread safety</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Starting with 2.4.7, libxml2 makes provisions to ensure that concurrent -threads can safely work in parallel parsing different documents. There is -however a couple of things to do to ensure it:</p><ul><li>configure the library accordingly using the --with-threads options</li> - <li>call xmlInitParser() in the "main" thread before using any of the - libxml2 API (except possibly selecting a different memory allocator)</li> -</ul><p>Note that the thread safety cannot be ensured for multiple threads sharing -the same document, the locking must be done at the application level, libxml -exports a basic mutex and reentrant mutexes API in <libxml/threads.h>. -The parts of the library checked for thread safety are:</p><ul><li>concurrent loading</li> +</style><title>Thread safety</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Thread safety</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Starting with 2.4.7, libxml2 makes provisions to ensure +thatconcurrentthreads can safely work in parallel parsing different +documents.There ishowever a couple of things to do to ensure it:</p><ul><li>configure the library accordingly using the --with-threads options</li> + <li>call xmlInitParser() in the "main" thread before using any ofthelibxml2 + API (except possibly selecting a different memoryallocator)</li> +</ul><p>Note that the thread safety cannot be ensured for multiple +threadssharingthe same document, the locking must be done at the application +level,libxmlexports a basic mutex and reentrant mutexes API +in<libxml/threads.h>.The parts of the library checked for thread +safetyare:</p><ul><li>concurrent loading</li> <li>file access resolution</li> <li>catalog access</li> <li>catalog building</li> @@ -23,5 +24,5 @@ The parts of the library checked for thread safety are:</p><ul><li>concurrent lo <li>validation</li> <li>global variables per-thread override</li> <li>memory handling</li> -</ul><p>XPath is supposed to be thread safe now, but this wasn't tested -seriously.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</ul><p>XPath is supposed to be thread safe now, but this +wasn'ttestedseriously.</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/tree.html b/doc/tree.html index 6556637..238cd6d 100644 --- a/doc/tree.html +++ b/doc/tree.html @@ -7,22 +7,22 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>The tree output</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The tree output</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The parser returns a tree built during the document analysis. The value -returned is an <strong>xmlDocPtr</strong> (i.e., a pointer to an -<strong>xmlDoc</strong> structure). This structure contains information such -as the file name, the document type, and a <strong>children</strong> pointer -which is the root of the document (or more exactly the first child under the -root which is the document). The tree is made of <strong>xmlNode</strong>s, -chained in double-linked lists of siblings and with a children<->parent -relationship. An xmlNode can also carry properties (a chain of xmlAttr -structures). An attribute may have a value which is a list of TEXT or -ENTITY_REF nodes.</p><p>Here is an example (erroneous with respect to the XML spec since there -should be only one ELEMENT under the root):</p><p><img src="structure.gif" alt=" structure.gif " /></p><p>In the source package there is a small program (not installed by default) -called <strong>xmllint</strong> which parses XML files given as argument and -prints them back as parsed. This is useful for detecting errors both in XML -code and in the XML parser itself. It has an option <strong>--debug</strong> -which prints the actual in-memory structure of the document; here is the -result with the <a href="#example">example</a> given before:</p><pre>DOCUMENT +</style><title>The tree output</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>The tree output</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The parser returns a tree built during the document analysis. +Thevaluereturned is an <strong>xmlDocPtr</strong>(i.e., a pointer +toan<strong>xmlDoc</strong>structure). This structure contains +informationsuchas the file name, the document type, and +a<strong>children</strong>pointerwhich is the root of the document (or +moreexactly the first child under theroot which is the document). The tree +ismade of <strong>xmlNode</strong>s,chained in double-linked lists of +siblingsand with a children<->parentrelationship. An xmlNode can also +carryproperties (a chain of xmlAttrstructures). An attribute may have a +valuewhich is a list of TEXT orENTITY_REF nodes.</p><p>Here is an example (erroneous with respect to the XML spec +sincethereshould be only one ELEMENT under the root):</p><p><img src="structure.gif" alt=" structure.gif " /></p><p>In the source package there is a small program (not installed +bydefault)called <strong>xmllint</strong>which parses XML files given +asargument andprints them back as parsed. This is useful for detecting +errorsboth in XMLcode and in the XML parser itself. It has an +option<strong>--debug</strong>which prints the actual in-memory structure of +thedocument; here is theresult with the <a href="#example">example</a>givenbefore:</p><pre>DOCUMENT version=1.0 standalone=true ELEMENT EXAMPLE diff --git a/doc/upgrade.html b/doc/upgrade.html index 59815ba..590b8a4 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -7,100 +7,102 @@ H1 {font-family: Verdana,Arial,Helvetica} H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } -</style><title>Upgrading 1.x code</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Upgrading 1.x code</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Incompatible changes:</p><p>Version 2 of libxml2 is the first version introducing serious backward -incompatible changes. The main goals were:</p><ul><li>a general cleanup. A number of mistakes inherited from the very early - versions couldn't be changed due to compatibility constraints. Example - the "childs" element in the nodes.</li> - <li>Uniformization of the various nodes, at least for their header and link - parts (doc, parent, children, prev, next), the goal is a simpler - programming model and simplifying the task of the DOM implementors.</li> - <li>better conformances to the XML specification, for example version 1.x - had an heuristic to try to detect ignorable white spaces. As a result the - SAX event generated were ignorableWhitespace() while the spec requires - character() in that case. This also mean that a number of DOM node - containing blank text may populate the DOM tree which were not present - before.</li> -</ul><h3>How to fix libxml-1.x code:</h3><p>So client code of libxml designed to run with version 1.x may have to be -changed to compile against version 2.x of libxml. Here is a list of changes -that I have collected, they may not be sufficient, so in case you find other -change which are required, <a href="mailto:Daniel.Veillard@w3.org">drop me a -mail</a>:</p><ol><li>The package name have changed from libxml to libxml2, the library name - is now -lxml2 . There is a new xml2-config script which should be used to - select the right parameters libxml2</li> - <li>Node <strong>childs</strong> field has been renamed - <strong>children</strong> so s/childs/children/g should be applied - (probability of having "childs" anywhere else is close to 0+</li> - <li>The document don't have anymore a <strong>root</strong> element it has - been replaced by <strong>children</strong> and usually you will get a - list of element here. For example a Dtd element for the internal subset - and it's declaration may be found in that list, as well as processing - instructions or comments found before or after the document root element. - Use <strong>xmlDocGetRootElement(doc)</strong> to get the root element of - a document. Alternatively if you are sure to not reference DTDs nor have - PIs or comments before or after the root element - s/->root/->children/g will probably do it.</li> - <li>The white space issue, this one is more complex, unless special case of - validating parsing, the line breaks and spaces usually used for indenting - and formatting the document content becomes significant. So they are - reported by SAX and if your using the DOM tree, corresponding nodes are - generated. Too approach can be taken: - <ol><li>lazy one, use the compatibility call - <strong>xmlKeepBlanksDefault(0)</strong> but be aware that you are - relying on a special (and possibly broken) set of heuristics of - libxml to detect ignorable blanks. Don't complain if it breaks or - make your application not 100% clean w.r.t. to it's input.</li> - <li>the Right Way: change you code to accept possibly insignificant - blanks characters, or have your tree populated with weird blank text - nodes. You can spot them using the commodity function - <strong>xmlIsBlankNode(node)</strong> returning 1 for such blank - nodes.</li> - </ol><p>Note also that with the new default the output functions don't add any - extra indentation when saving a tree in order to be able to round trip - (read and save) without inflating the document with extra formatting - chars.</p> +</style><title>Upgrading 1.x code</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Upgrading 1.x code</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Developer Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html" style="font-weight:bold">Main Menu</a></li><li><a href="html/index.html" style="font-weight:bold">Reference Manual</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="tutorial/index.html">Tutorial</a></li><li><a href="xmlreader.html">The Reader Interface</a></li><li><a href="ChangeLog.html">ChangeLog</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="architecture.html">libxml2 architecture</a></li><li><a href="tree.html">The tree output</a></li><li><a href="interface.html">The SAX interface</a></li><li><a href="xmlmem.html">Memory Management</a></li><li><a href="xmlio.html">I/O Interfaces</a></li><li><a href="library.html">The parser interfaces</a></li><li><a href="entities.html">Entities or no entities</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="upgrade.html">Upgrading 1.x code</a></li><li><a href="threads.html">Thread safety</a></li><li><a href="DOM.html">DOM Principles</a></li><li><a href="example.html">A real example</a></li><li><a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://www.blastwave.org/packages.php/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>Incompatible changes:</p><p>Version 2 of libxml2 is the first version introducing +seriousbackwardincompatible changes. The main goals were:</p><ul><li>a general cleanup. A number of mistakes inherited from the + veryearlyversions couldn't be changed due to compatibility + constraints.Examplethe "childs" element in the nodes.</li> + <li>Uniformization of the various nodes, at least for their header + andlinkparts (doc, parent, children, prev, next), the goal is + asimplerprogramming model and simplifying the task of the + DOMimplementors.</li> + <li>better conformances to the XML specification, for example version1.xhad + an heuristic to try to detect ignorable white spaces. As a resulttheSAX + event generated were ignorableWhitespace() while the + specrequirescharacter() in that case. This also mean that a number of + DOMnodecontaining blank text may populate the DOM tree which were + notpresentbefore.</li> +</ul><h3>How to fix libxml-1.x code:</h3><p>So client code of libxml designed to run with version 1.x may have +tobechanged to compile against version 2.x of libxml. Here is a list +ofchangesthat I have collected, they may not be sufficient, so in case you +findotherchange which are required, <a href="mailto:Daniel.Veillard@w3.org">dropme amail</a>:</p><ol><li>The package name have changed from libxml to libxml2, the librarynameis + now -lxml2 . There is a new xml2-config script which should beused + toselect the right parameters libxml2</li> + <li>Node <strong>childs</strong>field has + beenrenamed<strong>children</strong>so s/childs/children/g should + beapplied(probability of having "childs" anywhere else is close to 0+</li> + <li>The document don't have anymore a <strong>root</strong>element + ithasbeen replaced by <strong>children</strong>and usually you will + getalist of element here. For example a Dtd element for the + internalsubsetand it's declaration may be found in that list, as well + asprocessinginstructions or comments found before or after the + documentroot element.Use <strong>xmlDocGetRootElement(doc)</strong>to get + theroot element ofa document. Alternatively if you are sure to not + referenceDTDs nor havePIs or comments before or after the + rootelements/->root/->children/g will probably do it.</li> + <li>The white space issue, this one is more complex, unless special + caseofvalidating parsing, the line breaks and spaces usually used + forindentingand formatting the document content becomes significant. So + theyarereported by SAX and if your using the DOM tree, corresponding + nodesaregenerated. Too approach can be taken: + <ol><li>lazy one, use the + compatibilitycall<strong>xmlKeepBlanksDefault(0)</strong>but be aware + that youarerelying on a special (and possibly broken) set of + heuristicsoflibxml to detect ignorable blanks. Don't complain if it + breaksormake your application not 100% clean w.r.t. to it's + input.</li> + <li>the Right Way: change you code to accept + possiblyinsignificantblanks characters, or have your tree populated + withweird blank textnodes. You can spot them using the + commodityfunction<strong>xmlIsBlankNode(node)</strong>returning 1 for + suchblanknodes.</li> + </ol><p>Note also that with the new default the output functions don't + addanyextra indentation when saving a tree in order to be able to + roundtrip(read and save) without inflating the document with + extraformattingchars.</p> </li> - <li>The include path has changed to $prefix/libxml/ and the includes - themselves uses this new prefix in includes instructions... If you are - using (as expected) the + <li>The include path has changed to $prefix/libxml/ and + theincludesthemselves uses this new prefix in includes instructions... + Ifyou areusing (as expected) the <pre>xml2-config --cflags</pre> - <p>output to generate you compile commands this will probably work out of - the box</p> + <p>output to generate you compile commands this will probably work + outofthe box</p> </li> - <li>xmlDetectCharEncoding takes an extra argument indicating the length in - byte of the head of the document available for character detection.</li> -</ol><h3>Ensuring both libxml-1.x and libxml-2.x compatibility</h3><p>Two new version of libxml (1.8.11) and libxml2 (2.3.4) have been released -to allow smooth upgrade of existing libxml v1code while retaining -compatibility. They offers the following:</p><ol><li>similar include naming, one should use - <strong>#include<libxml/...></strong> in both cases.</li> - <li>similar identifiers defined via macros for the child and root fields: - respectively <strong>xmlChildrenNode</strong> and - <strong>xmlRootNode</strong></li> - <li>a new macro <strong>LIBXML_TEST_VERSION</strong> which should be - inserted once in the client code</li> -</ol><p>So the roadmap to upgrade your existing libxml applications is the -following:</p><ol><li>install the libxml-1.8.8 (and libxml-devel-1.8.8) packages</li> - <li>find all occurrences where the xmlDoc <strong>root</strong> field is - used and change it to <strong>xmlRootNode</strong></li> - <li>similarly find all occurrences where the xmlNode - <strong>childs</strong> field is used and change it to - <strong>xmlChildrenNode</strong></li> - <li>add a <strong>LIBXML_TEST_VERSION</strong> macro somewhere in your - <strong>main()</strong> or in the library init entry point</li> + <li>xmlDetectCharEncoding takes an extra argument indicating the + lengthinbyte of the head of the document available for character + detection.</li> +</ol><h3>Ensuring both libxml-1.x and libxml-2.x compatibility</h3><p>Two new version of libxml (1.8.11) and libxml2 (2.3.4) have beenreleasedto +allow smooth upgrade of existing libxml v1code whileretainingcompatibility. +They offers the following:</p><ol><li>similar include naming, one + shoulduse<strong>#include<libxml/...></strong>in both cases.</li> + <li>similar identifiers defined via macros for the child and + rootfields:respectively<strong>xmlChildrenNode</strong>and<strong>xmlRootNode</strong></li> + <li>a new macro <strong>LIBXML_TEST_VERSION</strong>which should + beinsertedonce in the client code</li> +</ol><p>So the roadmap to upgrade your existing libxml applications +isthefollowing:</p><ol><li>install the libxml-1.8.8 (and libxml-devel-1.8.8) packages</li> + <li>find all occurrences where the xmlDoc <strong>root</strong>field + isusedand change it to <strong>xmlRootNode</strong></li> + <li>similarly find all occurrences where + thexmlNode<strong>childs</strong>field is used and change + itto<strong>xmlChildrenNode</strong></li> + <li>add a <strong>LIBXML_TEST_VERSION</strong>macro somewhere + inyour<strong>main()</strong>or in the library init entry point</li> <li>Recompile, check compatibility, it should still work</li> - <li>Change your configure script to look first for xml2-config and fall - back using xml-config . Use the --cflags and --libs output of the command - as the Include and Linking parameters needed to use libxml.</li> - <li>install libxml2-2.3.x and libxml2-devel-2.3.x (libxml-1.8.y and - libxml-devel-1.8.y can be kept simultaneously)</li> - <li>remove your config.cache, relaunch your configuration mechanism, and - recompile, if steps 2 and 3 were done right it should compile as-is</li> - <li>Test that your application is still running correctly, if not this may - be due to extra empty nodes due to formating spaces being kept in libxml2 - contrary to libxml1, in that case insert xmlKeepBlanksDefault(1) in your - code before calling the parser (next to - <strong>LIBXML_TEST_VERSION</strong> is a fine place).</li> -</ol><p>Following those steps should work. It worked for some of my own code.</p><p>Let me put some emphasis on the fact that there is far more changes from -libxml 1.x to 2.x than the ones you may have to patch for. The overall code -has been considerably cleaned up and the conformance to the XML specification -has been drastically improved too. Don't take those changes as an excuse to -not upgrade, it may cost a lot on the long term ...</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> + <li>Change your configure script to look first for xml2-config and + fallbackusing xml-config . Use the --cflags and --libs output of the + commandasthe Include and Linking parameters needed to use libxml.</li> + <li>install libxml2-2.3.x and libxml2-devel-2.3.x + (libxml-1.8.yandlibxml-devel-1.8.y can be kept simultaneously)</li> + <li>remove your config.cache, relaunch your configuration + mechanism,andrecompile, if steps 2 and 3 were done right it should + compileas-is</li> + <li>Test that your application is still running correctly, if not thismaybe + due to extra empty nodes due to formating spaces being kept + inlibxml2contrary to libxml1, in that case insert + xmlKeepBlanksDefault(1)in yourcode before calling the parser + (nextto<strong>LIBXML_TEST_VERSION</strong>is a fine place).</li> +</ol><p>Following those steps should work. It worked for some of my own code.</p><p>Let me put some emphasis on the fact that there is far more +changesfromlibxml 1.x to 2.x than the ones you may have to patch for. The +overallcodehas been considerably cleaned up and the conformance to the +XMLspecificationhas been drastically improved too. Don't take those changes +asan excuse tonot upgrade, it may cost a lot on the long term ...</p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/xml.html b/doc/xml.html index e013dcc..72a0a9c 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -3,42 +3,42 @@ <html> <head> <title>The XML C parser and toolkit of Gnome</title> - <meta name="GENERATOR" content="amaya 8.5, see http://www.w3.org/Amaya/"> - <meta http-equiv="Content-Type" content="text/html"> + <meta name="GENERATOR" content="amaya 8.8.5, see http://www.w3.org/Amaya/"> + <meta http-equiv="content-type" content="text/html"> </head> <body bgcolor="#ffffff"> <h1 align="center">The XML C parser and toolkit of Gnome</h1> -<h1>Note: this is the flat content of the <a href="index.html">web -site</a></h1> +<h1>Note: this is the flat content of the <a +href="index.html">website</a></h1> <h1 style="text-align: center">libxml, a.k.a. gnome-xml</h1> <p></p> <p -style="text-align: right; font-style: italic; font-size: 10pt">"Programming -with libxml2 is like the thrilling embrace of an exotic stranger." <a -href="http://diveintomark.org/archives/2004/02/18/libxml2">Mark -Pilgrim</a></p> - -<p>Libxml2 is the XML C parser and toolkit developed for the Gnome project -(but usable outside of the Gnome platform), it is free software available -under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT -License</a>. XML itself is a metalanguage to design markup languages, i.e. -text language where semantic and structure are added to the content using -extra "markup" information enclosed between angle brackets. HTML is the most -well-known markup language. Though the library is written in C <a -href="python.html">a variety of language bindings</a> make it available in -other environments.</p> - -<p>Libxml2 is known to be very portable, the library should build and work -without serious troubles on a variety of systems (Linux, Unix, Windows, -CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)</p> - -<p>Libxml2 implements a number of existing standards related to markup -languages:</p> +style="text-align: right; font-style: italic; font-size: 10pt">"Programmingwithlibxml2 +is like the thrilling embrace of an exotic stranger." <a +href="http://diveintomark.org/archives/2004/02/18/libxml2">MarkPilgrim</a></p> + +<p>Libxml2 is the XML C parser and toolkit developed for the Gnomeproject(but +usable outside of the Gnome platform), it is free softwareavailableunder the +<a +href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>.XML +itself is a metalanguage to design markup languages, i.e.text languagewhere +semantic and structure are added to the content usingextra +"markup"information enclosed between angle brackets. HTML is the +mostwell-knownmarkup language. Though the library is written in C <a +href="python.html">avariety of language bindings</a>make it available inother +environments.</p> + +<p>Libxml2 is known to be very portable, the library should build +andworkwithout serious troubles on a variety of systems (Linux, +Unix,Windows,CygWin, MacOS, MacOS X, RISC Os, OS/2, VMS, QNX, MVS, ...)</p> + +<p>Libxml2 implements a number of existing standards related +tomarkuplanguages:</p> <ul> <li>the XML standard: <a href="http://www.w3.org/TR/REC-xml">http://www.w3.org/TR/REC-xml</a></li> @@ -46,8 +46,9 @@ languages:</p> href="http://www.w3.org/TR/REC-xml-names/">http://www.w3.org/TR/REC-xml-names/</a></li> <li>XML Base: <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a></li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a> : - Uniform Resource Identifiers <a + <li><a + href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC2396</a>:Uniform + Resource Identifiers <a href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a></li> <li>XML Path Language (XPath) 1.0: <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a></li> @@ -58,63 +59,67 @@ languages:</p> <li>XML Inclusions (XInclude) Version 1.0: <a href="http://www.w3.org/TR/xinclude/">http://www.w3.org/TR/xinclude/</a></li> <li>ISO-8859-x encodings, as well as <a - href="http://www.cis.ohio-state.edu/rfc/rfc2044.txt">rfc2044</a> [UTF-8] - and <a href="http://www.cis.ohio-state.edu/rfc/rfc2781.txt">rfc2781</a> - [UTF-16] Unicode encodings, and more if using iconv support</li> + href="http://www.cis.ohio-state.edu/rfc/rfc2044.txt">rfc2044</a>[UTF-8]and<a + href="http://www.cis.ohio-state.edu/rfc/rfc2781.txt">rfc2781</a>[UTF-16]Unicode + encodings, and more if using iconv support</li> <li>part of SGML Open Technical Resolution TR9401:1997</li> <li>XML Catalogs Working Draft 06 August 2001: <a href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">http://www.oasis-open.org/committees/entity/spec-2001-08-06.html</a></li> <li>Canonical XML Version 1.0: <a - href="http://www.w3.org/TR/xml-c14n">http://www.w3.org/TR/xml-c14n</a> - and the Exclusive XML Canonicalization CR draft <a + href="http://www.w3.org/TR/xml-c14n">http://www.w3.org/TR/xml-c14n</a>andthe + Exclusive XML Canonicalization CR draft <a href="http://www.w3.org/TR/xml-exc-c14n">http://www.w3.org/TR/xml-exc-c14n</a></li> <li>Relax NG, ISO/IEC 19757-2:2003, <a href="http://www.oasis-open.org/committees/relax-ng/spec-20011203.html">http://www.oasis-open.org/committees/relax-ng/spec-20011203.html</a></li> <li>W3C XML Schemas Part 2: Datatypes <a - href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">REC 02 May - 2001</a></li> - <li>W3C <a href="http://www.w3.org/TR/xml-id/">xml:id</a> Working Draft 7 - April 2004</li> + href="http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/">REC + 02May2001</a></li> + <li>W3C <a href="http://www.w3.org/TR/xml-id/">xml:id</a>Working + Draft7April 2004</li> </ul> -<p>In most cases libxml2 tries to implement the specifications in a -relatively strictly compliant way. As of release 2.4.16, libxml2 passed all -1800+ tests from the <a -href="http://www.oasis-open.org/committees/xml-conformance/">OASIS XML Tests -Suite</a>.</p> +<p>In most cases libxml2 tries to implement the specifications in +arelativelystrictly compliant way. As of release 2.4.16, libxml2 passed +all1800+ testsfrom the <a +href="http://www.oasis-open.org/committees/xml-conformance/">OASIS +XMLTestsSuite</a>.</p> -<p>To some extent libxml2 provides support for the following additional -specifications but doesn't claim to implement them completely:</p> +<p>To some extent libxml2 provides support for the +followingadditionalspecifications but doesn't claim to implement them +completely:</p> <ul> <li>Document Object Model (DOM) <a - href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/</a> - the document model, but it doesn't implement the API itself, gdome2 does - this on top of libxml2</li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a> : - libxml2 implements a basic FTP client code</li> - <li><a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a> : - HTTP/1.0, again a basic HTTP client code</li> - <li>SAX: a SAX2 like interface and a minimal SAX1 implementation compatible - with early expat versions</li> + href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/</a>thedocument + model, but it doesn't implement the API itself, gdome2 doesthison top of + libxml2</li> + <li><a + href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC959</a>:libxml2 + implements a basic FTP client code</li> + <li><a + href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC1945</a>:HTTP/1.0, + again a basic HTTP client code</li> + <li>SAX: a SAX2 like interface and a minimal SAX1 + implementationcompatiblewith early expat versions</li> </ul> <p>A partial implementation of <a -href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schemas Part -1: Structure</a> is being worked on but it would be far too early to make any -conformance statement about it at the moment.</p> +href="http://www.w3.org/TR/2001/REC-xmlschema-1-20010502/">XML Schemas +Part1:Structure</a>is being worked on but it would be far too early to +makeanyconformance statement about it at the moment.</p> <p>Separate documents:</p> <ul> - <li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a> providing an - implementation of XSLT 1.0 and common extensions like EXSLT for - libxml2</li> - <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 page</a> - : a standard DOM2 implementation for libxml2</li> - <li><a href="http://www.aleksey.com/xmlsec/">the XMLSec page</a>: an - implementation of <a href="http://www.w3.org/TR/xmldsig-core/">W3C XML - Digital Signature</a> for libxml2</li> - <li>also check the related links section below for more related and active - projects.</li> + <li><a href="http://xmlsoft.org/XSLT/">the libxslt + page</a>providinganimplementation of XSLT 1.0 and common extensions like + EXSLTforlibxml2</li> + <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 + page</a>:a standard DOM2 implementation for libxml2</li> + <li><a href="http://www.aleksey.com/xmlsec/">the XMLSec + page</a>:animplementation of <a + href="http://www.w3.org/TR/xmldsig-core/">W3CXMLDigital Signature</a>for + libxml2</li> + <li>also check the related links section below for more related + andactiveprojects.</li> </ul> <!----------------<p>Results of the <a href="http://xmlbench.sourceforge.net/results/benchmark/index.html">xmlbench @@ -129,43 +134,42 @@ alt="benchmark results for Expat Xerces libxml2 Oracle and Sun toolkits"></p> <h2><a name="Introducti">Introduction</a></h2> <p>This document describes libxml, the <a -href="http://www.w3.org/XML/">XML</a> C parser and toolkit developed for the -<a href="http://www.gnome.org/">Gnome</a> project. <a -href="http://www.w3.org/XML/">XML is a standard</a> for building tag-based -structured documents/data.</p> +href="http://www.w3.org/XML/">XML</a>C parser and toolkit developed for the<a +href="http://www.gnome.org/">Gnome</a>project. <a +href="http://www.w3.org/XML/">XML is a standard</a>for +buildingtag-basedstructured documents/data.</p> <p>Here are some key points about libxml:</p> <ul> - <li>Libxml2 exports Push (progressive) and Pull (blocking) type parser - interfaces for both XML and HTML.</li> - <li>Libxml2 can do DTD validation at parse time, using a parsed document - instance, or with an arbitrary DTD.</li> + <li>Libxml2 exports Push (progressive) and Pull (blocking) + typeparserinterfaces for both XML and HTML.</li> + <li>Libxml2 can do DTD validation at parse time, using a + parseddocumentinstance, or with an arbitrary DTD.</li> <li>Libxml2 includes complete <a href="http://www.w3.org/TR/xpath">XPath</a>, <a - href="http://www.w3.org/TR/xptr">XPointer</a> and <a - href="http://www.w3.org/TR/xinclude">XInclude</a> implementations.</li> - <li>It is written in plain C, making as few assumptions as possible, and - sticking closely to ANSI C/POSIX for easy embedding. Works on - Linux/Unix/Windows, ported to a number of other platforms.</li> - <li>Basic support for HTTP and FTP client allowing applications to fetch - remote resources.</li> + href="http://www.w3.org/TR/xptr">XPointer</a>and <a + href="http://www.w3.org/TR/xinclude">XInclude</a>implementations.</li> + <li>It is written in plain C, making as few assumptions as + possible,andsticking closely to ANSI C/POSIX for easy embedding. + WorksonLinux/Unix/Windows, ported to a number of other platforms.</li> + <li>Basic support for HTTP and FTP client allowing applications + tofetchremote resources.</li> <li>The design is modular, most of the extensions can be compiled out.</li> <li>The internal document representation is as close as possible to the <a - href="http://www.w3.org/DOM/">DOM</a> interfaces.</li> + href="http://www.w3.org/DOM/">DOM</a>interfaces.</li> <li>Libxml2 also has a <a - href="http://www.megginson.com/SAX/index.html">SAX like interface</a>; - the interface is designed to be compatible with <a + href="http://www.megginson.com/SAX/index.html">SAX like + interface</a>;theinterface is designed to be compatible with <a href="http://www.jclark.com/xml/expat.html">Expat</a>.</li> <li>This library is released under the <a - href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a>. See the Copyright file in the distribution for the precise - wording.</li> + href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>.See + the Copyright file in the distribution for the precisewording.</li> </ul> -<p>Warning: unless you are forced to because your application links with a -Gnome-1.X library requiring it, <strong><span -style="background-color: #FF0000">Do Not Use libxml1</span></strong>, use -libxml2</p> +<p>Warning: unless you are forced to because your application links +withaGnome-1.X library requiring it, <strong><span +style="background-color: #FF0000">Do Not Use +libxml1</span></strong>,uselibxml2</p> <h2><a name="FAQ">FAQ</a></h2> @@ -181,67 +185,63 @@ libxml2</p> <ol> <li><em>Licensing Terms for libxml</em> <p>libxml2 is released under the <a - href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a>; see the file Copyright in the distribution for the precise - wording</p> + href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>;see + the file Copyright in the distribution for the precisewording</p> </li> <li><em>Can I embed libxml2 in a proprietary application ?</em> - <p>Yes. The MIT License allows you to keep proprietary the changes you - made to libxml, but it would be graceful to send-back bug fixes and - improvements as patches for possible incorporation in the main - development tree.</p> + <p>Yes. The MIT License allows you to keep proprietary the changesyoumade + to libxml, but it would be graceful to send-back bug fixesandimprovements + as patches for possible incorporation in themaindevelopment tree.</p> </li> </ol> <h3><a name="Installati">Installation</a></h3> <ol> - <li><strong><span style="background-color: #FF0000">Do Not Use - libxml1</span></strong>, use libxml2</li> - <li><em>Where can I get libxml</em> ? + <li><strong><span style="background-color: #FF0000">Do + NotUselibxml1</span></strong>, use libxml2</li> + <li><em>Where can I get libxml</em>? <p>The original distribution comes from <a - href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> or <a + href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>or <a href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">gnome.org</a></p> - <p>Most Linux and BSD distributions include libxml, this is probably the - safer way for end-users to use libxml.</p> + <p>Most Linux and BSD distributions include libxml, this is + probablythesafer way for end-users to use libxml.</p> <p>David Doolin provides precompiled Windows versions at <a href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/ ">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a></p> </li> <li><em>I see libxml and libxml2 releases, which one should I install ?</em> <ul> - <li>If you are not constrained by backward compatibility issues with - existing applications, install libxml2 only</li> - <li>If you are not doing development, you can safely install both. - Usually the packages <a - href="http://rpmfind.net/linux/RPM/libxml.html">libxml</a> and <a - href="http://rpmfind.net/linux/RPM/libxml2.html">libxml2</a> are - compatible (this is not the case for development packages).</li> - <li>If you are a developer and your system provides separate packaging - for shared libraries and the development components, it is possible - to install libxml and libxml2, and also <a - href="http://rpmfind.net/linux/RPM/libxml-devel.html">libxml-devel</a> - and <a - href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml2-devel</a> - too for libxml2 >= 2.3.0</li> - <li>If you are developing a new application, please develop against - libxml2(-devel)</li> + <li>If you are not constrained by backward compatibility + issueswithexisting applications, install libxml2 only</li> + <li>If you are not doing development, you can safely + installboth.Usually the packages <a + href="http://rpmfind.net/linux/RPM/libxml.html">libxml</a>and <a + href="http://rpmfind.net/linux/RPM/libxml2.html">libxml2</a>arecompatible(this + is not the case for development packages).</li> + <li>If you are a developer and your system provides + separatepackagingfor shared libraries and the development components, + it ispossibleto install libxml and libxml2, and also <a + href="http://rpmfind.net/linux/RPM/libxml-devel.html">libxml-devel</a>and<a + href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml2-devel</a>toofor + libxml2 >= 2.3.0</li> + <li>If you are developing a new application, please + developagainstlibxml2(-devel)</li> </ul> </li> <li><em>I can't install the libxml package, it conflicts with libxml0</em> - <p>You probably have an old libxml0 package used to provide the shared - library for libxml.so.0, you can probably safely remove it. The libxml - packages provided on <a - href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> provide - libxml.so.0</p> + <p>You probably have an old libxml0 package used to provide + thesharedlibrary for libxml.so.0, you can probably safely remove it. + Thelibxmlpackages provided on <a + href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>providelibxml.so.0</p> </li> - <li><em>I can't install the libxml(2) RPM package due to failed - dependencies</em> - <p>The most generic solution is to re-fetch the latest src.rpm , and - rebuild it locally with</p> + <li><em>I can't install the libxml(2) RPM package due + tofaileddependencies</em> + <p>The most generic solution is to re-fetch the latest src.rpm + ,andrebuild it locally with</p> <p><code>rpm --rebuild libxml(2)-xxx.src.rpm</code>.</p> - <p>If everything goes well it will generate two binary rpm packages (one - providing the shared libs and xmllint, and the other one, the -devel - package, providing includes, static libraries and scripts needed to build - applications with libxml(2)) that you can install locally.</p> + <p>If everything goes well it will generate two binary rpm + packages(oneproviding the shared libs and xmllint, and the other one, + the-develpackage, providing includes, static libraries and scripts needed + tobuildapplications with libxml(2)) that you can install locally.</p> </li> </ol> @@ -256,123 +256,121 @@ libxml2</p> <p><code>./configure [possible options]</code></p> <p><code>make</code></p> <p><code>make install</code></p> - <p>At that point you may have to rerun ldconfig or a similar utility to - update your list of installed shared libs.</p> + <p>At that point you may have to rerun ldconfig or a similar + utilitytoupdate your list of installed shared libs.</p> </li> <li><em>What other libraries are needed to compile/install libxml2 ?</em> - <p>Libxml2 does not require any other library, the normal C ANSI API - should be sufficient (please report any violation to this rule you may - find).</p> - <p>However if found at configuration time libxml2 will detect and use the - following libs:</p> + <p>Libxml2 does not require any other library, the normal C ANSIAPIshould + be sufficient (please report any violation to this rule youmayfind).</p> + <p>However if found at configuration time libxml2 will detect and + usethefollowing libs:</p> <ul> - <li><a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a> : a - highly portable and available widely compression library.</li> - <li>iconv: a powerful character encoding conversion library. It is - included by default in recent glibc libraries, so it doesn't need to - be installed specifically on Linux. It now seems a <a - href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">part - of the official UNIX</a> specification. Here is one <a - href="http://www.gnu.org/software/libiconv/">implementation of the - library</a> which source can be found <a + <li><a + href="http://www.info-zip.org/pub/infozip/zlib/">libz</a>:ahighly + portable and available widely compression library.</li> + <li>iconv: a powerful character encoding conversion library. + Itisincluded by default in recent glibc libraries, so it doesn't + needtobe installed specifically on Linux. It now seems a <a + href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">partofthe + official UNIX</a>specification. Here is one <a + href="http://www.gnu.org/software/libiconv/">implementation + ofthelibrary</a>which source can be found <a href="ftp://ftp.ilog.fr/pub/Users/haible/gnu/">here</a>.</li> </ul> </li> <li><em>Make check fails on some platforms</em> - <p>Sometimes the regression tests' results don't completely match the - value produced by the parser, and the makefile uses diff to print the - delta. On some platforms the diff return breaks the compilation process; - if the diff is small this is probably not a serious problem.</p> - <p>Sometimes (especially on Solaris) make checks fail due to limitations - in make. Try using GNU-make instead.</p> + <p>Sometimes the regression tests' results don't completely matchthevalue + produced by the parser, and the makefile uses diff to printthedelta. On + some platforms the diff return breaks the compilationprocess;if the diff + is small this is probably not a serious problem.</p> + <p>Sometimes (especially on Solaris) make checks fail due tolimitationsin + make. Try using GNU-make instead.</p> </li> <li><em>I use the CVS version and there is no configure script</em> - <p>The configure script (and other Makefiles) are generated. Use the - autogen.sh script to regenerate the configure script and Makefiles, - like:</p> + <p>The configure script (and other Makefiles) are generated. + Usetheautogen.sh script to regenerate the configure script + andMakefiles,like:</p> <p><code>./autogen.sh --prefix=/usr --disable-shared</code></p> </li> <li><em>I have troubles when running make tests with gcc-3.0</em> - <p>It seems the initial release of gcc-3.0 has a problem with the - optimizer which miscompiles the URI module. Please use another - compiler.</p> + <p>It seems the initial release of gcc-3.0 has a problem withtheoptimizer + which miscompiles the URI module. Please useanothercompiler.</p> </li> </ol> -<h3><a name="Developer">Developer</a> corner</h3> +<h3><a name="Developer">Developer</a>corner</h3> <ol> <li><em>Troubles compiling or linking programs using libxml2</em> - <p>Usually the problem comes from the fact that the compiler doesn't get - the right compilation or linking flags. There is a small shell script - <code>xml2-config</code> which is installed as part of libxml2 usual - install process which provides those flags. Use</p> + <p>Usually the problem comes from the fact that the compiler + doesn'tgetthe right compilation or linking flags. There is a small + shellscript<code>xml2-config</code>which is installed as part of + libxml2usualinstall process which provides those flags. Use</p> <p><code>xml2-config --cflags</code></p> <p>to get the compilation flags and</p> <p><code>xml2-config --libs</code></p> - <p>to get the linker flags. Usually this is done directly from the - Makefile as:</p> + <p>to get the linker flags. Usually this is done directly fromtheMakefile + as:</p> <p><code>CFLAGS=`xml2-config --cflags`</code></p> <p><code>LIBS=`xml2-config --libs`</code></p> </li> - <li><em>I want to install my own copy of libxml2 in my home directory and - link my programs against it, but it doesn't work</em> - <p>There are many different ways to accomplish this. Here is one way to - do this under Linux. Suppose your home directory is <code>/home/user. - </code>Then:</p> + <li><em>I want to install my own copy of libxml2 in my home + directoryandlink my programs against it, but it doesn't work</em> + <p>There are many different ways to accomplish this. Here is one waytodo + this under Linux. Suppose your home directory + is<code>/home/user.</code>Then:</p> <ul> <li>Create a subdirectory, let's call it <code>myxml</code></li> <li>unpack the libxml2 distribution into that subdirectory</li> - <li>chdir into the unpacked distribution - (<code>/home/user/myxml/libxml2 </code>)</li> - <li>configure the library using the "<code>--prefix</code>" switch, - specifying an installation subdirectory in - <code>/home/user/myxml</code>, e.g. - <p><code>./configure --prefix /home/user/myxml/xmlinst</code> {other - configuration options}</p> + <li>chdir into the unpacked + distribution(<code>/home/user/myxml/libxml2</code>)</li> + <li>configure the library using the + "<code>--prefix</code>"switch,specifying an installation + subdirectoryin<code>/home/user/myxml</code>, e.g. + <p><code>./configure + --prefix/home/user/myxml/xmlinst</code>{otherconfiguration + options}</p> </li> - <li>now run <code>make</code> followed by <code>make install</code></li> - <li>At this point, the installation subdirectory contains the complete - "private" include files, library files and binary program files (e.g. - xmllint), located in - <p><code>/home/user/myxml/xmlinst/lib, - /home/user/myxml/xmlinst/include </code> and <code> - /home/user/myxml/xmlinst/bin</code></p> + <li>now run <code>make</code>followed by <code>make install</code></li> + <li>At this point, the installation subdirectory contains + thecomplete"private" include files, library files and binary + programfiles (e.g.xmllint), located in + <p><code>/home/user/myxml/xmlinst/lib,/home/user/myxml/xmlinst/include</code>and + <code>/home/user/myxml/xmlinst/bin</code></p> respectively.</li> - <li>In order to use this "private" library, you should first add it to - the beginning of your default PATH (so that your own private program - files such as xmllint will be used instead of the normal system - ones). To do this, the Bash command would be + <li>In order to use this "private" library, you should first add + ittothe beginning of your default PATH (so that your own + privateprogramfiles such as xmllint will be used instead of the + normalsystemones). To do this, the Bash command would be <p><code>export PATH=/home/user/myxml/xmlinst/bin:$PATH</code></p> </li> - <li>Now suppose you have a program <code>test1.c</code> that you would - like to compile with your "private" library. Simply compile it using - the command + <li>Now suppose you have a program <code>test1.c</code>that + youwouldlike to compile with your "private" library. Simply compile + itusingthe command <p><code>gcc `xml2-config --cflags --libs` -o test test.c</code></p> - Note that, because your PATH has been set with <code> - /home/user/myxml/xmlinst/bin</code> at the beginning, the xml2-config - program which you just installed will be used instead of the system - default one, and this will <em>automatically</em> get the correct - libraries linked with your program.</li> + Note that, because your PATH has been set + with<code>/home/user/myxml/xmlinst/bin</code>at the beginning, + thexml2-configprogram which you just installed will be used instead + ofthe systemdefault one, and this will <em>automatically</em>get + thecorrectlibraries linked with your program.</li> </ul> </li> <p></p> <li><em>xmlDocDump() generates output on one line.</em> - <p>Libxml2 will not <strong>invent</strong> spaces in the content of a - document since <strong>all spaces in the content of a document are - significant</strong>. If you build a tree from the API and want - indentation:</p> + <p>Libxml2 will not <strong>invent</strong>spaces in the content + ofadocument since <strong>all spaces in the content of a + documentaresignificant</strong>. If you build a tree from the API + andwantindentation:</p> <ol> <li>the correct way is to generate those yourself too.</li> - <li>the dangerous way is to ask libxml2 to add those blanks to your - content <strong>modifying the content of your document in the - process</strong>. The result may not be what you expect. There is - <strong>NO</strong> way to guarantee that such a modification won't - affect other parts of the content of your document. See <a - href="http://xmlsoft.org/html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault - ()</a> and <a - href="http://xmlsoft.org/html/libxml-tree.html#xmlSaveFormatFile">xmlSaveFormatFile - ()</a></li> + <li>the dangerous way is to ask libxml2 to add those blanks + toyourcontent <strong>modifying the content of your document + intheprocess</strong>. The result may not be what you expect. + Thereis<strong>NO</strong>way to guarantee that such a + modificationwon'taffect other parts of the content of your document. + See <a + href="http://xmlsoft.org/html/libxml-parser.html#xmlKeepBlanksDefault">xmlKeepBlanksDefault()</a>and<a + href="http://xmlsoft.org/html/libxml-tree.html#xmlSaveFormatFile">xmlSaveFormatFile()</a></li> </ol> </li> <li>Extra nodes in the document: @@ -382,10 +380,10 @@ libxml2</p> <NODE CommFlag="0"/> <NODE CommFlag="1"/> </PLAN></pre> - <p><em>after parsing it with the function - pxmlDoc=xmlParseFile(...);</em></p> - <p><em>I want to the get the content of the first node (node with the - CommFlag="0")</em></p> + <p><em>after parsing it with + thefunctionpxmlDoc=xmlParseFile(...);</em></p> + <p><em>I want to the get the content of the first node (node + withtheCommFlag="0")</em></p> <p><em>so I did it as following;</em></p> <pre>xmlNodePtr pnode; pnode=pxmlDoc->children->children;</pre> @@ -393,70 +391,70 @@ pnode=pxmlDoc->children->children;</pre> <pre>pnode=pxmlDoc->children->children->next;</pre> <p><em>then it works. Can someone explain it to me.</em></p> <p></p> - <p>In XML all characters in the content of the document are significant - <strong>including blanks and formatting line breaks</strong>.</p> - <p>The extra nodes you are wondering about are just that, text nodes with - the formatting spaces which are part of the document but that people tend - to forget. There is a function <a - href="http://xmlsoft.org/html/libxml-parser.html">xmlKeepBlanksDefault - ()</a> to remove those at parse time, but that's an heuristic, and its - use should be limited to cases where you are certain there is no - mixed-content in the document.</p> + <p>In XML all characters in the content of the document + aresignificant<strong>including blanks and formatting + linebreaks</strong>.</p> + <p>The extra nodes you are wondering about are just that, text + nodeswiththe formatting spaces which are part of the document but that + peopletendto forget. There is a function <a + href="http://xmlsoft.org/html/libxml-parser.html">xmlKeepBlanksDefault()</a>toremove + those at parse time, but that's an heuristic, and itsuse should belimited + to cases where you are certain there is nomixed-content in + thedocument.</p> </li> - <li><em>I get compilation errors of existing code like when accessing - <strong>root</strong> or <strong>child fields</strong> of nodes.</em> - <p>You are compiling code developed for libxml version 1 and using a - libxml2 development environment. Either switch back to libxml v1 devel or - even better fix the code to compile with libxml2 (or both) by <a + <li><em>I get compilation errors of existing code like + whenaccessing<strong>root</strong>or <strong>child + fields</strong>ofnodes.</em> + <p>You are compiling code developed for libxml version 1 and + usingalibxml2 development environment. Either switch back to libxml v1 + develoreven better fix the code to compile with libxml2 (or both) by <a href="upgrade.html">following the instructions</a>.</p> </li> - <li><em>I get compilation errors about non existing - <strong>xmlRootNode</strong> or <strong>xmlChildrenNode</strong> - fields.</em> + <li><em>I get compilation errors about + nonexisting<strong>xmlRootNode</strong>or<strong>xmlChildrenNode</strong>fields.</em> <p>The source code you are using has been <a - href="upgrade.html">upgraded</a> to be able to compile with both libxml - and libxml2, but you need to install a more recent version: - libxml(-devel) >= 1.8.8 or libxml2(-devel) >= 2.1.0</p> + href="upgrade.html">upgraded</a>to be able to compile with both + libxmlandlibxml2, but you need to install a more recent + version:libxml(-devel)>= 1.8.8 or libxml2(-devel) >= 2.1.0</p> </li> <li><em>XPath implementation looks seriously broken</em> - <p>XPath implementation prior to 2.3.0 was really incomplete. Upgrade to - a recent version, there are no known bugs in the current version.</p> + <p>XPath implementation prior to 2.3.0 was really incomplete. Upgrade + toarecent version, there are no known bugs in the current version.</p> </li> <li><em>The example provided in the web page does not compile.</em> - <p>It's hard to maintain the documentation in sync with the code - <grin/> ...</p> - <p>Check the previous points 1/ and 2/ raised before, and please send - patches.</p> + <p>It's hard to maintain the documentation in sync with + thecode<grin/> ...</p> + <p>Check the previous points 1/ and 2/ raised before, and + pleasesendpatches.</p> </li> - <li><em>Where can I get more examples and information than provided on the - web page?</em> - <p>Ideally a libxml2 book would be nice. I have no such plan ... But you - can:</p> + <li><em>Where can I get more examples and information than provided + ontheweb page?</em> + <p>Ideally a libxml2 book would be nice. I have no such plan ... + Butyoucan:</p> <ul> - <li>check more deeply the <a href="html/libxml-lib.html">existing - generated doc</a></li> - <li>have a look at <a href="examples/index.html">the set of - examples</a>.</li> - <li>look for examples of use for libxml2 function using the Gnome code. - For example the following will query the full Gnome CVS base for the - use of the <strong>xmlAddChild()</strong> function: + <li>check more deeply the <a + href="html/libxml-lib.html">existinggenerated doc</a></li> + <li>have a look at <a href="examples/index.html">the + setofexamples</a>.</li> + <li>look for examples of use for libxml2 function using the + Gnomecode.For example the following will query the full Gnome CVS + base fortheuse of the <strong>xmlAddChild()</strong>function: <p><a href="http://cvs.gnome.org/lxr/search?string=xmlAddChild">http://cvs.gnome.org/lxr/search?string=xmlAddChild</a></p> - <p>This may be slow, a large hardware donation to the gnome project - could cure this :-)</p> + <p>This may be slow, a large hardware donation to the + gnomeprojectcould cure this :-)</p> </li> <li><a - href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&dir=gnome-xml">Browse - the libxml2 source</a> , I try to write code as clean and documented - as possible, so looking at it may be helpful. In particular the code - of xmllint.c and of the various testXXX.c test programs should - provide good examples of how to do things with the library.</li> + href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&dir=gnome-xml">Browsethelibxml2 + source</a>, I try to write code as clean and documentedaspossible, so + looking at it may be helpful. In particular the codeofxmllint.c and + of the various testXXX.c test programs shouldprovidegood examples of + how to do things with the library.</li> </ul> </li> <li>What about C++ ? - <p>libxml2 is written in pure C in order to allow easy reuse on a number - of platforms, including embedded systems. I don't intend to convert to - C++.</p> + <p>libxml2 is written in pure C in order to allow easy reuse on anumberof + platforms, including embedded systems. I don't intend to converttoC++.</p> <p>There is however a C++ wrapper which may fulfill your needs:</p> <ul> <li>by Ari Johnson <ari@btigate.com>: @@ -474,12 +472,11 @@ pnode=pxmlDoc->children->children;</pre> </ul> </li> <li>How to validate a document a posteriori ? - <p>It is possible to validate documents which had not been validated at - initial parsing time or documents which have been built from scratch - using the API. Use the <a - href="http://xmlsoft.org/html/libxml-valid.html#xmlValidateDtd">xmlValidateDtd()</a> - function. It is also possible to simply add a DTD to an existing - document:</p> + <p>It is possible to validate documents which had not been + validatedatinitial parsing time or documents which have been built + fromscratchusing the API. Use the <a + href="http://xmlsoft.org/html/libxml-valid.html#xmlValidateDtd">xmlValidateDtd()</a>function.It + is also possible to simply add a DTD to an existingdocument:</p> <pre>xmlDocPtr doc; /* your existing document */ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */ @@ -491,10 +488,10 @@ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */ </pre> </li> <li>So what is this funky "xmlChar" used all the time? - <p>It is a null terminated sequence of utf-8 characters. And only utf-8! - You need to convert strings encoded in different ways to utf-8 before - passing them to the API. This can be accomplished with the iconv library - for instance.</p> + <p>It is a null terminated sequence of utf-8 characters. And + onlyutf-8!You need to convert strings encoded in different ways to + utf-8beforepassing them to the API. This can be accomplished with the + iconvlibraryfor instance.</p> </li> <li>etc ...</li> </ol> @@ -505,190 +502,193 @@ xmlDtdPtr dtd = xmlParseDTD(NULL, filename_of_dtd); /* parse the DTD */ <p>There are several on-line resources related to using libxml:</p> <ol> - <li>Use the <a href="search.php">search engine</a> to look up - information.</li> + <li>Use the <a href="search.php">search engine</a>to lookupinformation.</li> <li>Check the <a href="FAQ.html">FAQ.</a></li> - <li>Check the <a href="http://xmlsoft.org/html/libxml-lib.html">extensive - documentation</a> automatically extracted from code comments.</li> - <li>Look at the documentation about <a href="encoding.html">libxml - internationalization support</a>.</li> - <li>This page provides a global overview and <a href="example.html">some - examples</a> on how to use libxml.</li> + <li>Check the <a + href="http://xmlsoft.org/html/libxml-lib.html">extensivedocumentation</a>automaticallyextracted + from code comments.</li> + <li>Look at the documentation about <a + href="encoding.html">libxmlinternationalization support</a>.</li> + <li>This page provides a global overview and <a + href="example.html">someexamples</a>on how to use libxml.</li> <li><a href="examples/index.html">Code examples</a></li> - <li>John Fleck's libxml2 tutorial: <a href="tutorial/index.html">html</a> - or <a href="tutorial/xmltutorial.pdf">pdf</a>.</li> + <li>John Fleck's libxml2 tutorial: <a + href="tutorial/index.html">html</a>or<a + href="tutorial/xmltutorial.pdf">pdf</a>.</li> <li>If you need to parse large files, check the <a - href="xmlreader.html">xmlReader</a> API tutorial</li> - <li><a href="mailto:james@daa.com.au">James Henstridge</a> wrote <a - href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">some nice - documentation</a> explaining how to use the libxml SAX interface.</li> + href="xmlreader.html">xmlReader</a>API tutorial</li> + <li><a href="mailto:james@daa.com.au">James Henstridge</a>wrote <a + href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">somenicedocumentation</a>explaining + how to use the libxml SAX interface.</li> <li>George Lebl wrote <a - href="http://www-106.ibm.com/developerworks/library/l-gnome3/">an article - for IBM developerWorks</a> about using libxml.</li> - <li>Check <a href="http://cvs.gnome.org/lxr/source/gnome-xml/TODO">the TODO - file</a>.</li> - <li>Read the <a href="upgrade.html">1.x to 2.x upgrade path</a> - description. If you are starting a new project using libxml you should - really use the 2.x version.</li> + href="http://www-106.ibm.com/developerworks/library/l-gnome3/">anarticlefor + IBM developerWorks</a>about using libxml.</li> + <li>Check <a + href="http://cvs.gnome.org/lxr/source/gnome-xml/TODO">theTODOfile</a>.</li> + <li>Read the <a href="upgrade.html">1.x to 2.x upgrade + path</a>description.If you are starting a new project using libxml you + shouldreally use the2.x version.</li> <li>And don't forget to look at the <a href="http://mail.gnome.org/archives/xml/">mailing-list archive</a>.</li> </ol> <h2><a name="Reporting">Reporting bugs and getting help</a></h2> -<p>Well, bugs or missing features are always possible, and I will make a -point of fixing them in a timely fashion. The best way to report a bug is to -use the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnome -bug tracking database</a> (make sure to use the "libxml2" module name). I -look at reports there regularly and it's good to have a reminder when a bug -is still open. Be sure to specify that the bug is for the package libxml2.</p> +<p>Well, bugs or missing features are always possible, and I will make +apointof fixing them in a timely fashion. The best way to report a bug is +touse the<a +href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnomebugtracking +database</a>(make sure to use the "libxml2" module name). Ilook atreports +there regularly and it's good to have a reminder when a bugis stillopen. Be +sure to specify that the bug is for the package libxml2.</p> -<p>For small problems you can try to get help on IRC, the #xml channel on -irc.gnome.org (port 6667) usually have a few person subscribed which may help -(but there is no garantee and if a real issue is raised it should go on the -mailing-list for archival).</p> +<p>For small problems you can try to get help on IRC, the #xml +channelonirc.gnome.org (port 6667) usually have a few person subscribed which +mayhelp(but there is no garantee and if a real issue is raised it should go +onthemailing-list for archival).</p> <p>There is also a mailing-list <a -href="mailto:xml@gnome.org">xml@gnome.org</a> for libxml, with an <a -href="http://mail.gnome.org/archives/xml/">on-line archive</a> (<a -href="http://xmlsoft.org/messages">old</a>). To subscribe to this list, -please visit the <a -href="http://mail.gnome.org/mailman/listinfo/xml">associated Web</a> page and -follow the instructions. <strong>Do not send code, I won't debug it</strong> -(but patches are really appreciated!).</p> - -<p>Please note that with the current amount of virus and SPAM, sending mail -to the list without being subscribed won't work. There is *far too many -bounces* (in the order of a thousand a day !) I cannot approve them manually -anymore. If your mail to the list bounced waiting for administrator approval, -it is LOST ! Repost it and fix the problem triggering the error. Also please -note that <span style="color: #FF0000; background-color: #FFFFFF">emails with -a legal warning asking to not copy or redistribute freely the informations -they contain</span> are <strong>NOT</strong> acceptable for the mailing-list, -such mail will as much as possible be discarded automatically, and are less -likely to be answered if they made it to the list, <strong>DO NOT</strong> -post to the list from an email address where such legal requirements are -automatically added, get private paying support if you can't share -informations.</p> - -<p>Check the following <strong><span style="color: #FF0000">before -posting</span></strong>:</p> -<ul> - <li>Read the <a href="FAQ.html">FAQ</a> and <a href="search.php">use the - search engine</a> to get information related to your problem.</li> - <li>Make sure you are <a href="ftp://xmlsoft.org/libxml2/">using a recent - version</a>, and that the problem still shows up in a recent version.</li> - <li>Check the <a href="http://mail.gnome.org/archives/xml/">list - archives</a> to see if the problem was reported already. In this case - there is probably a fix available, similarly check the <a - href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">registered - open bugs</a>.</li> - <li>Make sure you can reproduce the bug with xmllint or one of the test - programs found in source in the distribution.</li> - <li>Please send the command showing the error as well as the input (as an - attachment)</li> +href="mailto:xml@gnome.org">xml@gnome.org</a>for libxml, with an <a +href="http://mail.gnome.org/archives/xml/">on-line archive</a>(<a +href="http://xmlsoft.org/messages">old</a>). To subscribe to this +list,pleasevisit the <a +href="http://mail.gnome.org/mailman/listinfo/xml">associatedWeb</a>page +andfollow the instructions. <strong>Do not send code, I won'tdebug +it</strong>(but patches are really appreciated!).</p> + +<p>Please note that with the current amount of virus and SPAM, sending +mailtothe list without being subscribed won't work. There is *far too +manybounces*(in the order of a thousand a day !) I cannot approve them +manuallyanymore.If your mail to the list bounced waiting for administrator +approval,it isLOST ! Repost it and fix the problem triggering the error. Also +pleasenotethat <span style="color: #FF0000; background-color: #FFFFFF">emails +withalegal warning asking to not copy or redistribute freely the +informationstheycontain</span>are <strong>NOT</strong>acceptable for the +mailing-list,suchmail will as much as possible be discarded automatically, +and are lesslikelyto be answered if they made it to the list, <strong>DO +NOT</strong>post tothe list from an email address where such legal +requirements areautomaticallyadded, get private paying support if you can't +shareinformations.</p> + +<p>Check the following <strong><span +style="color: #FF0000">beforeposting</span></strong>:</p> +<ul> + <li>Read the <a href="FAQ.html">FAQ</a>and <a + href="search.php">usethesearch engine</a>to get information related to + your problem.</li> + <li>Make sure you are <a href="ftp://xmlsoft.org/libxml2/">using + arecentversion</a>, and that the problem still shows up in a + recentversion.</li> + <li>Check the <a + href="http://mail.gnome.org/archives/xml/">listarchives</a>to see if + theproblem was reported already. In this casethere is probably a + fixavailable, similarly check the <a + href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">registeredopenbugs</a>.</li> + <li>Make sure you can reproduce the bug with xmllint or one of + thetestprograms found in source in the distribution.</li> + <li>Please send the command showing the error as well as the input + (asanattachment)</li> </ul> <p>Then send the bug with associated information to reproduce it to the <a -href="mailto:xml@gnome.org">xml@gnome.org</a> list; if it's really libxml -related I will approve it. Please do not send mail to me directly, it makes -things really hard to track and in some cases I am not the best person to -answer a given question, ask on the list.</p> +href="mailto:xml@gnome.org">xml@gnome.org</a>list; if it's +reallylibxmlrelated I will approve it. Please do not send mail to me +directly, itmakesthings really hard to track and in some cases I am not the +best persontoanswer a given question, ask on the list.</p> <p>To <span style="color: #E50000">be really clear about support</span>:</p> <ul> - <li>Support or help <span style="color: #E50000">requests MUST be sent to - the list or on bugzilla</span> in case of problems, so that the Question - and Answers can be shared publicly. Failing to do so carries the implicit - message "I want free support but I don't want to share the benefits with - others" and is not welcome. I will automatically Carbon-Copy the - xml@gnome.org mailing list for any technical reply made about libxml2 or - libxslt.</li> - <li>There is <span style="color: #E50000">no garantee of support</span>, if - your question remains unanswered after a week, repost it, making sure you - gave all the detail needed and the information requested.</li> - <li>Failing to provide information as requested or double checking first - for prior feedback also carries the implicit message "the time of the - library maintainers is less valuable than my time" and might not be - welcome.</li> -</ul> - -<p>Of course, bugs reported with a suggested patch for fixing them will -probably be processed faster than those without.</p> + <li>Support or help <span style="color: #E50000">requests MUST be senttothe + list or on bugzilla</span>in case of problems, so that theQuestionand + Answers can be shared publicly. Failing to do so carries + theimplicitmessage "I want free support but I don't want to share + thebenefits withothers" and is not welcome. I will automatically + Carbon-Copythexml@gnome.org mailing list for any technical reply made + about libxml2orlibxslt.</li> + <li>There is <span style="color: #E50000">no garantee of + support</span>,ifyour question remains unanswered after a week, repost + it, making sureyougave all the detail needed and the information + requested.</li> + <li>Failing to provide information as requested or double checking + firstforprior feedback also carries the implicit message "the time of + thelibrarymaintainers is less valuable than my time" and might not + bewelcome.</li> +</ul> + +<p>Of course, bugs reported with a suggested patch for fixing +themwillprobably be processed faster than those without.</p> <p>If you're looking for help, a quick look at <a -href="http://mail.gnome.org/archives/xml/">the list archive</a> may actually -provide the answer. I usually send source samples when answering libxml2 -usage questions. The <a -href="http://xmlsoft.org/html/book1.html">auto-generated documentation</a> is -not as polished as I would like (i need to learn more about DocBook), but -it's a good starting point.</p> +href="http://mail.gnome.org/archives/xml/">the list +archive</a>mayactuallyprovide the answer. I usually send source samples when +answeringlibxml2usage questions. The <a +href="http://xmlsoft.org/html/book1.html">auto-generateddocumentation</a>isnot +as polished as I would like (i need to learn moreabout DocBook), butit's a +good starting point.</p> <h2><a name="help">How to help</a></h2> -<p>You can help the project in various ways, the best thing to do first is to -subscribe to the mailing-list as explained before, check the <a +<p>You can help the project in various ways, the best thing to do first +istosubscribe to the mailing-list as explained before, check the <a href="http://mail.gnome.org/archives/xml/">archives </a>and the <a -href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnome bug -database</a>:</p> +href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Gnomebugdatabase</a>:</p> <ol> <li>Provide patches when you find problems.</li> - <li>Provide the diffs when you port libxml2 to a new platform. They may not - be integrated in all cases but help pinpointing portability problems - and</li> - <li>Provide documentation fixes (either as patches to the code comments or - as HTML diffs).</li> - <li>Provide new documentations pieces (translations, examples, etc - ...).</li> + <li>Provide the diffs when you port libxml2 to a new platform. They + maynotbe integrated in all cases but help pinpointing + portabilityproblemsand</li> + <li>Provide documentation fixes (either as patches to the code commentsoras + HTML diffs).</li> + <li>Provide new documentations pieces (translations, examples, etc...).</li> <li>Check the TODO file and try to close one of the items.</li> - <li>Take one of the points raised in the archive or the bug database and - provide a fix. <a href="mailto:daniel@veillard.com">Get in touch with me - </a>before to avoid synchronization problems and check that the suggested - fix will fit in nicely :-)</li> + <li>Take one of the points raised in the archive or the bug + databaseandprovide a fix. <a href="mailto:daniel@veillard.com">Get in + touch withme</a>before to avoid synchronization problems and check that + thesuggestedfix will fit in nicely :-)</li> </ol> <h2><a name="Downloads">Downloads</a></h2> <p>The latest versions of libxml2 can be found on the <a -href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a> server ( <a +href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>server ( <a href="http://xmlsoft.org/sources/">HTTP</a>, <a -href="ftp://xmlsoft.org/libxml2/">FTP</a> and rsync are available), there is also -mirrors (<a href="ftp://ftp.planetmirror.com/pub/xmlsoft/">Australia</a>( <a +href="ftp://xmlsoft.org/libxml2/">FTP</a>and rsync are available), there +isalsomirrors (<a +href="ftp://ftp.planetmirror.com/pub/xmlsoft/">Australia</a>(<a href="http://xmlsoft.planetmirror.com/">Web</a>), <a href="ftp://fr.rpmfind.net/pub/libxml/">France</a>) or on the <a -href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a> as <a -href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">source archive</a> -, Antonin Sprinzl also provide <a href="ftp://gd.tuwien.ac.at/pub/libxml/">a -mirror in Austria</a>. (NOTE that you need both the <a -href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a> and <a -href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a> -packages installed to compile applications using libxml.)</p> +href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a>as <a +href="ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/">source +archive</a>,Antonin Sprinzl also provide <a +href="ftp://gd.tuwien.ac.at/pub/libxml/">amirror in Austria</a>. (NOTE +thatyou need both the <a +href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a>and <a +href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a>packagesinstalled +to compile applications using libxml.)</p> <p>You can find all the history of libxml(2) and libxslt releases in the <a -href="http://xmlsoft.org/sources/old/">old</a> directory. The precompiled -Windows binaries made by Igor Zlatovic are available in the <a -href="http://xmlsoft.org/sources/win32/">win32</a> directory.</p> +href="http://xmlsoft.org/sources/old/">old</a>directory. +TheprecompiledWindows binaries made by Igor Zlatovic are available in the <a +href="http://xmlsoft.org/sources/win32/">win32</a>directory.</p> <p>Binary ports:</p> <ul> <li>Red Hat RPMs for i386 are available directly on <a - href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>, the source RPM will compile on - any architecture supported by Red Hat.</li> - <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a> is now the - maintainer of the Windows port, <a - href="http://www.zlatkovic.com/projects/libxml/index.html">he provides - binaries</a>.</li> + href="ftp://xmlsoft.org/libxml2/">xmlsoft.org</a>, the source RPM + willcompile onany architecture supported by Red Hat.</li> + <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>is + nowthemaintainer of the Windows port, <a + href="http://www.zlatkovic.com/projects/libxml/index.html">heprovidesbinaries</a>.</li> <li>Blastwave provides <a - href="http://www.blastwave.org/packages.php/libxml2">Solaris - binaries</a>.</li> - <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a> provides <a - href="http://www.explain.com.au/oss/libxml2xslt.html">Mac Os X - binaries</a>.</li> + href="http://www.blastwave.org/packages.php/libxml2">Solarisbinaries</a>.</li> + <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a>provides <a + href="http://www.explain.com.au/oss/libxml2xslt.html">Mac + OsXbinaries</a>.</li> <li>The HP-UX porting center provides <a href="http://hpux.connect.org.uk/hppd/hpux/Gnome/">HP-UX binaries</a></li> <li>Bull provides precompiled <a - href="http://gnome.bullfreeware.com/new_index.html">RPMs for AIX</a> as - patr of their GNOME packages</li> + href="http://gnome.bullfreeware.com/new_index.html">RPMs forAIX</a>aspatr + of their GNOME packages</li> </ul> <p>If you know other supported binary ports, please <a @@ -704,474 +704,501 @@ href="http://veillard.com/">contact me</a>.</p> <p><a name="Contribs">Contributions:</a></p> -<p>I do accept external contributions, especially if compiling on another -platform, get in touch with the list to upload the package, wrappers for -various languages have been provided, and can be found in the <a +<p>I do accept external contributions, especially if compiling +onanotherplatform, get in touch with the list to upload the package, +wrappersforvarious languages have been provided, and can be found in the <a href="python.html">bindings section</a></p> <p>Libxml2 is also available from CVS:</p> <ul> - <li><p>The <a href="http://cvs.gnome.org/viewcvs/libxml2/">Gnome CVS - base</a>. Check the <a - href="http://developer.gnome.org/tools/cvs.html">Gnome CVS Tools</a> - page; the CVS module is <b>libxml2</b>.</p> + <li><p>The <a + href="http://cvs.gnome.org/viewcvs/libxml2/">GnomeCVSbase</a>. Check the + <a href="http://developer.gnome.org/tools/cvs.html">Gnome CVS + Tools</a>page;the CVS module is <b>libxml2</b>.</p> </li> - <li>The <strong>libxslt</strong> module is also present there</li> + <li>The <strong>libxslt</strong>module is also present there</li> </ul> <h2><a name="News">Releases</a></h2> -<p>Items not finished and worked on, get in touch with the list if you want -to help those</p> +<p>Items not finished and worked on, get in touch with the list if you +wanttohelp those</p> <ul> <li>More testing on RelaxNG</li> - <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML - Schemas</a></li> + <li>Finishing up <a + href="http://www.w3.org/TR/xmlschema-1/">XMLSchemas</a></li> </ul> -<p>The <a href="ChangeLog.html">change log</a> describes the recents commits -to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> +<p>The <a href="ChangeLog.html">change log</a>describes the recents +commitstothe <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a>code +base.</p> <p>There is the list of public releases:</p> +<h3>2.6.26: Jun 6 2006</h3> +<ul> + <li>portability fixes: Python detection (Joseph Sacco), compilation + error(William Brack and Graham Bennett), LynxOS patch (Olli Savia)</li> + <li>bug fixes: encoding buffer problem, mix of code and data in + xmlIO.c(Kjartan Maraas), entities in XSD validation (Kasimier Buchcik), + variousXSD validation fixes (Kasimier), memory leak in pattern (Rob + Richards andKasimier), attribute with colon in name (Rob Richards), XPath + leak inerror reporting (Aleksey Sanin), XInclude text include of + selfdocument.</li> + <li>improvements: Xpath optimizations (Kasimier), XPath object + cache(Kasimier)</li> +</ul> + +<h3>2.6.25: Jun 6 2006:</h3> + +<p>Do not use or package 2.6.25</p> + <h3>2.6.24: Apr 28 2006</h3> <ul> - <li>Portability fixes: configure on Windows, testapi compile on windows - (Kasimier Buchcik, venkat naidu), Borland C++ 6 compile (Eric Zurcher), - HP-UX compiler workaround (Rick Jones), xml2-config bugfix, gcc-4.1 - cleanups, Python detection scheme (Joseph Sacco), UTF-8 file paths on - Windows (Roland Schwingel). - </li> - <li>Improvements: xmlDOMWrapReconcileNamespaces xmlDOMWrapCloneNode (Kasimier - Buchcik), XML catalog debugging (Rick Jones), update to Unicode 4.01.</li> - <li>Bug fixes: xmlParseChunk() problem in 2.6.23, xmlParseInNodeContext() - on HTML docs, URI behaviour on Windows (Rob Richards), comment streaming - bug, xmlParseComment (with William Brack), regexp bug fixes (DV & - Youri Golovanov), xmlGetNodePath on text/CDATA (Kasimier), - one Relax-NG interleave bug, xmllint --path and --valid, - XSD bugfixes (Kasimier), remove debug - left in Python bindings (Nic Ferrier), xmlCatalogAdd bug (Martin Cole), - xmlSetProp fixes (Rob Richards), HTML IDness (Rob Richards), a large - number of cleanups and small fixes based on Coverity reports, bug - in character ranges, Unicode tables const (Aivars Kalvans), schemas - fix (Stefan Kost), xmlRelaxNGParse error deallocation, - xmlSchemaAddSchemaDoc error deallocation, error handling on unallowed - code point, ixmllint --nonet to never reach the net (Gary Coady), - line break in writer after end PI (Jason Viers). </li> + <li>Portability fixes: configure on Windows, testapi compile + onwindows(Kasimier Buchcik, venkat naidu), Borland C++ 6 compile + (EricZurcher),HP-UX compiler workaround (Rick Jones), xml2-config + bugfix,gcc-4.1cleanups, Python detection scheme (Joseph Sacco), UTF-8 + file pathsonWindows (Roland Schwingel).</li> + <li>Improvements: xmlDOMWrapReconcileNamespaces + xmlDOMWrapCloneNode(KasimierBuchcik), XML catalog debugging (Rick Jones), + update to Unicode4.01.</li> + <li>Bug fixes: xmlParseChunk() problem in 2.6.23, + xmlParseInNodeContext()onHTML docs, URI behaviour on Windows (Rob + Richards), comment streamingbug,xmlParseComment (with William Brack), + regexp bug fixes (DV &YouriGolovanov), xmlGetNodePath on text/CDATA + (Kasimier),one Relax-NGinterleave bug, xmllint --path and --valid,XSD + bugfixes (Kasimier),remove debugleft in Python bindings (Nic Ferrier), + xmlCatalogAdd bug(Martin Cole),xmlSetProp fixes (Rob Richards), HTML + IDness (RobRichards), a largenumber of cleanups and small fixes based on + Coverityreports, bugin character ranges, Unicode tables const (Aivars + Kalvans),schemasfix (Stefan Kost), xmlRelaxNGParse + errordeallocation,xmlSchemaAddSchemaDoc error deallocation, error + handling onunallowedcode point, ixmllint --nonet to never reach the net + (GaryCoady),line break in writer after end PI (Jason Viers).</li> <li>Documentation: man pages updates and cleanups (Daniel Leidert).</li> <li>New features: Relax NG structure error handlers.</li> </ul> <h3>2.6.23: Jan 5 2006</h3> <ul> - <li>portability fixes: Windows (Rob Richards), getaddrinfo on Windows - (Kolja Nowak, Rob Richards), icc warnings (Kjartan Maraas), - --with-minimum compilation fixes (William Brack), error case handling fix - on Solaris (Albert Chin), don't use 'list' as parameter name reported by - Samuel Diaz Garcia, more old Unices portability fixes (Albert Chin), - MinGW compilation (Mark Junker), HP-UX compiler warnings (Rick - Jones),</li> - <li>code cleanup: xmlReportError (Adrian Mouat), remove xmlBufferClose - (Geert Jansen), unreachable code (Oleksandr Kononenko), refactoring - parsing code (Bjorn Reese)</li> - <li>bug fixes: xmlBuildRelativeURI and empty path (William Brack), - combinatory explosion and performances in regexp code, leak in - xmlTextReaderReadString(), xmlStringLenDecodeEntities problem (Massimo - Morara), Identity Constraints bugs and a segfault (Kasimier Buchcik), - XPath pattern based evaluation bugs (DV & Kasimier), - xmlSchemaContentModelDump() memory leak (Kasimier), potential leak in - xmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() misuse of - vsnprintf (William Brack), XHTML serialization fix (Rob Richards), CRLF - split problem (William), issues with non-namespaced attributes in - xmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() (Rob Richards), - HTML parsing of script, Python must not output to stdout (Nic Ferrier), - exclusive C14N namespace visibility (Aleksey Sanin), XSD dataype - totalDigits bug (Kasimier Buchcik), error handling when writing to an - xmlBuffer (Rob Richards), runtest schemas error not reported (Hisashi - Fujinaka), signed/unsigned problem in date/time code (Albert Chin), fix - XSI driven XSD validation (Kasimier), parsing of xs:decimal (Kasimier), - fix DTD writer output (Rob Richards), leak in xmlTextReaderReadInnerXml - (Gary Coady), regexp bug affecting schemas (Kasimier), configuration of - runtime debugging (Kasimier), xmlNodeBufGetContent bug on entity refs - (Oleksandr Kononenko), xmlRegExecPushString2 bug (Sreeni Nair), - compilation and build fixes (Michael Day), removed dependancies on - xmlSchemaValidError (Kasimier), bug with <xml:foo/>, more XPath - pattern based evaluation fixes (Kasimier)</li> - <li>improvements: XSD Schemas redefinitions/restrictions (Kasimier - Buchcik), node copy checks and fix for attribute (Rob Richards), counted - transition bug in regexps, ctxt->standalone = -2 to indicate no - standalone attribute was found, add xmlSchemaSetParserStructuredErrors() - (Kasimier Buchcik), add xmlTextReaderSchemaValidateCtxt() to API - (Kasimier), handle gzipped HTTP resources (Gary Coady), add - htmlDocDumpMemoryFormat. (Rob Richards),</li> - <li>documentation: typo (Michael Day), libxml man page (Albert Chin), save - function to XML buffer (Geert Jansen), small doc fix (Aron Stansvik),</li> + <li>portability fixes: Windows (Rob Richards), getaddrinfo on + Windows(KoljaNowak, Rob Richards), icc warnings (Kjartan + Maraas),--with-minimumcompilation fixes (William Brack), error case + handling fixon Solaris(Albert Chin), don't use 'list' as parameter name + reported bySamuel DiazGarcia, more old Unices portability fixes (Albert + Chin),MinGW compilation(Mark Junker), HP-UX compiler warnings + (RickJones),</li> + <li>code cleanup: xmlReportError (Adrian Mouat), removexmlBufferClose(Geert + Jansen), unreachable code (Oleksandr Kononenko),refactoringparsing code + (Bjorn Reese)</li> + <li>bug fixes: xmlBuildRelativeURI and empty path + (WilliamBrack),combinatory explosion and performances in regexp code, + leakinxmlTextReaderReadString(), xmlStringLenDecodeEntities + problem(MassimoMorara), Identity Constraints bugs and a segfault + (KasimierBuchcik),XPath pattern based evaluation bugs (DV + &Kasimier),xmlSchemaContentModelDump() memory leak (Kasimier), + potentialleak inxmlSchemaCheckCSelectorXPath(), xmlTextWriterVSprintf() + misuseofvsnprintf (William Brack), XHTML serialization fix (Rob + Richards),CRLFsplit problem (William), issues with non-namespaced + attributesinxmlAddChild() xmlAddNextSibling() and xmlAddPrevSibling() + (RobRichards),HTML parsing of script, Python must not output to stdout + (NicFerrier),exclusive C14N namespace visibility (Aleksey Sanin), + XSDdataypetotalDigits bug (Kasimier Buchcik), error handling when writing + toanxmlBuffer (Rob Richards), runtest schemas error not + reported(HisashiFujinaka), signed/unsigned problem in date/time code + (AlbertChin), fixXSI driven XSD validation (Kasimier), parsing of + xs:decimal(Kasimier),fix DTD writer output (Rob Richards), leak + inxmlTextReaderReadInnerXml(Gary Coady), regexp bug affecting + schemas(Kasimier), configuration ofruntime debugging + (Kasimier),xmlNodeBufGetContent bug on entity refs(Oleksandr + Kononenko),xmlRegExecPushString2 bug (Sreeni Nair),compilation and build + fixes(Michael Day), removed dependancies onxmlSchemaValidError + (Kasimier), bugwith <xml:foo/>, more XPathpattern based evaluation + fixes(Kasimier)</li> + <li>improvements: XSD Schemas redefinitions/restrictions + (KasimierBuchcik),node copy checks and fix for attribute (Rob Richards), + countedtransitionbug in regexps, ctxt->standalone = -2 to indicate + nostandaloneattribute was found, add + xmlSchemaSetParserStructuredErrors()(KasimierBuchcik), add + xmlTextReaderSchemaValidateCtxt() to API(Kasimier), handlegzipped HTTP + resources (Gary Coady), addhtmlDocDumpMemoryFormat. (RobRichards),</li> + <li>documentation: typo (Michael Day), libxml man page (Albert + Chin),savefunction to XML buffer (Geert Jansen), small doc fix + (AronStansvik),</li> </ul> <h3>2.6.22: Sep 12 2005</h3> <ul> <li>build fixes: compile without schematron (Stéphane Bidoul)</li> - <li>bug fixes: xmlDebugDumpNode on namespace node (Oleg Paraschenko)i, - CDATA push parser bug, xmlElemDump problem with XHTML1 doc, - XML_FEATURE_xxx clash with expat headers renamed XML_WITH_xxx, fix some - output formatting for meta element (Rob Richards), script and style - XHTML1 serialization (David Madore), Attribute derivation fixups in XSD - (Kasimier Buchcik), better IDC error reports (Kasimier Buchcik)</li> - <li>improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob Richards), add - XML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements preparing for - derive (Kasimier Buchcik).</li> - <li>documentation: generation of gtk-doc like docs, integration with - devhelp.</li> + <li>bug fixes: xmlDebugDumpNode on namespace node (Oleg + Paraschenko)i,CDATApush parser bug, xmlElemDump problem with XHTML1 + doc,XML_FEATURE_xxxclash with expat headers renamed XML_WITH_xxx, fix + someoutput formattingfor meta element (Rob Richards), script and + styleXHTML1 serialization(David Madore), Attribute derivation fixups in + XSD(Kasimier Buchcik),better IDC error reports (Kasimier Buchcik)</li> + <li>improvements: add XML_SAVE_NO_EMPTY xmlSaveOption (Rob + Richards),addXML_SAVE_NO_XHTML xmlSaveOption, XML Schemas improvements + preparingforderive (Kasimier Buchcik).</li> + <li>documentation: generation of gtk-doc like docs, + integrationwithdevhelp.</li> </ul> <h3>2.6.21: Sep 4 2005</h3> <ul> - <li>build fixes: Cygwin portability fixes (Gerrit P. Haase), calling - convention problems on Windows (Marcus Boerger), cleanups based on Linus' - sparse tool, update of win32/configure.js (Rob Richards), remove warnings - on Windows(Marcus Boerger), compilation without SAX1, detection of the - Python binary, use $GCC inestad of $CC = 'gcc' (Andrew W. Nosenko), - compilation/link with threads and old gcc, compile problem by C370 on - Z/OS,</li> - <li>bug fixes: http_proxy environments (Peter Breitenlohner), HTML UTF-8 - bug (Jiri Netolicky), XPath NaN compare bug (William Brack), - htmlParseScript potential bug, Schemas regexp handling of spaces, Base64 - Schemas comparisons NIST passes, automata build error xsd:all, - xmlGetNodePath for namespaced attributes (Alexander Pohoyda), xmlSchemas - foreign namespaces handling, XML Schemas facet comparison (Kupriyanov - Anatolij), xmlSchemaPSimpleTypeErr error report (Kasimier Buchcik), xml: - namespace ahndling in Schemas (Kasimier), empty model group in Schemas - (Kasimier), wilcard in Schemas (Kasimier), URI composition (William), - xs:anyType in Schemas (Kasimier), Python resolver emmitting error - messages directly, Python xmlAttr.parent (Jakub Piotr Clapa), trying to - fix the file path/URI conversion, xmlTextReaderGetAttribute fix (Rob - Richards), xmlSchemaFreeAnnot memleak (Kasimier), HTML UTF-8 - serialization, streaming XPath, Schemas determinism detection problem, - XInclude bug, Schemas context type (Dean Hill), validation fix (Derek - Poon), xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards), Schemas - type fix (Kuba Nowakowski), UTF-8 parser bug, error in encoding handling, - xmlGetLineNo fixes, bug on entities handling, entity name extraction in - error handling with XInclude, text nodes in HTML body tags (Gary Coady), - xml:id and IDness at the treee level fixes, XPath streaming patterns - bugs.</li> - <li>improvements: structured interfaces for schemas and RNG error reports - (Marcus Boerger), optimization of the char data inner loop parsing - (thanks to Behdad Esfahbod for the idea), schematron validation though - not finished yet, xmlSaveOption to omit XML declaration, keyref match - error reports (Kasimier), formal expression handling code not plugged - yet, more lax mode for the HTML parser, parser XML_PARSE_COMPACT option - for text nodes allocation.</li> + <li>build fixes: Cygwin portability fixes (Gerrit P. + Haase),callingconvention problems on Windows (Marcus Boerger), cleanups + based onLinus'sparse tool, update of win32/configure.js (Rob Richards), + removewarningson Windows(Marcus Boerger), compilation without SAX1, + detectionof thePython binary, use $GCC inestad of $CC = 'gcc' (Andrew + W.Nosenko),compilation/link with threads and old gcc, compile problem + byC370 onZ/OS,</li> + <li>bug fixes: http_proxy environments (Peter Breitenlohner), HTML + UTF-8bug(Jiri Netolicky), XPath NaN compare bug (William + Brack),htmlParseScriptpotential bug, Schemas regexp handling of spaces, + Base64Schemascomparisons NIST passes, automata build error + xsd:all,xmlGetNodePath fornamespaced attributes (Alexander Pohoyda), + xmlSchemasforeign namespaceshandling, XML Schemas facet comparison + (KupriyanovAnatolij),xmlSchemaPSimpleTypeErr error report (Kasimier + Buchcik), xml:namespaceahndling in Schemas (Kasimier), empty model group + in Schemas(Kasimier),wilcard in Schemas (Kasimier), URI composition + (William),xs:anyType inSchemas (Kasimier), Python resolver emmitting + errormessages directly,Python xmlAttr.parent (Jakub Piotr Clapa), trying + tofix the file path/URIconversion, xmlTextReaderGetAttribute fix + (RobRichards),xmlSchemaFreeAnnot memleak (Kasimier), HTML + UTF-8serialization, streamingXPath, Schemas determinism detection + problem,XInclude bug, Schemascontext type (Dean Hill), validation fix + (DerekPoon),xmlTextReaderGetAttribute[Ns] namespaces (Rob Richards), + Schemastype fix(Kuba Nowakowski), UTF-8 parser bug, error in + encodinghandling,xmlGetLineNo fixes, bug on entities handling, entity + nameextraction inerror handling with XInclude, text nodes in HTML body + tags(Gary Coady),xml:id and IDness at the treee level fixes, XPath + streamingpatternsbugs.</li> + <li>improvements: structured interfaces for schemas and RNG + errorreports(Marcus Boerger), optimization of the char data inner + loopparsing(thanks to Behdad Esfahbod for the idea), schematron + validationthoughnot finished yet, xmlSaveOption to omit XML declaration, + keyrefmatcherror reports (Kasimier), formal expression handling code + notpluggedyet, more lax mode for the HTML parser, parser + XML_PARSE_COMPACToptionfor text nodes allocation.</li> <li>documentation: xmllint man page had --nonet duplicated</li> </ul> <h3>2.6.20: Jul 10 2005</h3> <ul> - <li>build fixes: Windows build (Rob Richards), Mingw compilation (Igor - Zlatkovic), Windows Makefile (Igor), gcc warnings (Kasimier and - andriy@google.com), use gcc weak references to pthread to avoid the - pthread dependancy on Linux, compilation problem (Steve Nairn), compiling - of subset (Morten Welinder), IPv6/ss_family compilation (William Brack), - compilation when disabling parts of the library, standalone test - distribution.</li> - <li>bug fixes: bug in lang(), memory cleanup on errors (William Brack), - HTTP query strings (Aron Stansvik), memory leak in DTD (William), integer - overflow in XPath (William), nanoftp buffer size, pattern "." apth fixup - (Kasimier), leak in tree reported by Malcolm Rowe, replaceNode patch - (Brent Hendricks), CDATA with NULL content (Mark Vakoc), xml:base fixup - on XInclude (William), pattern fixes (William), attribute bug in - exclusive c14n (Aleksey Sanin), xml:space and xml:lang with SAX2 (Rob - Richards), namespace trouble in complex parsing (Malcolm Rowe), XSD type - QNames fixes (Kasimier), XPath streaming fixups (William), RelaxNG bug - (Rob Richards), Schemas for Schemas fixes (Kasimier), removal of ID (Rob - Richards), a small RelaxNG leak, HTML parsing in push mode bug (James - Bursa), failure to detect UTF-8 parsing bugs in CDATA sections, - areBlanks() heuristic failure, duplicate attributes in DTD bug - (William).</li> - <li>improvements: lot of work on Schemas by Kasimier Buchcik both on - conformance and streaming, Schemas validation messages (Kasimier Buchcik, - Matthew Burgess), namespace removal at the python level (Brent - Hendricks), Update to new Schemas regression tests from W3C/Nist - (Kasimier), xmlSchemaValidateFile() (Kasimier), implementation of - xmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml (James Wert), - standalone test framework and programs, new DOM import APIs - xmlDOMWrapReconcileNamespaces() xmlDOMWrapAdoptNode() and - xmlDOMWrapRemoveNode(), extension of xmllint capabilities for SAX and - Schemas regression tests, xmlStopParser() available in pull mode too, - ienhancement to xmllint --shell namespaces support, Windows port of the - standalone testing tools (Kasimier and William), - xmlSchemaValidateStream() xmlSchemaSAXPlug() and xmlSchemaSAXUnplug() SAX - Schemas APIs, Schemas xmlReader support.</li> + <li>build fixes: Windows build (Rob Richards), Mingw + compilation(IgorZlatkovic), Windows Makefile (Igor), gcc warnings + (Kasimierandandriy@google.com), use gcc weak references to pthread to + avoidthepthread dependancy on Linux, compilation problem (Steve + Nairn),compilingof subset (Morten Welinder), IPv6/ss_family compilation + (WilliamBrack),compilation when disabling parts of the library, + standalonetestdistribution.</li> + <li>bug fixes: bug in lang(), memory cleanup on errors (William + Brack),HTTPquery strings (Aron Stansvik), memory leak in DTD + (William),integeroverflow in XPath (William), nanoftp buffer size, + pattern "." apthfixup(Kasimier), leak in tree reported by Malcolm Rowe, + replaceNodepatch(Brent Hendricks), CDATA with NULL content (Mark Vakoc), + xml:basefixupon XInclude (William), pattern fixes (William), attribute + buginexclusive c14n (Aleksey Sanin), xml:space and xml:lang with + SAX2(RobRichards), namespace trouble in complex parsing (Malcolm Rowe), + XSDtypeQNames fixes (Kasimier), XPath streaming fixups (William), + RelaxNGbug(Rob Richards), Schemas for Schemas fixes (Kasimier), removal + of ID(RobRichards), a small RelaxNG leak, HTML parsing in push mode + bug(JamesBursa), failure to detect UTF-8 parsing bugs in + CDATAsections,areBlanks() heuristic failure, duplicate attributes in + DTDbug(William).</li> + <li>improvements: lot of work on Schemas by Kasimier Buchcik + bothonconformance and streaming, Schemas validation messages + (KasimierBuchcik,Matthew Burgess), namespace removal at the python + level(BrentHendricks), Update to new Schemas regression tests + fromW3C/Nist(Kasimier), xmlSchemaValidateFile() (Kasimier), + implementationofxmlTextReaderReadInnerXml and xmlTextReaderReadOuterXml + (JamesWert),standalone test framework and programs, new DOM + importAPIsxmlDOMWrapReconcileNamespaces() + xmlDOMWrapAdoptNode()andxmlDOMWrapRemoveNode(), extension of xmllint + capabilities for SAXandSchemas regression tests, xmlStopParser() + available in pull modetoo,ienhancement to xmllint --shell namespaces + support, Windows port ofthestandalone testing tools (Kasimier + andWilliam),xmlSchemaValidateStream() xmlSchemaSAXPlug() + andxmlSchemaSAXUnplug() SAXSchemas APIs, Schemas xmlReader support.</li> </ul> <h3>2.6.19: Apr 02 2005</h3> <ul> - <li>build fixes: drop .la from RPMs, --with-minimum build fix (William - Brack), use XML_SOCKLEN_T instead of SOCKLEN_T because it breaks with AIX - 5.3 compiler, fixed elfgcchack.h generation and PLT reduction code on - Linux/ELF/gcc4</li> - <li>bug fixes: schemas type decimal fixups (William Brack), xmmlint return - code (Gerry Murphy), small schemas fixes (Matthew Burgess and GUY - Fabrice), workaround "DAV:" namespace brokeness in c14n (Aleksey Sanin), - segfault in Schemas (Kasimier Buchcik), Schemas attribute validation - (Kasimier), Prop related functions and xmlNewNodeEatName (Rob Richards), - HTML serialization of name attribute on a elements, Python error handlers - leaks and improvement (Brent Hendricks), uninitialized variable in - encoding code, Relax-NG validation bug, potential crash if - gnorableWhitespace is NULL, xmlSAXParseDoc and xmlParseDoc signatures, - switched back to assuming UTF-8 in case no encoding is given at - serialization time</li> - <li>improvements: lot of work on Schemas by Kasimier Buchcik on facets - checking and also mixed handling.</li> + <li>build fixes: drop .la from RPMs, --with-minimum build + fix(WilliamBrack), use XML_SOCKLEN_T instead of SOCKLEN_T because it + breakswith AIX5.3 compiler, fixed elfgcchack.h generation and PLT + reductioncode onLinux/ELF/gcc4</li> + <li>bug fixes: schemas type decimal fixups (William Brack), + xmmlintreturncode (Gerry Murphy), small schemas fixes (Matthew Burgess + andGUYFabrice), workaround "DAV:" namespace brokeness in c14n + (AlekseySanin),segfault in Schemas (Kasimier Buchcik), Schemas + attributevalidation(Kasimier), Prop related functions and + xmlNewNodeEatName (RobRichards),HTML serialization of name attribute on a + elements, Pythonerror handlersleaks and improvement (Brent Hendricks), + uninitializedvariable inencoding code, Relax-NG validation bug, potential + crashifgnorableWhitespace is NULL, xmlSAXParseDoc and + xmlParseDocsignatures,switched back to assuming UTF-8 in case no encoding + is givenatserialization time</li> + <li>improvements: lot of work on Schemas by Kasimier Buchcik + onfacetschecking and also mixed handling.</li> <li></li> </ul> <h3>2.6.18: Mar 13 2005</h3> <ul> - <li>build fixes: warnings (Peter Breitenlohner), testapi.c generation, - Bakefile support (Francesco Montorsi), Windows compilation (Joel Reed), - some gcc4 fixes, HP-UX portability fixes (Rick Jones).</li> - <li>bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), push and - xmlreader stopping on non-fatal errors, thread support for dictionnaries - reference counting (Gary Coady), internal subset and push problem, URL - saved in xmlCopyDoc, various schemas bug fixes (Kasimier), Python paths - fixup (Stephane Bidoul), xmlGetNodePath and namespaces, xmlSetNsProp fix - (Mike Hommey), warning should not count as error (William Brack), - xmlCreatePushParser empty chunk, XInclude parser flags (William), cleanup - FTP and HTTP code to reuse the uri parsing and IPv6 (William), - xmlTextWriterStartAttributeNS fix (Rob Richards), XMLLINT_INDENT being - empty (William), xmlWriter bugs (Rob Richards), multithreading on Windows - (Rich Salz), xmlSearchNsByHref fix (Kasimier), Python binding leak (Brent - Hendricks), aliasing bug exposed by gcc4 on s390, xmlTextReaderNext bug - (Rob Richards), Schemas decimal type fixes (William Brack), - xmlByteConsumed static buffer (Ben Maurer).</li> - <li>improvement: speedup parsing comments and DTDs, dictionnary support for - hash tables, Schemas Identity constraints (Kasimier), streaming XPath - subset, xmlTextReaderReadString added (Bjorn Reese), Schemas canonical - values handling (Kasimier), add xmlTextReaderByteConsumed (Aron - Stansvik),</li> + <li>build fixes: warnings (Peter Breitenlohner), + testapi.cgeneration,Bakefile support (Francesco Montorsi), Windows + compilation(Joel Reed),some gcc4 fixes, HP-UX portability fixes (Rick + Jones).</li> + <li>bug fixes: xmlSchemaElementDump namespace (Kasimier Buchcik), + pushandxmlreader stopping on non-fatal errors, thread support + fordictionnariesreference counting (Gary Coady), internal subset and + pushproblem, URLsaved in xmlCopyDoc, various schemas bug fixes + (Kasimier),Python pathsfixup (Stephane Bidoul), xmlGetNodePath and + namespaces,xmlSetNsProp fix(Mike Hommey), warning should not count as + error (WilliamBrack),xmlCreatePushParser empty chunk, XInclude parser + flags (William),cleanupFTP and HTTP code to reuse the uri parsing and + IPv6(William),xmlTextWriterStartAttributeNS fix (Rob + Richards),XMLLINT_INDENT beingempty (William), xmlWriter bugs (Rob + Richards),multithreading on Windows(Rich Salz), xmlSearchNsByHref fix + (Kasimier),Python binding leak (BrentHendricks), aliasing bug exposed by + gcc4 ons390, xmlTextReaderNext bug(Rob Richards), Schemas decimal type + fixes(William Brack),xmlByteConsumed static buffer (Ben Maurer).</li> + <li>improvement: speedup parsing comments and DTDs, dictionnary + supportforhash tables, Schemas Identity constraints (Kasimier), + streamingXPathsubset, xmlTextReaderReadString added (Bjorn Reese), + Schemascanonicalvalues handling (Kasimier), add + xmlTextReaderByteConsumed(AronStansvik),</li> <li>Documentation: Wiki support (Joel Reed)</li> </ul> <h3>2.6.17: Jan 16 2005</h3> <ul> - <li>build fixes: Windows, warnings removal (William Brack), - maintainer-clean dependency(William), build in a different directory - (William), fixing --with-minimum configure build (William), BeOS build - (Marcin Konicki), Python-2.4 detection (William), compilation on AIX (Dan - McNichol)</li> - <li>bug fixes: xmlTextReaderHasAttributes (Rob Richards), xmlCtxtReadFile() - to use the catalog(s), loop on output (William Brack), XPath memory leak, - ID deallocation problem (Steve Shepard), debugDumpNode crash (William), - warning not using error callback (William), xmlStopParser bug (William), - UTF-16 with BOM on DTDs (William), namespace bug on empty elements in - push mode (Rob Richards), line and col computations fixups (Aleksey - Sanin), xmlURIEscape fix (William), xmlXPathErr on bad range (William), - patterns with too many steps, bug in RNG choice optimization, line number - sometimes missing.</li> - <li>improvements: XSD Schemas (Kasimier Buchcik), python generator - (William), xmlUTF8Strpos speedup (William), unicode Python strings - (William), XSD error reports (Kasimier Buchcik), Python __str__ call - serialize().</li> - <li>new APIs: added xmlDictExists(), GetLineNumber and GetColumnNumber for - the xmlReader (Aleksey Sanin), Dynamic Shared Libraries APIs (mostly Joel - Reed), error extraction API from regexps, new XMLSave option for format - (Phil Shafer)</li> - <li>documentation: site improvement (John Fleck), FAQ entries - (William).</li> + <li>build fixes: Windows, warnings removal (William + Brack),maintainer-cleandependency(William), build in a different + directory(William), fixing--with-minimum configure build (William), BeOS + build(Marcin Konicki),Python-2.4 detection (William), compilation on AIX + (DanMcNichol)</li> + <li>bug fixes: xmlTextReaderHasAttributes (Rob + Richards),xmlCtxtReadFile()to use the catalog(s), loop on output (William + Brack),XPath memory leak,ID deallocation problem (Steve Shepard), + debugDumpNodecrash (William),warning not using error callback (William), + xmlStopParserbug (William),UTF-16 with BOM on DTDs (William), namespace + bug on emptyelements inpush mode (Rob Richards), line and col + computations fixups(AlekseySanin), xmlURIEscape fix (William), + xmlXPathErr on bad range(William),patterns with too many steps, bug in + RNG choice optimization,line numbersometimes missing.</li> + <li>improvements: XSD Schemas (Kasimier Buchcik), pythongenerator(William), + xmlUTF8Strpos speedup (William), unicode Pythonstrings(William), XSD + error reports (Kasimier Buchcik), Python __str__callserialize().</li> + <li>new APIs: added xmlDictExists(), GetLineNumber and + GetColumnNumberforthe xmlReader (Aleksey Sanin), Dynamic Shared Libraries + APIs (mostlyJoelReed), error extraction API from regexps, new XMLSave + option forformat(Phil Shafer)</li> + <li>documentation: site improvement (John Fleck), FAQ entries(William).</li> </ul> <h3>2.6.16: Nov 10 2004</h3> <ul> - <li>general hardening and bug fixing crossing all the API based on new - automated regression testing</li> + <li>general hardening and bug fixing crossing all the API based + onnewautomated regression testing</li> <li>build fix: IPv6 build and test on AIX (Dodji Seketeli)</li> - <li>bug fixes: problem with XML::Libxml reported by Petr Pajas, encoding - conversion functions return values, UTF-8 bug affecting XPath reported by - Markus Bertheau, catalog problem with NULL entries (William Brack)</li> - <li>documentation: fix to xmllint man page, some API function descritpion - were updated.</li> - <li>improvements: DTD validation APIs provided at the Python level (Brent - Hendricks)</li> + <li>bug fixes: problem with XML::Libxml reported by Petr + Pajas,encodingconversion functions return values, UTF-8 bug affecting + XPathreported byMarkus Bertheau, catalog problem with NULL entries + (WilliamBrack)</li> + <li>documentation: fix to xmllint man page, some API + functiondescritpionwere updated.</li> + <li>improvements: DTD validation APIs provided at the Python + level(BrentHendricks)</li> </ul> <h3>2.6.15: Oct 27 2004</h3> <ul> <li>security fixes on the nanoftp and nanohttp modules</li> - <li>build fixes: xmllint detection bug in configure, building outside the - source tree (Thomas Fitzsimmons)</li> - <li>bug fixes: HTML parser on broken ASCII chars in names (William), Python - paths (Malcolm Tredinnick), xmlHasNsProp and default namespace (William), - saving to python file objects (Malcolm Tredinnick), DTD lookup fix - (Malcolm), save back <group> in catalogs (William), tree build - fixes (DV and Rob Richards), Schemas memory bug, structured error handler - on Python 64bits, thread local memory deallocation, memory leak reported - by Volker Roth, xmlValidateDtd in the presence of an internal subset, - entities and _private problem (William), xmlBuildRelativeURI error - (William).</li> - <li>improvements: better XInclude error reports (William), tree debugging - module and tests, convenience functions at the Reader API (Graham - Bennett), add support for PI in the HTML parser.</li> + <li>build fixes: xmllint detection bug in configure, building + outsidethesource tree (Thomas Fitzsimmons)</li> + <li>bug fixes: HTML parser on broken ASCII chars in names + (William),Pythonpaths (Malcolm Tredinnick), xmlHasNsProp and default + namespace(William),saving to python file objects (Malcolm Tredinnick), + DTD lookupfix(Malcolm), save back <group> in catalogs (William), + treebuildfixes (DV and Rob Richards), Schemas memory bug, structured + errorhandleron Python 64bits, thread local memory deallocation, memory + leakreportedby Volker Roth, xmlValidateDtd in the presence of an + internalsubset,entities and _private problem (William), + xmlBuildRelativeURIerror(William).</li> + <li>improvements: better XInclude error reports (William), + treedebuggingmodule and tests, convenience functions at the Reader + API(GrahamBennett), add support for PI in the HTML parser.</li> </ul> <h3>2.6.14: Sep 29 2004</h3> <ul> - <li>build fixes: configure paths for xmllint and xsltproc, compilation - without HTML parser, compilation warning cleanups (William Brack & - Malcolm Tredinnick), VMS makefile update (Craig Berry),</li> - <li>bug fixes: xmlGetUTF8Char (William Brack), QName properties (Kasimier - Buchcik), XInclude testing, Notation serialization, UTF8ToISO8859x - transcoding (Mark Itzcovitz), lots of XML Schemas cleanup and fixes - (Kasimier), ChangeLog cleanup (Stepan Kasal), memory fixes (Mark Vakoc), - handling of failed realloc(), out of bound array adressing in Schemas - date handling, Python space/tabs cleanups (Malcolm Tredinnick), NMTOKENS - E20 validation fix (Malcolm),</li> - <li>improvements: added W3C XML Schemas testsuite (Kasimier Buchcik), add - xmlSchemaValidateOneElement (Kasimier), Python exception hierearchy - (Malcolm Tredinnick), Python libxml2 driver improvement (Malcolm - Tredinnick), Schemas support for xsi:schemaLocation, - xsi:noNamespaceSchemaLocation, xsi:type (Kasimier Buchcik)</li> + <li>build fixes: configure paths for xmllint and + xsltproc,compilationwithout HTML parser, compilation warning cleanups + (WilliamBrack &Malcolm Tredinnick), VMS makefile update (Craig + Berry),</li> + <li>bug fixes: xmlGetUTF8Char (William Brack), QName + properties(KasimierBuchcik), XInclude testing, Notation + serialization,UTF8ToISO8859xtranscoding (Mark Itzcovitz), lots of XML + Schemas cleanupand fixes(Kasimier), ChangeLog cleanup (Stepan Kasal), + memory fixes (MarkVakoc),handling of failed realloc(), out of bound array + adressing inSchemasdate handling, Python space/tabs cleanups (Malcolm + Tredinnick),NMTOKENSE20 validation fix (Malcolm),</li> + <li>improvements: added W3C XML Schemas testsuite (Kasimier + Buchcik),addxmlSchemaValidateOneElement (Kasimier), Python + exceptionhierearchy(Malcolm Tredinnick), Python libxml2 driver + improvement(MalcolmTredinnick), Schemas support + forxsi:schemaLocation,xsi:noNamespaceSchemaLocation, xsi:type + (KasimierBuchcik)</li> </ul> <h3>2.6.13: Aug 31 2004</h3> <ul> - <li>build fixes: Windows and zlib (Igor Zlatkovic), -O flag with gcc, - Solaris compiler warning, fixing RPM BuildRequires,</li> - <li>fixes: DTD loading on Windows (Igor), Schemas error reports APIs - (Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 (William Brack - and Julius Mittenzwei), Schemas facet check (Kasimier), default namespace - problem (William), Schemas hexbinary empty values, encoding error could - genrate a serialization loop.</li> - <li>Improvements: Schemas validity improvements (Kasimier), added --path - and --load-trace options to xmllint</li> + <li>build fixes: Windows and zlib (Igor Zlatkovic), -O flag withgcc,Solaris + compiler warning, fixing RPM BuildRequires,</li> + <li>fixes: DTD loading on Windows (Igor), Schemas error + reportsAPIs(Kasimier Buchcik), Schemas validation crash, xmlCheckUTF8 + (WilliamBrackand Julius Mittenzwei), Schemas facet check (Kasimier), + defaultnamespaceproblem (William), Schemas hexbinary empty values, + encodingerror couldgenrate a serialization loop.</li> + <li>Improvements: Schemas validity improvements (Kasimier), added + --pathand--load-trace options to xmllint</li> <li>documentation: tutorial update (John Fleck)</li> </ul> <h3>2.6.12: Aug 22 2004</h3> <ul> - <li>build fixes: fix --with-minimum, elfgcchack.h fixes (Peter - Breitenlohner), perl path lookup (William), diff on Solaris (Albert - Chin), some 64bits cleanups.</li> - <li>Python: avoid a warning with 2.3 (William Brack), tab and space mixes - (William), wrapper generator fixes (William), Cygwin support (Gerrit P. - Haase), node wrapper fix (Marc-Antoine Parent), XML Schemas support - (Torkel Lyng)</li> + <li>build fixes: fix --with-minimum, elfgcchack.h + fixes(PeterBreitenlohner), perl path lookup (William), diff on + Solaris(AlbertChin), some 64bits cleanups.</li> + <li>Python: avoid a warning with 2.3 (William Brack), tab and + spacemixes(William), wrapper generator fixes (William), Cygwin support + (GerritP.Haase), node wrapper fix (Marc-Antoine Parent), XML + Schemassupport(Torkel Lyng)</li> <li>Schemas: a lot of bug fixes and improvements from Kasimier Buchcik</li> - <li>fixes: RVT fixes (William), XPath context resets bug (William), memory - debug (Steve Hay), catalog white space handling (Peter Breitenlohner), - xmlReader state after attribute reading (William), structured error - handler (William), XInclude generated xml:base fixup (William), Windows - memory reallocation problem (Steve Hay), Out of Memory conditions - handling (William and Olivier Andrieu), htmlNewDoc() charset bug, - htmlReadMemory init (William), a posteriori validation DTD base - (William), notations serialization missing, xmlGetNodePath (Dodji), - xmlCheckUTF8 (Diego Tartara), missing line numbers on entity - (William)</li> - <li>improvements: DocBook catalog build scrip (William), xmlcatalog tool - (Albert Chin), xmllint --c14n option, no_proxy environment (Mike Hommey), - xmlParseInNodeContext() addition, extend xmllint --shell, allow XInclude - to not generate start/end nodes, extend xmllint --version to include CVS - tag (William)</li> - <li>documentation: web pages fixes, validity API docs fixes (William) - schemas API fix (Eric Haszlakiewicz), xmllint man page (John Fleck)</li> + <li>fixes: RVT fixes (William), XPath context resets bug + (William),memorydebug (Steve Hay), catalog white space handling + (PeterBreitenlohner),xmlReader state after attribute reading + (William),structured errorhandler (William), XInclude generated xml:base + fixup(William), Windowsmemory reallocation problem (Steve Hay), Out of + Memoryconditionshandling (William and Olivier Andrieu), htmlNewDoc() + charsetbug,htmlReadMemory init (William), a posteriori validation + DTDbase(William), notations serialization missing, + xmlGetNodePath(Dodji),xmlCheckUTF8 (Diego Tartara), missing line numbers + onentity(William)</li> + <li>improvements: DocBook catalog build scrip (William), + xmlcatalogtool(Albert Chin), xmllint --c14n option, no_proxy environment + (MikeHommey),xmlParseInNodeContext() addition, extend xmllint --shell, + allowXIncludeto not generate start/end nodes, extend xmllint --version + toinclude CVStag (William)</li> + <li>documentation: web pages fixes, validity API docs fixes(William)schemas + API fix (Eric Haszlakiewicz), xmllint man page (JohnFleck)</li> </ul> <h3>2.6.11: July 5 2004</h3> <ul> - <li>Schemas: a lot of changes and improvements by Kasimier Buchcik for - attributes, namespaces and simple types.</li> - <li>build fixes: --with-minimum (William Brack), some gcc cleanup - (William), --with-thread-alloc (William)</li> - <li>portability: Windows binary package change (Igor Zlatkovic), Catalog - path on Windows</li> - <li>documentation: update to the tutorial (John Fleck), xmllint return code - (John Fleck), man pages (Ville Skytta),</li> - <li>bug fixes: C14N bug serializing namespaces (Aleksey Sanin), testSAX - properly initialize the library (William), empty node set in XPath - (William), xmlSchemas errors (William), invalid charref problem pointed - by Morus Walter, XInclude xml:base generation (William), Relax-NG bug - with div processing (William), XPointer and xml:base problem(William), - Reader and entities, xmllint return code for schemas (William), reader - streaming problem (Steve Ball), DTD serialization problem (William), - libxml.m4 fixes (Mike Hommey), do not provide destructors as methods on - Python classes, xmlReader buffer bug, Python bindings memory interfaces - improvement (with Stéphane Bidoul), Fixed the push parser to be back to - synchronous behaviour.</li> - <li>improvement: custom per-thread I/O enhancement (Rob Richards), register - namespace in debug shell (Stefano Debenedetti), Python based regression - test for non-Unix users (William), dynamically increase the number of - XPath extension functions in Python and fix a memory leak (Marc-Antoine - Parent and William)</li> - <li>performance: hack done with Arjan van de Ven to reduce ELF footprint - and generated code on Linux, plus use gcc runtime profiling to optimize - the code generated in the RPM packages.</li> + <li>Schemas: a lot of changes and improvements by Kasimier + Buchcikforattributes, namespaces and simple types.</li> + <li>build fixes: --with-minimum (William Brack), some gcccleanup(William), + --with-thread-alloc (William)</li> + <li>portability: Windows binary package change (Igor Zlatkovic),Catalogpath + on Windows</li> + <li>documentation: update to the tutorial (John Fleck), xmllint + returncode(John Fleck), man pages (Ville Skytta),</li> + <li>bug fixes: C14N bug serializing namespaces (Aleksey + Sanin),testSAXproperly initialize the library (William), empty node set + inXPath(William), xmlSchemas errors (William), invalid charref + problempointedby Morus Walter, XInclude xml:base generation (William), + Relax-NGbugwith div processing (William), XPointer and + xml:baseproblem(William),Reader and entities, xmllint return code for + schemas(William), readerstreaming problem (Steve Ball), DTD + serializationproblem (William),libxml.m4 fixes (Mike Hommey), do not + providedestructors as methods onPython classes, xmlReader buffer bug, + Pythonbindings memory interfacesimprovement (with Stéphane Bidoul), Fixed + thepush parser to be back tosynchronous behaviour.</li> + <li>improvement: custom per-thread I/O enhancement (Rob + Richards),registernamespace in debug shell (Stefano Debenedetti), Python + basedregressiontest for non-Unix users (William), dynamically increase + thenumber ofXPath extension functions in Python and fix a memory + leak(Marc-AntoineParent and William)</li> + <li>performance: hack done with Arjan van de Ven to reduce ELF + footprintandgenerated code on Linux, plus use gcc runtime profiling to + optimizethecode generated in the RPM packages.</li> </ul> <h3>2.6.10: May 17 2004</h3> <ul> <li>Web page generated for ChangeLog</li> <li>build fixes: --without-html problems, make check without make all</li> - <li>portability: problem with xpath.c on Windows (MSC and Borland), memcmp - vs. strncmp on Solaris, XPath tests on Windows (Mark Vakoc), C++ do not - use "list" as parameter name, make tests work with Python 1.5 (Ed - Davis),</li> - <li>improvements: made xmlTextReaderMode public, small buffers resizing - (Morten Welinder), add --maxmem option to xmllint, add - xmlPopInputCallback() for Matt Sergeant, refactoring of serialization - escaping, added escaping customization</li> - <li>bugfixes: xsd:extension (Taihei Goi), assorted regexp bugs (William - Brack), xmlReader end of stream problem, node deregistration with reader, - URI escaping and filemanes, XHTML1 formatting (Nick Wellnhofer), regexp - transition reduction (William), various XSD Schemas fixes (Kasimier - Buchcik), XInclude fallback problem (William), weird problems with DTD - (William), structured error handler callback context (William), reverse - xmlEncodeSpecialChars() behaviour back to escaping '"'</li> + <li>portability: problem with xpath.c on Windows (MSC and + Borland),memcmpvs. strncmp on Solaris, XPath tests on Windows (Mark + Vakoc), C++ donotuse "list" as parameter name, make tests work with + Python 1.5(EdDavis),</li> + <li>improvements: made xmlTextReaderMode public, small + buffersresizing(Morten Welinder), add --maxmem option to + xmllint,addxmlPopInputCallback() for Matt Sergeant, refactoring + ofserializationescaping, added escaping customization</li> + <li>bugfixes: xsd:extension (Taihei Goi), assorted regexp + bugs(WilliamBrack), xmlReader end of stream problem, node deregistration + withreader,URI escaping and filemanes, XHTML1 formatting (Nick + Wellnhofer),regexptransition reduction (William), various XSD Schemas + fixes(KasimierBuchcik), XInclude fallback problem (William), weird + problemswith DTD(William), structured error handler callback context + (William),reversexmlEncodeSpecialChars() behaviour back to escaping + '"'</li> </ul> <h3>2.6.9: Apr 18 2004</h3> <ul> <li>implement xml:id Working Draft, relaxed XPath id() checking</li> - <li>bugfixes: xmlCtxtReset (Brent Hendricks), line number and CDATA (Dave - Beckett), Relax-NG compilation (William Brack), Regexp patches (with - William), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed problem (with - William), Relax-NG name classes compares (William), XInclude duplicate - fallback (William), external DTD encoding detection (William), a DTD - validation bug (William), xmlReader Close() fix, recusive extention - schemas</li> - <li>improvements: use xmlRead* APIs in test tools (Mark Vakoc), indenting - save optimization, better handle IIS broken HTTP redirect behaviour (Ian - Hummel), HTML parser frameset (James Bursa), libxml2-python RPM - dependancy, XML Schemas union support (Kasimier Buchcik), warning removal - clanup (William), keep ChangeLog compressed when installing from RPMs</li> - <li>documentation: examples and xmlDocDumpMemory docs (John Fleck), new - example (load, xpath, modify, save), xmlCatalogDump() comments,</li> - <li>Windows: Borland C++ builder (Eric Zurcher), work around Microsoft - compiler NaN handling bug (Mark Vakoc)</li> + <li>bugfixes: xmlCtxtReset (Brent Hendricks), line number and + CDATA(DaveBeckett), Relax-NG compilation (William Brack), Regexp + patches(withWilliam), xmlUriEscape (Mark Vakoc), a Relax-NG notAllowed + problem(withWilliam), Relax-NG name classes compares (William), + XIncludeduplicatefallback (William), external DTD encoding detection + (William), aDTDvalidation bug (William), xmlReader Close() fix, + recusiveextentionschemas</li> + <li>improvements: use xmlRead* APIs in test tools (Mark + Vakoc),indentingsave optimization, better handle IIS broken HTTP + redirectbehaviour (IanHummel), HTML parser frameset (James Bursa), + libxml2-pythonRPMdependancy, XML Schemas union support (Kasimier + Buchcik), warningremovalclanup (William), keep ChangeLog compressed when + installing fromRPMs</li> + <li>documentation: examples and xmlDocDumpMemory docs (John + Fleck),newexample (load, xpath, modify, save), xmlCatalogDump() + comments,</li> + <li>Windows: Borland C++ builder (Eric Zurcher), work + aroundMicrosoftcompiler NaN handling bug (Mark Vakoc)</li> </ul> <h3>2.6.8: Mar 23 2004</h3> <ul> <li>First step of the cleanup of the serialization code and APIs</li> - <li>XML Schemas: mixed content (Adam Dickmeiss), QName handling fixes (Adam - Dickmeiss), anyURI for "" (John Belmonte)</li> + <li>XML Schemas: mixed content (Adam Dickmeiss), QName handling + fixes(AdamDickmeiss), anyURI for "" (John Belmonte)</li> <li>Python: Canonicalization C14N support added (Anthony Carrico)</li> <li>xmlDocCopyNode() extension (William)</li> - <li>Relax-NG: fix when processing XInclude results (William), external - reference in interleave (William), missing error on <choice> - failure (William), memory leak in schemas datatype facets.</li> + <li>Relax-NG: fix when processing XInclude results + (William),externalreference in interleave (William), missing error + on<choice>failure (William), memory leak in schemas + datatypefacets.</li> <li>xmlWriter: patch for better DTD support (Alfred Mickautsch)</li> - <li>bug fixes: xmlXPathLangFunction memory leak (Mike Hommey and William - Brack), no ID errors if using HTML_PARSE_NOERROR, xmlcatalog fallbacks to - URI on SYSTEM lookup failure, XInclude parse flags inheritance (William), - XInclude and XPointer fixes for entities (William), XML parser bug - reported by Holger Rauch, nanohttp fd leak (William), regexps char - groups '-' handling (William), dictionnary reference counting problems, - do not close stderr.</li> + <li>bug fixes: xmlXPathLangFunction memory leak (Mike Hommey + andWilliamBrack), no ID errors if using HTML_PARSE_NOERROR, + xmlcatalogfallbacks toURI on SYSTEM lookup failure, XInclude parse + flagsinheritance (William),XInclude and XPointer fixes for entities + (William),XML parser bugreported by Holger Rauch, nanohttp fd leak + (William),regexps chargroups '-' handling (William), dictionnary + reference countingproblems,do not close stderr.</li> <li>performance patches from Petr Pajas</li> <li>Documentation fixes: XML_CATALOG_FILES in man pages (Mike Hommey)</li> - <li>compilation and portability fixes: --without-valid, catalog cleanups - (Peter Breitenlohner), MingW patch (Roland Schwingel), cross-compilation - to Windows (Christophe de Vienne), --with-html-dir fixup (Julio Merino - Vidal), Windows build (Eric Zurcher)</li> + <li>compilation and portability fixes: --without-valid, + catalogcleanups(Peter Breitenlohner), MingW patch (Roland + Schwingel),cross-compilationto Windows (Christophe de Vienne), + --with-html-dirfixup (Julio MerinoVidal), Windows build (Eric + Zurcher)</li> </ul> <h3>2.6.7: Feb 23 2004</h3> @@ -1180,63 +1207,64 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <li>xmlWriter: updates and fixes (Alfred Mickautsch, Lucas Brasilino)</li> <li>XPath optimization (Petr Pajas)</li> <li>DTD ID handling optimization</li> - <li>bugfixes: xpath number with > 19 fractional (William Brack), push - mode with unescaped '>' characters, fix xmllint --stream --timing, fix - xmllint --memory --stream memory usage, xmlAttrSerializeTxtContent - handling NULL, trying to fix Relax-NG/Perl interface.</li> + <li>bugfixes: xpath number with > 19 fractional (William + Brack),pushmode with unescaped '>' characters, fix xmllint --stream + --timing,fixxmllint --memory --stream memory + usage,xmlAttrSerializeTxtContenthandling NULL, trying to fix + Relax-NG/Perlinterface.</li> <li>python: 2.3 compatibility, whitespace fixes (Malcolm Tredinnick)</li> <li>Added relaxng option to xmllint --shell</li> </ul> <h3>2.6.6: Feb 12 2004</h3> <ul> - <li>nanohttp and nanoftp: buffer overflow error on URI parsing (Igor and - William) reported by Yuuichi Teranishi</li> - <li>bugfixes: make test and path issues, xmlWriter attribute serialization - (William Brack), xmlWriter indentation (William), schemas validation - (Eric Haszlakiewicz), XInclude dictionnaries issues (William and Oleg - Paraschenko), XInclude empty fallback (William), HTML warnings (William), - XPointer in XInclude (William), Python namespace serialization, - isolat1ToUTF8 bound error (Alfred Mickautsch), output of parameter - entities in internal subset (William), internal subset bug in push mode, - <xs:all> fix (Alexey Sarytchev)</li> - <li>Build: fix for automake-1.8 (Alexander Winston), warnings removal - (Philip Ludlam), SOCKLEN_T detection fixes (Daniel Richard), fix - --with-minimum configuration.</li> + <li>nanohttp and nanoftp: buffer overflow error on URI parsing + (IgorandWilliam) reported by Yuuichi Teranishi</li> + <li>bugfixes: make test and path issues, xmlWriter + attributeserialization(William Brack), xmlWriter indentation (William), + schemasvalidation(Eric Haszlakiewicz), XInclude dictionnaries issues + (Williamand OlegParaschenko), XInclude empty fallback (William), HTML + warnings(William),XPointer in XInclude (William), Python + namespaceserialization,isolat1ToUTF8 bound error (Alfred Mickautsch), + output ofparameterentities in internal subset (William), internal subset + bug inpush mode,<xs:all> fix (Alexey Sarytchev)</li> + <li>Build: fix for automake-1.8 (Alexander Winston), warningsremoval(Philip + Ludlam), SOCKLEN_T detection fixes (Daniel Richard),fix--with-minimum + configuration.</li> <li>XInclude: allow the 2001 namespace without warning.</li> - <li>Documentation: missing example/index.html (John Fleck), version - dependancies (John Fleck)</li> + <li>Documentation: missing example/index.html (John + Fleck),versiondependancies (John Fleck)</li> <li>reader API: structured error reporting (Steve Ball)</li> - <li>Windows compilation: mingw, msys (Mikhail Grushinskiy), function - prototype (Cameron Johnson), MSVC6 compiler warnings, _WINSOCKAPI_ - patch</li> - <li>Parsers: added xmlByteConsumed(ctxt) API to get the byte offest in - input.</li> + <li>Windows compilation: mingw, msys (Mikhail + Grushinskiy),functionprototype (Cameron Johnson), MSVC6 compiler + warnings,_WINSOCKAPI_patch</li> + <li>Parsers: added xmlByteConsumed(ctxt) API to get the byte + offestininput.</li> </ul> <h3>2.6.5: Jan 25 2004</h3> <ul> - <li>Bugfixes: dictionnaries for schemas (William Brack), regexp segfault - (William), xs:all problem (William), a number of XPointer bugfixes - (William), xmllint error go to stderr, DTD validation problem with - namespace, memory leak (William), SAX1 cleanup and minimal options fixes - (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union - evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin), - XML Schemas double free (Steve Ball), XInclude with no href, argument - callbacks order for XPath callbacks (Frederic Peters)</li> - <li>Documentation: python scripts (William Brack), xslt stylesheets (John - Fleck), doc (Sven Zimmerman), I/O example.</li> - <li>Python bindings: fixes (William), enum support (Stéphane Bidoul), - structured error reporting (Stéphane Bidoul)</li> - <li>XInclude: various fixes for conformance, problem related to dictionnary - references (William & me), recursion (William)</li> - <li>xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred - Mickautsch),</li> + <li>Bugfixes: dictionnaries for schemas (William Brack), + regexpsegfault(William), xs:all problem (William), a number of + XPointerbugfixes(William), xmllint error go to stderr, DTD validation + problemwithnamespace, memory leak (William), SAX1 cleanup and minimal + optionsfixes(Mark Vadoc), parser context reset on error (Shaun McCance), + XPathunionevaluation problem (William) , xmlReallocLoc with NULL + (AlekseySanin),XML Schemas double free (Steve Ball), XInclude with no + href,argumentcallbacks order for XPath callbacks (Frederic Peters)</li> + <li>Documentation: python scripts (William Brack), xslt + stylesheets(JohnFleck), doc (Sven Zimmerman), I/O example.</li> + <li>Python bindings: fixes (William), enum support + (StéphaneBidoul),structured error reporting (Stéphane Bidoul)</li> + <li>XInclude: various fixes for conformance, problem related + todictionnaryreferences (William & me), recursion (William)</li> + <li>xmlWriter: indentation (Lucas Brasilino), memory + leaks(AlfredMickautsch),</li> <li>xmlSchemas: normalizedString datatype (John Belmonte)</li> <li>code cleanup for strings functions (William)</li> <li>Windows: compiler patches (Mark Vakoc)</li> - <li>Parser optimizations, a few new XPath and dictionnary APIs for future - XSLT optimizations.</li> + <li>Parser optimizations, a few new XPath and dictionnary APIs + forfutureXSLT optimizations.</li> </ul> <h3>2.6.4: Dec 24 2003</h3> @@ -1244,41 +1272,41 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <li>Windows build fixes (Igor Zlatkovic)</li> <li>Some serious XInclude problems reported by Oleg Paraschenko and</li> <li>Unix and Makefile packaging fixes (me, William Brack,</li> - <li>Documentation improvements (John Fleck, William Brack), example fix - (Lucas Brasilino)</li> - <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of - NULL strings (William Brack) , API building reader or parser from - filedescriptor should not close it, changed XPath sorting to be stable - again (William Brack), xmlGetNodePath() generating '(null)' (William - Brack), DTD validation and namespace bug (William Brack), XML Schemas - double inclusion behaviour</li> + <li>Documentation improvements (John Fleck, William Brack), + examplefix(Lucas Brasilino)</li> + <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath + handlingofNULL strings (William Brack) , API building reader or + parserfromfiledescriptor should not close it, changed XPath sorting to + bestableagain (William Brack), xmlGetNodePath() generating + '(null)'(WilliamBrack), DTD validation and namespace bug (William Brack), + XMLSchemasdouble inclusion behaviour</li> </ul> <h3>2.6.3: Dec 10 2003</h3> <ul> <li>documentation updates and cleanup (DV, William Brack, John Fleck)</li> - <li>added a repository of examples, examples from Aleksey Sanin, Dodji - Seketeli, Alfred Mickautsch</li> - <li>Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher, Mingw - (Kenneth Haley)</li> + <li>added a repository of examples, examples from Aleksey + Sanin,DodjiSeketeli, Alfred Mickautsch</li> + <li>Windows updates: Mark Vakoc, Igor Zlatkovic, Eric Zurcher,Mingw(Kenneth + Haley)</li> <li>Unicode range checking (William Brack)</li> <li>code cleanup (William Brack)</li> <li>Python bindings: doc (John Fleck), bug fixes</li> <li>UTF-16 cleanup and BOM issues (William Brack)</li> - <li>bug fixes: ID and xmlReader validation, XPath (William Brack), - xmlWriter (Alfred Mickautsch), hash.h inclusion problem, HTML parser - (James Bursa), attribute defaulting and validation, some serialization - cleanups, XML_GET_LINE macro, memory debug when using threads (William - Brack), serialization of attributes and entities content, xmlWriter - (Daniel Schulman)</li> - <li>XInclude bugfix, new APIs and update to the last version including the - namespace change.</li> - <li>XML Schemas improvements: include (Robert Stepanek), import and - namespace handling, fixed the regression tests troubles, added examples - based on Eric van der Vlist book, regexp fixes</li> - <li>preliminary pattern support for streaming (needed for schemas - constraints), added xmlTextReaderPreservePattern() to collect subdocument - when streaming.</li> + <li>bug fixes: ID and xmlReader validation, XPath (William + Brack),xmlWriter(Alfred Mickautsch), hash.h inclusion problem, HTML + parser(James Bursa),attribute defaulting and validation, some + serializationcleanups,XML_GET_LINE macro, memory debug when using threads + (WilliamBrack),serialization of attributes and entities content, + xmlWriter(DanielSchulman)</li> + <li>XInclude bugfix, new APIs and update to the last version + includingthenamespace change.</li> + <li>XML Schemas improvements: include (Robert Stepanek), importandnamespace + handling, fixed the regression tests troubles, addedexamplesbased on Eric + van der Vlist book, regexp fixes</li> + <li>preliminary pattern support for streaming (needed + forschemasconstraints), added xmlTextReaderPreservePattern() to + collectsubdocumentwhen streaming.</li> <li>various fixes in the structured error handling</li> </ul> @@ -1294,107 +1322,108 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <li>a posteriori DTD validation fixes</li> <li>xmlReader bug fixes: Walker fixes, python bindings</li> <li>fixed xmlStopParser() to really stop the parser and errors</li> - <li>always generate line numbers when using the new xmlReadxxx - functions</li> + <li>always generate line numbers when using the new xmlReadxxxfunctions</li> <li>added XInclude support to the xmlReader interface</li> <li>implemented XML_PARSE_NONET parser option</li> <li>DocBook XSLT processing bug fixed</li> <li>HTML serialization for <p> elements (William Brack and me)</li> <li>XPointer failure in XInclude are now handled as resource errors</li> - <li>fixed xmllint --html to use the HTML serializer on output (added - --xmlout to implement the previous behaviour of saving it using the XML - serializer)</li> + <li>fixed xmllint --html to use the HTML serializer on output(added--xmlout + to implement the previous behaviour of saving it using + theXMLserializer)</li> </ul> <h3>2.6.1: Oct 28 2003</h3> <ul> <li>Mostly bugfixes after the big 2.6.0 changes</li> - <li>Unix compilation patches: libxml.m4 (Patrick Welche), warnings cleanup - (William Brack)</li> - <li>Windows compilation patches (Joachim Bauch, Stephane Bidoul, Igor - Zlatkovic)</li> + <li>Unix compilation patches: libxml.m4 (Patrick Welche), + warningscleanup(William Brack)</li> + <li>Windows compilation patches (Joachim Bauch, Stephane + Bidoul,IgorZlatkovic)</li> <li>xmlWriter bugfix (Alfred Mickautsch)</li> <li>chvalid.[ch]: couple of fixes from Stephane Bidoul</li> - <li>context reset: error state reset, push parser reset (Graham - Bennett)</li> + <li>context reset: error state reset, push parser reset (GrahamBennett)</li> <li>context reuse: generate errors if file is not readable</li> - <li>defaulted attributes for element coming from internal entities - (Stephane Bidoul)</li> + <li>defaulted attributes for element coming from internal + entities(StephaneBidoul)</li> <li>Python: tab and spaces mix (William Brack)</li> <li>Error handler could crash in DTD validation in 2.6.0</li> <li>xmlReader: do not use the document or element _private field</li> <li>testSAX.c: avoid a problem with some PIs (Massimo Morara)</li> - <li>general bug fixes: mandatory encoding in text decl, serializing - Document Fragment nodes, xmlSearchNs 2.6.0 problem (Kasimier Buchcik), - XPath errors not reported, slow HTML parsing of large documents.</li> + <li>general bug fixes: mandatory encoding in text decl, + serializingDocumentFragment nodes, xmlSearchNs 2.6.0 problem (Kasimier + Buchcik),XPath errorsnot reported, slow HTML parsing of large + documents.</li> </ul> <h3>2.6.0: Oct 20 2003</h3> <ul> - <li>Major revision release: should be API and ABI compatible but got a lot - of change</li> - <li>Increased the library modularity, far more options can be stripped out, - a --with-minimum configuration will weight around 160KBytes</li> - <li>Use per parser and per document dictionnary, allocate names and small - text nodes from the dictionnary</li> - <li>Switch to a SAX2 like parser rewrote most of the XML parser core, - provides namespace resolution and defaulted attributes, minimize memory - allocations and copies, namespace checking and specific error handling, - immutable buffers, make predefined entities static structures, etc...</li> - <li>rewrote all the error handling in the library, all errors can be - intercepted at a structured level, with precise information - available.</li> - <li>New simpler and more generic XML and HTML parser APIs, allowing to - easilly modify the parsing options and reuse parser context for multiple - consecutive documents.</li> - <li>Similar new APIs for the xmlReader, for options and reuse, provided new - functions to access content as const strings, use them for Python - bindings</li> - <li>a lot of other smaller API improvements: xmlStrPrintf (Aleksey Sanin), - Walker i.e. reader on a document tree based on Alfred Mickautsch code, - make room in nodes for line numbers, reference counting and future PSVI - extensions, generation of character ranges to be checked with faster - algorithm (William), xmlParserMaxDepth (Crutcher Dunnavant), buffer - access</li> + <li>Major revision release: should be API and ABI compatible but got alotof + change</li> + <li>Increased the library modularity, far more options can be strippedout,a + --with-minimum configuration will weight around 160KBytes</li> + <li>Use per parser and per document dictionnary, allocate names + andsmalltext nodes from the dictionnary</li> + <li>Switch to a SAX2 like parser rewrote most of the XML + parsercore,provides namespace resolution and defaulted attributes, + minimizememoryallocations and copies, namespace checking and specific + errorhandling,immutable buffers, make predefined entities static + structures,etc...</li> + <li>rewrote all the error handling in the library, all errors + canbeintercepted at a structured level, with + preciseinformationavailable.</li> + <li>New simpler and more generic XML and HTML parser APIs, + allowingtoeasilly modify the parsing options and reuse parser context + formultipleconsecutive documents.</li> + <li>Similar new APIs for the xmlReader, for options and reuse, + providednewfunctions to access content as const strings, use them + forPythonbindings</li> + <li>a lot of other smaller API improvements: xmlStrPrintf + (AlekseySanin),Walker i.e. reader on a document tree based on Alfred + Mickautschcode,make room in nodes for line numbers, reference counting + and futurePSVIextensions, generation of character ranges to be checked + withfasteralgorithm (William), xmlParserMaxDepth (Crutcher + Dunnavant),bufferaccess</li> <li>New xmlWriter API provided by Alfred Mickautsch</li> <li>Schemas: base64 support by Anthony Carrico</li> - <li>Parser<->HTTP integration fix, proper processing of the Mime-Type - and charset informations if available.</li> - <li>Relax-NG: bug fixes including the one reported by Martijn Faassen and - zeroOrMore, better error reporting.</li> - <li>Python bindings (Stéphane Bidoul), never use stdout for errors - output</li> - <li>Portability: all the headers have macros for export and calling - convention definitions (Igor Zlatkovic), VMS update (Craig A. Berry), - Windows: threads (Jesse Pelton), Borland compiler (Eric Zurcher, Igor), - Mingw (Igor), typos (Mark Vakoc), beta version (Stephane Bidoul), - warning cleanups on AIX and MIPS compilers (William Brack), BeOS (Marcin - 'Shard' Konicki)</li> - <li>Documentation fixes and README (William Brack), search fix (William), - tutorial updates (John Fleck), namespace docs (Stefan Kost)</li> - <li>Bug fixes: xmlCleanupParser (Dave Beckett), threading uninitialized - mutexes, HTML doctype lowercase, SAX/IO (William), compression detection - and restore (William), attribute declaration in DTDs (William), namespace - on attribute in HTML output (William), input filename (Rob Richards), - namespace DTD validation, xmlReplaceNode (Chris Ryland), I/O callbacks - (Markus Keim), CDATA serialization (Shaun McCance), xmlReader (Peter - Derr), high codepoint charref like &#x10FFFF;, buffer access in push - mode (Justin Fletcher), TLS threads on Windows (Jesse Pelton), XPath bug - (William), xmlCleanupParser (Marc Liyanage), CDATA output (William), HTTP - error handling.</li> - <li>xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 for compat - testing, --nodict for building without tree dictionnary, --nocdata to - replace CDATA by text, --nsclean to remove surperfluous namespace - declarations</li> + <li>Parser<->HTTP integration fix, proper processing of + theMime-Typeand charset informations if available.</li> + <li>Relax-NG: bug fixes including the one reported by Martijn + FaassenandzeroOrMore, better error reporting.</li> + <li>Python bindings (Stéphane Bidoul), never use stdout forerrorsoutput</li> + <li>Portability: all the headers have macros for export + andcallingconvention definitions (Igor Zlatkovic), VMS update (Craig + A.Berry),Windows: threads (Jesse Pelton), Borland compiler (Eric + Zurcher,Igor),Mingw (Igor), typos (Mark Vakoc), beta version + (StephaneBidoul),warning cleanups on AIX and MIPS compilers (William + Brack), BeOS(Marcin'Shard' Konicki)</li> + <li>Documentation fixes and README (William Brack), search + fix(William),tutorial updates (John Fleck), namespace docs (Stefan + Kost)</li> + <li>Bug fixes: xmlCleanupParser (Dave Beckett), + threadinguninitializedmutexes, HTML doctype lowercase, SAX/IO + (William),compression detectionand restore (William), attribute + declaration in DTDs(William), namespaceon attribute in HTML output + (William), input filename(Rob Richards),namespace DTD validation, + xmlReplaceNode (Chris Ryland),I/O callbacks(Markus Keim), CDATA + serialization (Shaun McCance),xmlReader (PeterDerr), high codepoint + charref like &#x10FFFF;, bufferaccess in pushmode (Justin Fletcher), + TLS threads on Windows (JessePelton), XPath bug(William), + xmlCleanupParser (Marc Liyanage), CDATAoutput (William), HTTPerror + handling.</li> + <li>xmllint options: --dtdvalidfpi for Tobias Reif, --sax1 + forcompattesting, --nodict for building without tree dictionnary, + --nocdatatoreplace CDATA by text, --nsclean to remove + surperfluousnamespacedeclarations</li> <li>added xml2-config --libtool-libs option from Kevin P. Fleming</li> - <li>a lot of profiling and tuning of the code, speedup patch for - xmlSearchNs() by Luca Padovani. The xmlReader should do far less - allocation and it speed should get closer to SAX. Chris Anderson worked - on speeding and cleaning up repetitive checking code.</li> + <li>a lot of profiling and tuning of the code, speedup + patchforxmlSearchNs() by Luca Padovani. The xmlReader should do + farlessallocation and it speed should get closer to SAX. Chris + Andersonworkedon speeding and cleaning up repetitive checking code.</li> <li>cleanup of "make tests"</li> <li>libxml-2.0-uninstalled.pc from Malcolm Tredinnick</li> - <li>deactivated the broken docBook SGML parser code and plugged the XML - parser instead.</li> + <li>deactivated the broken docBook SGML parser code and plugged + theXMLparser instead.</li> </ul> <h3>2.5.11: Sep 9 2003</h3> @@ -1411,8 +1440,8 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <ul> <li>Windows Makefiles (William Brack)</li> <li>UTF-16 support fixes (Mark Itzcovitz)</li> - <li>Makefile and portability (William Brack) automake, Linux alpha, Mingw - on Windows (Mikhail Grushinskiy)</li> + <li>Makefile and portability (William Brack) automake, Linux alpha, + MingwonWindows (Mikhail Grushinskiy)</li> <li>HTML parser (Oliver Stoeneberg)</li> <li>XInclude performance problem reported by Kevin Ruscoe</li> <li>XML parser performance problem reported by Grant Goodale</li> @@ -1422,13 +1451,13 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.5.9: Aug 9 2003</h3> <ul> - <li>bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), Windows build - (Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter Sobisch), threading - (Rob Richards), hexBinary type (), UTF-16 BOM (Dodji Seketeli), - xmlReader, Relax-NG schemas compilation, namespace handling, EXSLT (Sean - Griffin), HTML parsing problem (William Brack), DTD validation for mixed - content + namespaces, HTML serialization, library initialization, - progressive HTML parser</li> + <li>bugfixes: IPv6 portability, xmlHasNsProp (Markus Keim), + Windowsbuild(Wiliam Brake, Jesse Pelton, Igor), Schemas (Peter + Sobisch),threading(Rob Richards), hexBinary type (), UTF-16 BOM + (DodjiSeketeli),xmlReader, Relax-NG schemas compilation, namespace + handling,EXSLT (SeanGriffin), HTML parsing problem (William Brack), DTD + validationfor mixedcontent + namespaces, HTML serialization, + libraryinitialization,progressive HTML parser</li> <li>better interfaces for Relax-NG error handling (Joachim Bauch, )</li> <li>adding xmlXIncludeProcessTree() for XInclud'ing in a subtree</li> <li>doc fixes and improvements (John Fleck)</li> @@ -1436,86 +1465,85 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <li>couple of new UTF-8 helper functions (William Brack)</li> <li>general encoding cleanup + ISO-8859-x without iconv (Peter Jacobi)</li> <li>xmlTextReader cleanup + enum for node types (Bjorn Reese)</li> - <li>general compilation/warning cleanup Solaris/HP-UX/... (William - Brack)</li> + <li>general compilation/warning cleanup Solaris/HP-UX/...(WilliamBrack)</li> </ul> <h3>2.5.8: Jul 6 2003</h3> <ul> - <li>bugfixes: XPath, XInclude, file/URI mapping, UTF-16 save (Mark - Itzcovitz), UTF-8 checking, URI saving, error printing (William Brack), - PI related memleak, compilation without schemas or without xpath (Joerg - Schmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem with DTDs, - rpm problem on , i86_64, removed a few compilation problems from 2.5.7, - xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)</li> + <li>bugfixes: XPath, XInclude, file/URI mapping, UTF-16 + save(MarkItzcovitz), UTF-8 checking, URI saving, error printing + (WilliamBrack),PI related memleak, compilation without schemas or without + xpath(JoergSchmitz-Linneweber/Garry Pennington), xmlUnlinkNode problem + withDTDs,rpm problem on , i86_64, removed a few compilation problems + from2.5.7,xmlIOParseDTD, and xmlSAXParseDTD (Malcolm Tredinnick)</li> <li>portability: DJGPP (MsDos) , OpenVMS (Craig A. Berry)</li> <li>William Brack fixed multithreading lock problems</li> <li>IPv6 patch for FTP and HTTP accesses (Archana Shah/Wipro)</li> - <li>Windows fixes (Igor Zlatkovic, Eric Zurcher), threading (Stéphane - Bidoul)</li> + <li>Windows fixes (Igor Zlatkovic, Eric Zurcher), + threading(StéphaneBidoul)</li> <li>A few W3C Schemas Structure improvements</li> <li>W3C Schemas Datatype improvements (Charlie Bozeman)</li> - <li>Python bindings for thread globals (Stéphane Bidoul), and method/class - generator</li> + <li>Python bindings for thread globals (Stéphane Bidoul), + andmethod/classgenerator</li> <li>added --nonet option to xmllint</li> <li>documentation improvements (John Fleck)</li> </ul> <h3>2.5.7: Apr 25 2003</h3> <ul> - <li>Relax-NG: Compiling to regexp and streaming validation on top of the - xmlReader interface, added to xmllint --stream</li> + <li>Relax-NG: Compiling to regexp and streaming validation on top + ofthexmlReader interface, added to xmllint --stream</li> <li>xmlReader: Expand(), Next() and DOM access glue, bug fixes</li> <li>Support for large files: RGN validated a 4.5GB instance</li> <li>Thread support is now configured in by default</li> - <li>Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes - (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser - and zero bytes handling, some missing Windows file path conversions, - behaviour of the parser and validator in the presence of "out of memory" - error conditions</li> - <li>extended the API to be able to plug a garbage collecting memory - allocator, added xmlMallocAtomic() and modified the allocations - accordingly.</li> - <li>Performances: removed excessive malloc() calls, speedup of the push and - xmlReader interfaces, removed excessive thread locking</li> + <li>Fixes: update of the Trio code (Bjorn), WXS Date and + Durationfixes(Charles Bozeman), DTD and namespaces (Brent Hendricks), + HTML pushparserand zero bytes handling, some missing Windows file + pathconversions,behaviour of the parser and validator in the presence of + "outof memory"error conditions</li> + <li>extended the API to be able to plug a garbage + collectingmemoryallocator, added xmlMallocAtomic() and modified + theallocationsaccordingly.</li> + <li>Performances: removed excessive malloc() calls, speedup of the + pushandxmlReader interfaces, removed excessive thread locking</li> <li>Documentation: man page (John Fleck), xmlReader documentation</li> <li>Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)</li> </ul> <h3>2.5.6: Apr 1 2003</h3> <ul> - <li>Fixed W3C XML Schemas datatype, should be compliant now except for - binHex and base64 which are not supported yet.</li> - <li>bug fixes: non-ASCII IDs, HTML output, XInclude on large docs and - XInclude entities handling, encoding detection on external subsets, XML - Schemas bugs and memory leaks, HTML parser (James Bursa)</li> + <li>Fixed W3C XML Schemas datatype, should be compliant now exceptforbinHex + and base64 which are not supported yet.</li> + <li>bug fixes: non-ASCII IDs, HTML output, XInclude on large + docsandXInclude entities handling, encoding detection on external + subsets,XMLSchemas bugs and memory leaks, HTML parser (James Bursa)</li> <li>portability: python/trio (Albert Chin), Sun compiler warnings</li> <li>documentation: added --relaxng option to xmllint man page (John)</li> - <li>improved error reporting: xml:space, start/end tag mismatches, Relax NG - errors</li> + <li>improved error reporting: xml:space, start/end tag mismatches, + RelaxNGerrors</li> </ul> <h3>2.5.5: Mar 24 2003</h3> <ul> - <li>Lot of fixes on the Relax NG implementation. More testing including - DocBook and TEI examples.</li> + <li>Lot of fixes on the Relax NG implementation. More + testingincludingDocBook and TEI examples.</li> <li>Increased the support for W3C XML Schemas datatype</li> <li>Several bug fixes in the URI handling layer</li> - <li>Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding - conversion, line counting in the parser.</li> + <li>Bug fixes: HTML parser, xmlReader, DTD validation, + XPath,encodingconversion, line counting in the parser.</li> <li>Added support for $XMLLINT_INDENT environment variable, FTP delete</li> <li>Fixed the RPM spec file name</li> </ul> <h3>2.5.4: Feb 20 2003</h3> <ul> - <li>Conformance testing and lot of fixes on Relax NG and XInclude - implementation</li> + <li>Conformance testing and lot of fixes on Relax NG + andXIncludeimplementation</li> <li>Implementation of XPointer element() scheme</li> - <li>Bug fixes: XML parser, XInclude entities merge, validity checking on - namespaces, - <p>2 serialization bugs, node info generation problems, a DTD regexp - generation problem.</p> + <li>Bug fixes: XML parser, XInclude entities merge, validity + checkingonnamespaces, + <p>2 serialization bugs, node info generation problems, a + DTDregexpgeneration problem.</p> </li> <li>Portability: windows updates and path canonicalization (Igor)</li> <li>A few typo fixes (Kjartan Maraas)</li> @@ -1524,11 +1552,11 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.5.3: Feb 10 2003</h3> <ul> - <li>RelaxNG and XML Schemas datatypes improvements, and added a first - version of RelaxNG Python bindings</li> - <li>Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API fix for - serializing namespace nodes, encoding conversion bug, XHTML1 - serialization</li> + <li>RelaxNG and XML Schemas datatypes improvements, and added afirstversion + of RelaxNG Python bindings</li> + <li>Fixes: XLink (Sean Chittenden), XInclude (Sean Chittenden), API + fixforserializing namespace nodes, encoding conversion + bug,XHTML1serialization</li> <li>Portability fixes: Windows (Igor), AMD 64bits RPM spec file</li> </ul> @@ -1536,17 +1564,17 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <ul> <li>First implementation of RelaxNG, added --relaxng flag to xmllint</li> <li>Schemas support now compiled in by default.</li> - <li>Bug fixes: DTD validation, namespace checking, XInclude and entities, - delegateURI in XML Catalogs, HTML parser, XML reader (Stéphane Bidoul), - XPath parser and evaluation, UTF8ToUTF8 serialization, XML reader memory - consumption, HTML parser, HTML serialization in the presence of - namespaces</li> + <li>Bug fixes: DTD validation, namespace checking, XInclude + andentities,delegateURI in XML Catalogs, HTML parser, XML reader + (StéphaneBidoul),XPath parser and evaluation, UTF8ToUTF8 serialization, + XMLreader memoryconsumption, HTML parser, HTML serialization in the + presenceofnamespaces</li> <li>added an HTML API to check elements and attributes.</li> - <li>Documentation improvement, PDF for the tutorial (John Fleck), doc - patches (Stefan Kost)</li> + <li>Documentation improvement, PDF for the tutorial (John Fleck),docpatches + (Stefan Kost)</li> <li>Portability fixes: NetBSD (Julio Merino), Windows (Igor Zlatkovic)</li> - <li>Added python bindings for XPointer, contextual error reporting - (Stéphane Bidoul)</li> + <li>Added python bindings for XPointer, contextual error + reporting(StéphaneBidoul)</li> <li>URI/file escaping problems (Stefano Zacchiroli)</li> </ul> @@ -1559,20 +1587,19 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.5.0: Jan 6 2003</h3> <ul> - <li>New <a href="xmlreader.html">XmltextReader interface</a> based on C# - API (with help of Stéphane Bidoul)</li> + <li>New <a href="xmlreader.html">XmltextReader interface</a>based on + C#API(with help of Stéphane Bidoul)</li> <li>Windows: more exports, including the new API (Igor)</li> <li>XInclude fallback fix</li> - <li>Python: bindings for the new API, packaging (Stéphane Bidoul), - drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), fixes, speedup - and iterators for Python-2.2 (Hannu Krosing)</li> - <li>Tutorial fixes (john Fleck and Niraj Tolia) xmllint man update - (John)</li> + <li>Python: bindings for the new API, packaging + (StéphaneBidoul),drv_libxml2.py Python xml.sax driver (Stéphane Bidoul), + fixes,speedupand iterators for Python-2.2 (Hannu Krosing)</li> + <li>Tutorial fixes (john Fleck and Niraj Tolia) xmllint manupdate(John)</li> <li>Fix an XML parser bug raised by Vyacheslav Pindyura</li> <li>Fix for VMS serialization (Nigel Hall) and config (Craig A. Berry)</li> <li>Entities handling fixes</li> - <li>new API to optionally track node creation and deletion (Lukas - Schroeder)</li> + <li>new API to optionally track node creation and + deletion(LukasSchroeder)</li> <li>Added documentation for the XmltextReader interface and some <a href="guidelines.html">XML guidelines</a></li> </ul> @@ -1580,23 +1607,24 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.4.30: Dec 12 2002</h3> <ul> <li>2.4.29 broke the python bindings, rereleasing</li> - <li>Improvement/fixes of the XML API generator, and couple of minor code - fixes.</li> + <li>Improvement/fixes of the XML API generator, and couple of + minorcodefixes.</li> </ul> <h3>2.4.29: Dec 11 2002</h3> <ul> - <li>Windows fixes (Igor): Windows CE port, pthread linking, python bindings - (Stéphane Bidoul), Mingw (Magnus Henoch), and export list updates</li> + <li>Windows fixes (Igor): Windows CE port, pthread linking, + pythonbindings(Stéphane Bidoul), Mingw (Magnus Henoch), and export + listupdates</li> <li>Fix for prev in python bindings (ERDI Gergo)</li> <li>Fix for entities handling (Marcus Clarke)</li> - <li>Refactored the XML and HTML dumps to a single code path, fixed XHTML1 - dump</li> + <li>Refactored the XML and HTML dumps to a single code path, + fixedXHTML1dump</li> <li>Fix for URI parsing when handling URNs with fragment identifiers</li> <li>Fix for HTTP URL escaping problem</li> <li>added an TextXmlReader (C#) like API (work in progress)</li> - <li>Rewrote the API in XML generation script, includes a C parser and saves - more informations needed for C# bindings</li> + <li>Rewrote the API in XML generation script, includes a C parser + andsavesmore informations needed for C# bindings</li> </ul> <h3>2.4.28: Nov 22 2002</h3> @@ -1613,15 +1641,15 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.4.27: Nov 17 2002</h3> <ul> <li>fixes for the Python bindings</li> - <li>a number of bug fixes: SGML catalogs, xmlParseBalancedChunkMemory(), - HTML parser, Schemas (Charles Bozeman), document fragment support - (Christian Glahn), xmlReconciliateNs (Brian Stafford), XPointer, - xmlFreeNode(), xmlSAXParseMemory (Peter Jones), xmlGetNodePath (Petr - Pajas), entities processing</li> + <li>a number of bug fixes: SGML catalogs,xmlParseBalancedChunkMemory(),HTML + parser, Schemas (Charles Bozeman),document fragment support(Christian + Glahn), xmlReconciliateNs (BrianStafford), XPointer,xmlFreeNode(), + xmlSAXParseMemory (Peter Jones),xmlGetNodePath (PetrPajas), entities + processing</li> <li>added grep to xmllint --shell</li> <li>VMS update patch from Craig A. Berry</li> - <li>cleanup of the Windows build with support for more compilers (Igor), - better thread support on Windows</li> + <li>cleanup of the Windows build with support for more + compilers(Igor),better thread support on Windows</li> <li>cleanup of Unix Makefiles and spec file</li> <li>Improvements to the documentation (John Fleck)</li> </ul> @@ -1629,27 +1657,27 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <h3>2.4.26: Oct 18 2002</h3> <ul> <li>Patches for Windows CE port, improvements on Windows paths handling</li> - <li>Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() , - HTML serialization, Namespace compliance, and a number of small - problems</li> + <li>Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() + ,HTMLserialization, Namespace compliance, and a number of + smallproblems</li> </ul> <h3>2.4.25: Sep 26 2002</h3> <ul> - <li>A number of bug fixes: XPath, validation, Python bindings, DOM and - tree, xmlI/O, Html</li> + <li>A number of bug fixes: XPath, validation, Python bindings, DOM + andtree,xmlI/O, Html</li> <li>Serious rewrite of XInclude</li> - <li>Made XML Schemas regexp part of the default build and APIs, small fix - and improvement of the regexp core</li> + <li>Made XML Schemas regexp part of the default build and APIs, smallfixand + improvement of the regexp core</li> <li>Changed the validation code to reuse XML Schemas regexp APIs</li> - <li>Better handling of Windows file paths, improvement of Makefiles (Igor, - Daniel Gehriger, Mark Vakoc)</li> - <li>Improved the python I/O bindings, the tests, added resolver and regexp - APIs</li> + <li>Better handling of Windows file paths, improvement of + Makefiles(Igor,Daniel Gehriger, Mark Vakoc)</li> + <li>Improved the python I/O bindings, the tests, added resolver + andregexpAPIs</li> <li>New logos from Marc Liyanage</li> <li>Tutorial improvements: John Fleck, Christopher Harris</li> - <li>Makefile: Fixes for AMD x86_64 (Mandrake), DESTDIR (Christophe - Merlet)</li> + <li>Makefile: Fixes for AMD x86_64 (Mandrake), + DESTDIR(ChristopheMerlet)</li> <li>removal of all stderr/perror use for error reporting</li> <li>Better error reporting: XPath and DTD validation</li> <li>update of the trio portability layer (Bjorn Reese)</li> @@ -1658,8 +1686,8 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <p><strong>2.4.24: Aug 22 2002</strong></p> <ul> <li>XPath fixes (William), xf:escape-uri() (Wesley Terpstra)</li> - <li>Python binding fixes: makefiles (William), generator, rpm build, x86-64 - (fcrozat)</li> + <li>Python binding fixes: makefiles (William), generator, rpm + build,x86-64(fcrozat)</li> <li>HTML <style> and boolean attributes serializer fixes</li> <li>C14N improvements by Aleksey</li> <li>doc cleanups: Rick Jones</li> @@ -1673,38 +1701,38 @@ to the <a href="http://cvs.gnome.org/viewcvs/libxml2/">CVS</a> code base.</p> <li>c14n fixes, testsuite and performances: Aleksey Sanin</li> <li>added xmlDocFormatDump: Chema Celorio</li> <li>new tutorial: John Fleck</li> - <li>new hash functions and performances: Sander Vesik, portability fix from - Peter Jacobi</li> - <li>a number of bug fixes: XPath (William Brack, Richard Jinks), XML and - HTML parsers, ID lookup function</li> + <li>new hash functions and performances: Sander Vesik, portability + fixfromPeter Jacobi</li> + <li>a number of bug fixes: XPath (William Brack, Richard Jinks), XMLandHTML + parsers, ID lookup function</li> <li>removal of all remaining sprintf: Aleksey Sanin</li> </ul> <h3>2.4.22: May 27 2002</h3> <ul> - <li>a number of bug fixes: configure scripts, base handling, parser, memory - usage, HTML parser, XPath, documentation (Christian Cornelssen), - indentation, URI parsing</li> - <li>Optimizations for XMLSec, fixing and making public some of the network - protocol handlers (Aleksey)</li> + <li>a number of bug fixes: configure scripts, base handling, + parser,memoryusage, HTML parser, XPath, documentation + (ChristianCornelssen),indentation, URI parsing</li> + <li>Optimizations for XMLSec, fixing and making public some of + thenetworkprotocol handlers (Aleksey)</li> <li>performance patch from Gary Pennington</li> - <li>Charles Bozeman provided date and time support for XML Schemas - datatypes</li> + <li>Charles Bozeman provided date and time support for + XMLSchemasdatatypes</li> </ul> <h3>2.4.21: Apr 29 2002</h3> -<p>This release is both a bug fix release and also contains the early XML -Schemas <a href="http://www.w3.org/TR/xmlschema-1/">structures</a> and <a -href="http://www.w3.org/TR/xmlschema-2/">datatypes</a> code, beware, all -interfaces are likely to change, there is huge holes, it is clearly a work in -progress and don't even think of putting this code in a production system, -it's actually not compiled in by default. The real fixes are:</p> +<p>This release is both a bug fix release and also contains the +earlyXMLSchemas <a href="http://www.w3.org/TR/xmlschema-1/">structures</a>and +<a href="http://www.w3.org/TR/xmlschema-2/">datatypes</a>code, +beware,allinterfaces are likely to change, there is huge holes, it is clearly +a workinprogress and don't even think of putting this code in a +productionsystem,it's actually not compiled in by default. The real fixes +are:</p> <ul> <li>a couple of bugs or limitations introduced in 2.4.20</li> <li>patches for Borland C++ and MSC by Igor</li> - <li>some fixes on XPath strings and conformance patches by Richard - Jinks</li> + <li>some fixes on XPath strings and conformance patches by RichardJinks</li> <li>patch from Aleksey for the ExcC14N specification</li> <li>OSF/1 bug fix by Bjorn</li> </ul> @@ -1713,14 +1741,14 @@ it's actually not compiled in by default. The real fixes are:</p> <ul> <li>bug fixes: file descriptor leak, XPath, HTML output, DTD validation</li> <li>XPath conformance testing by Richard Jinks</li> - <li>Portability fixes: Solaris, MPE/iX, Windows, OSF/1, python bindings, - libxml.m4</li> + <li>Portability fixes: Solaris, MPE/iX, Windows, OSF/1, + pythonbindings,libxml.m4</li> </ul> <h3>2.4.19: Mar 25 2002</h3> <ul> - <li>bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8 - encoder</li> + <li>bug fixes: half a dozen XPath bugs, Validation, ISO-Latin + toUTF8encoder</li> <li>portability fixes in the HTTP code</li> <li>memory allocation checks using valgrind, and profiling tests</li> <li>revamp of the Windows build and Makefiles</li> @@ -1728,8 +1756,8 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.18: Mar 18 2002</h3> <ul> - <li>bug fixes: tree, SAX, canonicalization, validation, portability, - XPath</li> + <li>bug fixes: tree, SAX, canonicalization, + validation,portability,XPath</li> <li>removed the --with-buffer option it was becoming unmaintainable</li> <li>serious cleanup of the Python makefiles</li> <li>speedup patch to XPath very effective for DocBook stylesheets</li> @@ -1738,17 +1766,18 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.17: Mar 8 2002</h3> <ul> - <li>a lot of bug fixes, including "namespace nodes have no parents in - XPath"</li> - <li>fixed/improved the Python wrappers, added more examples and more - regression tests, XPath extension functions can now return node-sets</li> + <li>a lot of bug fixes, including "namespace nodes have no + parentsinXPath"</li> + <li>fixed/improved the Python wrappers, added more examples + andmoreregression tests, XPath extension functions can now + returnnode-sets</li> <li>added the XML Canonicalization support from Aleksey Sanin</li> </ul> <h3>2.4.16: Feb 20 2002</h3> <ul> - <li>a lot of bug fixes, most of them were triggered by the XML Testsuite - from OASIS and W3C. Compliance has been significantly improved.</li> + <li>a lot of bug fixes, most of them were triggered by the XMLTestsuitefrom + OASIS and W3C. Compliance has been significantlyimproved.</li> <li>a couple of portability fixes too.</li> </ul> @@ -1762,40 +1791,40 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.14: Feb 8 2002</h3> <ul> <li>Change of License to the <a - href="http://www.opensource.org/licenses/mit-license.html">MIT - License</a> basically for integration in XFree86 codebase, and removing - confusion around the previous dual-licensing</li> - <li>added Python bindings, beta software but should already be quite - complete</li> - <li>a large number of fixes and cleanups, especially for all tree - manipulations</li> - <li>cleanup of the headers, generation of a reference API definition in - XML</li> + href="http://www.opensource.org/licenses/mit-license.html">MITLicense</a>basicallyfor + integration in XFree86 codebase, and removingconfusion around theprevious + dual-licensing</li> + <li>added Python bindings, beta software but should already + bequitecomplete</li> + <li>a large number of fixes and cleanups, especially for + alltreemanipulations</li> + <li>cleanup of the headers, generation of a reference API + definitioninXML</li> </ul> <h3>2.4.13: Jan 14 2002</h3> <ul> <li>update of the documentation: John Fleck and Charlie Bozeman</li> <li>cleanup of timing code from Justin Fletcher</li> - <li>fixes for Windows and initial thread support on Win32: Igor and Serguei - Narojnyi</li> + <li>fixes for Windows and initial thread support on Win32: Igor + andSergueiNarojnyi</li> <li>Cygwin patch from Robert Collins</li> <li>added xmlSetEntityReferenceFunc() for Keith Isdale work on xsldbg</li> </ul> <h3>2.4.12: Dec 7 2001</h3> <ul> - <li>a few bug fixes: thread (Gary Pennington), xmllint (Geert Kloosterman), - XML parser (Robin Berjon), XPointer (Danny Jamshy), I/O cleanups - (robert)</li> + <li>a few bug fixes: thread (Gary Pennington), xmllint + (GeertKloosterman),XML parser (Robin Berjon), XPointer (Danny Jamshy), + I/Ocleanups(robert)</li> <li>Eric Lavigne contributed project files for MacOS</li> <li>some makefiles cleanups</li> </ul> <h3>2.4.11: Nov 26 2001</h3> <ul> - <li>fixed a couple of errors in the includes, fixed a few bugs, some code - cleanups</li> + <li>fixed a couple of errors in the includes, fixed a few bugs, + somecodecleanups</li> <li>xmllint man pages improvement by Heiko Rupp</li> <li>updated VMS build instructions from John A Fotheringham</li> <li>Windows Makefiles updates from Igor</li> @@ -1806,8 +1835,8 @@ it's actually not compiled in by default. The real fixes are:</p> <li>URI escaping fix (Joel Young)</li> <li>added xmlGetNodePath() (for paths or XPointers generation)</li> <li>Fixes namespace handling problems when using DTD and validation</li> - <li>improvements on xmllint: Morus Walter patches for --format and - --encode, Stefan Kost and Heiko Rupp improvements on the --shell</li> + <li>improvements on xmllint: Morus Walter patches for --format + and--encode,Stefan Kost and Heiko Rupp improvements on the --shell</li> <li>fixes for xmlcatalog linking pointed by Weiqi Gao</li> <li>fixes to the HTML parser</li> </ul> @@ -1820,8 +1849,8 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.8: Nov 4 2001</h3> <ul> - <li>fixed SGML catalogs broken in previous release, updated xmlcatalog - tool</li> + <li>fixed SGML catalogs broken in previous release, + updatedxmlcatalogtool</li> <li>fixed a compile errors and some includes troubles.</li> </ul> @@ -1829,8 +1858,8 @@ it's actually not compiled in by default. The real fixes are:</p> <ul> <li>exported some debugging interfaces</li> <li>serious rewrite of the catalog code</li> - <li>integrated Gary Pennington thread safety patch, added configure option - and regression tests</li> + <li>integrated Gary Pennington thread safety patch, added + configureoptionand regression tests</li> <li>removed an HTML parser bug</li> <li>fixed a couple of potentially serious validation bugs</li> <li>integrated the SGML DocBook support in xmllint</li> @@ -1854,20 +1883,19 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.5: Sep 14 2001</h3> <ul> <li>Remove a few annoying bugs in 2.4.4</li> - <li>forces the HTML serializer to output decimal charrefs since some - version of Netscape can't handle hexadecimal ones</li> + <li>forces the HTML serializer to output decimal charrefs since + someversionof Netscape can't handle hexadecimal ones</li> </ul> <h3>1.8.16: Sep 14 2001</h3> <ul> - <li>maintenance release of the old libxml1 branch, couple of bug and - portability fixes</li> + <li>maintenance release of the old libxml1 branch, couple of + bugandportability fixes</li> </ul> <h3>2.4.4: Sep 12 2001</h3> <ul> - <li>added --convert to xmlcatalog, bug fixes and cleanups of XML - Catalog</li> + <li>added --convert to xmlcatalog, bug fixes and cleanups of XMLCatalog</li> <li>a few bug fixes and some portability changes</li> <li>some documentation cleanups</li> </ul> @@ -1901,17 +1929,17 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.4.0: July 10 2001</h3> <ul> <li>Fixed a few bugs in XPath, validation, and tree handling.</li> - <li>Fixed XML Base implementation, added a couple of examples to the - regression tests</li> + <li>Fixed XML Base implementation, added a couple of examples + totheregression tests</li> <li>A bit of cleanup</li> </ul> <h3>2.3.14: July 5 2001</h3> <ul> - <li>fixed some entities problems and reduce memory requirement when - substituting them</li> - <li>lots of improvements in the XPath queries interpreter can be - substantially faster</li> + <li>fixed some entities problems and reduce memory + requirementwhensubstituting them</li> + <li>lots of improvements in the XPath queries interpreter + canbesubstantially faster</li> <li>Makefiles and configure cleanups</li> <li>Fixes to XPath variable eval, and compare on empty node set</li> <li>HTML tag closing bug fixed</li> @@ -1937,26 +1965,27 @@ it's actually not compiled in by default. The real fixes are:</p> <li>fixed line number counting</li> <li>fixed serious problems in the XInclude processing</li> <li>added support for UTF8 BOM at beginning of entities</li> - <li>fixed a strange gcc optimizer bugs in xpath handling of float, gcc-3.0 - miscompile uri.c (William), Thomas Leitner provided a fix for the - optimizer on Tru64</li> - <li>incorporated Yon Derek and Igor Zlatkovic fixes and improvements for - compilation on Windows MSC</li> + <li>fixed a strange gcc optimizer bugs in xpath handling of + float,gcc-3.0miscompile uri.c (William), Thomas Leitner provided a fix + fortheoptimizer on Tru64</li> + <li>incorporated Yon Derek and Igor Zlatkovic fixes and + improvementsforcompilation on Windows MSC</li> <li>update of libxml-doc.el (Felix Natter)</li> <li>fixed 2 bugs in URI normalization code</li> </ul> <h3>2.3.11: June 17 2001</h3> <ul> - <li>updates to trio, Makefiles and configure should fix some portability - problems (alpha)</li> - <li>fixed some HTML serialization problems (pre, script, and block/inline - handling), added encoding aware APIs, cleanup of this code</li> + <li>updates to trio, Makefiles and configure should fix + someportabilityproblems (alpha)</li> + <li>fixed some HTML serialization problems (pre, script, + andblock/inlinehandling), added encoding aware APIs, cleanup of + thiscode</li> <li>added xmlHasNsProp()</li> - <li>implemented a specific PI for encoding support in the DocBook SGML - parser</li> - <li>some XPath fixes (-Infinity, / as a function parameter and namespaces - node selection)</li> + <li>implemented a specific PI for encoding support in the + DocBookSGMLparser</li> + <li>some XPath fixes (-Infinity, / as a function parameter + andnamespacesnode selection)</li> <li>fixed a performance problem and an error in the validation code</li> <li>fixed XInclude routine to implement the recursive behaviour</li> <li>fixed xmlFreeNode problem when libxml is included statically twice</li> @@ -1966,8 +1995,8 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.3.10: June 1 2001</h3> <ul> <li>fixed the SGML catalog support</li> - <li>a number of reported bugs got fixed, in XPath, iconv detection, - XInclude processing</li> + <li>a number of reported bugs got fixed, in XPath, iconv + detection,XIncludeprocessing</li> <li>XPath string function should now handle unicode correctly</li> </ul> @@ -1980,8 +2009,8 @@ it's actually not compiled in by default. The real fixes are:</p> <li>some documentation cleanups</li> <li>trying to get better linking on Solaris (-R)</li> <li>XPath API cleanup from Thomas Broyer</li> - <li>Validation bug fixed #54631, added a patch from Gary Pennington, fixed - xmlValidGetValidElements()</li> + <li>Validation bug fixed #54631, added a patch from Gary + Pennington,fixedxmlValidGetValidElements()</li> <li>Added an INSTALL file</li> <li>Attribute removal added to API: #54433</li> <li>added a basic support for SGML catalogs</li> @@ -2000,10 +2029,10 @@ it's actually not compiled in by default. The real fixes are:</p> <ul> <li>Integrated an SGML DocBook parser for the Gnome project</li> <li>Fixed a few things in the HTML parser</li> - <li>Fixed some XPath bugs raised by XSLT use, tried to fix the floating - point portability issue</li> - <li>Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s for - DOM+validation using the XML REC as input and a 700MHz celeron).</li> + <li>Fixed some XPath bugs raised by XSLT use, tried to fix thefloatingpoint + portability issue</li> + <li>Speed improvement (8M/s for SAX, 3M/s for DOM, 1.5M/s + forDOM+validationusing the XML REC as input and a 700MHz celeron).</li> <li>incorporated more Windows cleanup</li> <li>added xmlSaveFormatFile()</li> <li>fixed problems in copying nodes with entities references (gdome)</li> @@ -2026,40 +2055,41 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.3.6: April 8 2001</h3> <ul> - <li>Code cleanup using extreme gcc compiler warning options, found and - cleared half a dozen potential problem</li> + <li>Code cleanup using extreme gcc compiler warning options, + foundandcleared half a dozen potential problem</li> <li>the Eazel team found an XML parser bug</li> - <li>cleaned up the user of some of the string formatting function. used the - trio library code to provide the one needed when the platform is missing - them</li> - <li>xpath: removed a memory leak and fixed the predicate evaluation - problem, extended the testsuite and cleaned up the result. XPointer seems - broken ...</li> + <li>cleaned up the user of some of the string formatting function. + usedthetrio library code to provide the one needed when the platform + ismissingthem</li> + <li>xpath: removed a memory leak and fixed the predicate + evaluationproblem,extended the testsuite and cleaned up the result. + XPointer seemsbroken...</li> </ul> <h3>2.3.5: Mar 23 2001</h3> <ul> - <li>Biggest change is separate parsing and evaluation of XPath expressions, - there is some new APIs for this too</li> - <li>included a number of bug fixes(XML push parser, 51876, notations, - 52299)</li> + <li>Biggest change is separate parsing and evaluation of + XPathexpressions,there is some new APIs for this too</li> + <li>included a number of bug fixes(XML push parser, + 51876,notations,52299)</li> <li>Fixed some portability issues</li> </ul> <h3>2.3.4: Mar 10 2001</h3> <ul> <li>Fixed bugs #51860 and #51861</li> - <li>Added a global variable xmlDefaultBufferSize to allow default buffer - size to be application tunable.</li> - <li>Some cleanup in the validation code, still a bug left and this part - should probably be rewritten to support ambiguous content model :-\</li> - <li>Fix a couple of serious bugs introduced or raised by changes in 2.3.3 - parser</li> + <li>Added a global variable xmlDefaultBufferSize to allow defaultbuffersize + to be application tunable.</li> + <li>Some cleanup in the validation code, still a bug left and + thispartshould probably be rewritten to support ambiguous content + model:-\</li> + <li>Fix a couple of serious bugs introduced or raised by changes + in2.3.3parser</li> <li>Fixed another bug in xmlNodeGetContent()</li> <li>Bjorn fixed XPath node collection and Number formatting</li> <li>Fixed a loop reported in the HTML parsing</li> - <li>blank space are reported even if the Dtd content model proves that they - are formatting spaces, this is for XML conformance</li> + <li>blank space are reported even if the Dtd content model proves + thattheyare formatting spaces, this is for XML conformance</li> </ul> <h3>2.3.3: Mar 1 2001</h3> @@ -2081,22 +2111,21 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.3.1: Feb 15 2001</h3> <ul> <li>some XPath and HTML bug fixes for XSLT</li> - <li>small extension of the hash table interfaces for DOM gdome2 - implementation</li> + <li>small extension of the hash table interfaces for + DOMgdome2implementation</li> <li>A few bug fixes</li> </ul> <h3>2.3.0: Feb 8 2001 (2.2.12 was on 25 Jan but I didn't kept track)</h3> <ul> <li>Lots of XPath bug fixes</li> - <li>Add a mode with Dtd lookup but without validation error reporting for - XSLT</li> + <li>Add a mode with Dtd lookup but without validation error + reportingforXSLT</li> <li>Add support for text node without escaping (XSLT)</li> <li>bug fixes for xmlCheckFilename</li> <li>validation code bug fixes from Gary Pennington</li> <li>Patch from Paul D. Smith correcting URI path normalization</li> - <li>Patch to allow simultaneous install of libxml-devel and - libxml2-devel</li> + <li>Patch to allow simultaneous install of libxml-develandlibxml2-devel</li> <li>the example Makefile is now fixed</li> <li>added HTML to the RPM packages</li> <li>tree copying bugfixes</li> @@ -2129,8 +2158,8 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.2.8: Nov 13 2000</h3> <ul> - <li>First version of <a href="http://www.w3.org/TR/xinclude">XInclude</a> - support</li> + <li>First version of <a + href="http://www.w3.org/TR/xinclude">XInclude</a>support</li> <li>Patch in conditional section handling</li> <li>updated MS compiler project</li> <li>fixed some XPath problems</li> @@ -2149,12 +2178,12 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.2.6: Oct 25 2000:</h3> <ul> - <li>Added an hash table module, migrated a number of internal structure to - those</li> + <li>Added an hash table module, migrated a number of internal + structuretothose</li> <li>Fixed a posteriori validation problems</li> <li>HTTP module cleanups</li> - <li>HTML parser improvements (tag errors, script/style handling, attribute - normalization)</li> + <li>HTML parser improvements (tag errors, script/style + handling,attributenormalization)</li> <li>coalescing of adjacent text nodes</li> <li>couple of XPath bug fixes, exported the internal API</li> </ul> @@ -2162,10 +2191,10 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.2.5: Oct 15 2000:</h3> <ul> <li>XPointer implementation and testsuite</li> - <li>Lot of XPath fixes, added variable and functions registration, more - tests</li> - <li>Portability fixes, lots of enhancements toward an easy Windows build - and release</li> + <li>Lot of XPath fixes, added variable and functions + registration,moretests</li> + <li>Portability fixes, lots of enhancements toward an easy Windows + buildandrelease</li> <li>Late validation fixes</li> <li>Integrated a lot of contributed patches</li> <li>added memory management docs</li> @@ -2183,10 +2212,10 @@ it's actually not compiled in by default. The real fixes are:</p> <ul> <li>bug fixes</li> <li>cleanup of entity handling code</li> - <li>overall review of all loops in the parsers, all sprintf usage has been - checked too</li> - <li>Far better handling of larges Dtd. Validating against DocBook XML Dtd - works smoothly now.</li> + <li>overall review of all loops in the parsers, all sprintf usage + hasbeenchecked too</li> + <li>Far better handling of larges Dtd. Validating against DocBook + XMLDtdworks smoothly now.</li> </ul> <h3>1.8.10: Sep 6 2000</h3> @@ -2205,29 +2234,29 @@ it's actually not compiled in by default. The real fixes are:</p> <li>a purely bug fixes release</li> <li>fixed an encoding support problem when parsing from a memory block</li> <li>fixed a DOCTYPE parsing problem</li> - <li>removed a bug in the function allowing to override the memory - allocation routines</li> + <li>removed a bug in the function allowing to override the + memoryallocationroutines</li> </ul> <h3>2.2.0: July 14 2000</h3> <ul> <li>applied a lot of portability fixes</li> - <li>better encoding support/cleanup and saving (content is now always - encoded in UTF-8)</li> + <li>better encoding support/cleanup and saving (content is nowalwaysencoded + in UTF-8)</li> <li>the HTML parser now correctly handles encodings</li> <li>added xmlHasProp()</li> <li>fixed a serious problem with &#38;</li> <li>propagated the fix to FTP client</li> <li>cleanup, bugfixes, etc ...</li> - <li>Added a page about <a href="encoding.html">libxml Internationalization - support</a></li> + <li>Added a page about <a + href="encoding.html">libxmlInternationalizationsupport</a></li> </ul> <h3>1.8.9: July 9 2000</h3> <ul> <li>fixed the spec the RPMs should be better</li> - <li>fixed a serious bug in the FTP implementation, released 1.8.9 to solve - rpmfind users problem</li> + <li>fixed a serious bug in the FTP implementation, released 1.8.9 + tosolverpmfind users problem</li> </ul> <h3>2.1.1: July 1 2000</h3> @@ -2238,17 +2267,17 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.1.0 and 1.8.8: June 29 2000</h3> <ul> - <li>1.8.8 is mostly a commodity package for upgrading to libxml2 according - to <a href="upgrade.html">new instructions</a>. It fixes a nasty problem - about &#38; charref parsing</li> - <li>2.1.0 also ease the upgrade from libxml v1 to the recent version. it - also contains numerous fixes and enhancements: + <li>1.8.8 is mostly a commodity package for upgrading to libxml2accordingto + <a href="upgrade.html">new instructions</a>. It fixes a nastyproblemabout + &#38; charref parsing</li> + <li>2.1.0 also ease the upgrade from libxml v1 to the recent version.italso + contains numerous fixes and enhancements: <ul> <li>added xmlStopParser() to stop parsing</li> <li>improved a lot parsing speed when there is large CDATA blocs</li> <li>includes XPath patches provided by Picdar Technology</li> - <li>tried to fix as much as possible DTD validation and namespace - related problems</li> + <li>tried to fix as much as possible DTD validation andnamespacerelated + problems</li> <li>output to a given encoding has been added/tested</li> <li>lot of various fixes</li> </ul> @@ -2257,96 +2286,97 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>2.0.0: Apr 12 2000</h3> <ul> - <li>First public release of libxml2. If you are using libxml, it's a good - idea to check the 1.x to 2.x upgrade instructions. NOTE: while initially - scheduled for Apr 3 the release occurred only on Apr 12 due to massive - workload.</li> - <li>The include are now located under $prefix/include/libxml (instead of - $prefix/include/gnome-xml), they also are referenced by + <li>First public release of libxml2. If you are using libxml, it's + agoodidea to check the 1.x to 2.x upgrade instructions. NOTE: + whileinitiallyscheduled for Apr 3 the release occurred only on Apr 12 due + tomassiveworkload.</li> + <li>The include are now located under $prefix/include/libxml + (insteadof$prefix/include/gnome-xml), they also are referenced by <pre>#include <libxml/xxx.h></pre> <p>instead of</p> <pre>#include "xxx.h"</pre> </li> <li>a new URI module for parsing URIs and following strictly RFC 2396</li> - <li>the memory allocation routines used by libxml can now be overloaded - dynamically by using xmlMemSetup()</li> - <li>The previously CVS only tool tester has been renamed - <strong>xmllint</strong> and is now installed as part of the libxml2 - package</li> - <li>The I/O interface has been revamped. There is now ways to plug in - specific I/O modules, either at the URI scheme detection level using - xmlRegisterInputCallbacks() or by passing I/O functions when creating a - parser context using xmlCreateIOParserCtxt()</li> - <li>there is a C preprocessor macro LIBXML_VERSION providing the version - number of the libxml module in use</li> - <li>a number of optional features of libxml can now be excluded at - configure time (FTP/HTTP/HTML/XPath/Debug)</li> + <li>the memory allocation routines used by libxml can now + beoverloadeddynamically by using xmlMemSetup()</li> + <li>The previously CVS only tool tester has + beenrenamed<strong>xmllint</strong>and is now installed as part of + thelibxml2package</li> + <li>The I/O interface has been revamped. There is now ways to + pluginspecific I/O modules, either at the URI scheme detection + levelusingxmlRegisterInputCallbacks() or by passing I/O functions + whencreating aparser context using xmlCreateIOParserCtxt()</li> + <li>there is a C preprocessor macro LIBXML_VERSION providing + theversionnumber of the libxml module in use</li> + <li>a number of optional features of libxml can now be excluded + atconfiguretime (FTP/HTTP/HTML/XPath/Debug)</li> </ul> <h3>2.0.0beta: Mar 14 2000</h3> <ul> <li>This is a first Beta release of libxml version 2</li> - <li>It's available only from<a href="ftp://xmlsoft.org/libxml2/">xmlsoft.org - FTP</a>, it's packaged as libxml2-2.0.0beta and available as tar and - RPMs</li> - <li>This version is now the head in the Gnome CVS base, the old one is - available under the tag LIB_XML_1_X</li> - <li>This includes a very large set of changes. From a programmatic point - of view applications should not have to be modified too much, check the - <a href="upgrade.html">upgrade page</a></li> + <li>It's available only from<a + href="ftp://xmlsoft.org/libxml2/">xmlsoft.orgFTP</a>, it's packaged + aslibxml2-2.0.0beta and available as tar andRPMs</li> + <li>This version is now the head in the Gnome CVS base, the old + oneisavailable under the tag LIB_XML_1_X</li> + <li>This includes a very large set of changes. From a programmatic + pointofview applications should not have to be modified too much, check + the<a href="upgrade.html">upgrade page</a></li> <li>Some interfaces may changes (especially a bit about encoding).</li> <li>the updates includes: <ul> - <li>fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly) seems correctly - handled now</li> - <li>Better handling of entities, especially well-formedness checking - and proper PEref extensions in external subsets</li> + <li>fix I18N support. ISO-Latin-x/UTF-8/UTF-16 (nearly) + seemscorrectlyhandled now</li> + <li>Better handling of entities, especially well-formedness + checkingandproper PEref extensions in external subsets</li> <li>DTD conditional sections</li> <li>Validation now correctly handle entities content</li> - <li><a href="http://rpmfind.net/tools/gdome/messages/0039.html">change - structures to accommodate DOM</a></li> + <li><a + href="http://rpmfind.net/tools/gdome/messages/0039.html">changestructuresto + accommodate DOM</a></li> </ul> </li> <li>Serious progress were made toward compliance, <a - href="conf/result.html">here are the result of the test</a> against the - OASIS testsuite (except the Japanese tests since I don't support that - encoding yet). This URL is rebuilt every couple of hours using the CVS - head version.</li> + href="conf/result.html">here are the result of the + test</a>againsttheOASIS testsuite (except the Japanese tests since I + don't supportthatencoding yet). This URL is rebuilt every couple of hours + using theCVShead version.</li> </ul> <h3>1.8.7: Mar 6 2000</h3> <ul> <li>This is a bug fix release:</li> - <li>It is possible to disable the ignorable blanks heuristic used by - libxml-1.x, a new function xmlKeepBlanksDefault(0) will allow this. Note - that for adherence to XML spec, this behaviour will be disabled by - default in 2.x . The same function will allow to keep compatibility for - old code.</li> - <li>Blanks in <a> </a> constructs are not ignored anymore, - avoiding heuristic is really the Right Way :-\</li> - <li>The unchecked use of snprintf which was breaking libxml-1.8.6 - compilation on some platforms has been fixed</li> - <li>nanoftp.c nanohttp.c: Fixed '#' and '?' stripping when processing - URIs</li> + <li>It is possible to disable the ignorable blanks heuristic + usedbylibxml-1.x, a new function xmlKeepBlanksDefault(0) will allow + this.Notethat for adherence to XML spec, this behaviour will be + disabledbydefault in 2.x . The same function will allow to keep + compatibilityforold code.</li> + <li>Blanks in <a> </a> constructs are not + ignoredanymore,avoiding heuristic is really the Right Way :-\</li> + <li>The unchecked use of snprintf which was breakinglibxml-1.8.6compilation + on some platforms has been fixed</li> + <li>nanoftp.c nanohttp.c: Fixed '#' and '?' stripping + whenprocessingURIs</li> </ul> <h3>1.8.6: Jan 31 2000</h3> <ul> <li>added a nanoFTP transport module, debugged until the new version of <a - href="http://rpmfind.net/linux/rpm2html/rpmfind.html">rpmfind</a> can use - it without troubles</li> + href="http://rpmfind.net/linux/rpm2html/rpmfind.html">rpmfind</a>canuseit + without troubles</li> </ul> <h3>1.8.5: Jan 21 2000</h3> <ul> <li>adding APIs to parse a well balanced chunk of XML (production <a - href="http://www.w3.org/TR/REC-xml#NT-content">[43] content</a> of the - XML spec)</li> + href="http://www.w3.org/TR/REC-xml#NT-content">[43] content</a>of + theXMLspec)</li> <li>fixed a hideous bug in xmlGetProp pointed by Rune.Djurhuus@fast.no</li> - <li>Jody Goldberg <jgoldberg@home.com> provided another patch trying - to solve the zlib checks problems</li> - <li>The current state in gnome CVS base is expected to ship as 1.8.5 with - gnumeric soon</li> + <li>Jody Goldberg <jgoldberg@home.com> provided another patchtryingto + solve the zlib checks problems</li> + <li>The current state in gnome CVS base is expected to ship as + 1.8.5withgnumeric soon</li> </ul> <h3>1.8.4: Jan 13 2000</h3> @@ -2365,45 +2395,47 @@ it's actually not compiled in by default. The real fixes are:</p> <li>fixed the DTD parsing code to work with the xhtml DTD</li> <li>added xmlRemoveProp(), xmlRemoveID() and xmlRemoveRef()</li> <li>Fixed bugs in xmlNewNs()</li> - <li>External entity loading code has been revamped, now it uses - xmlLoadExternalEntity(), some fix on entities processing were added</li> + <li>External entity loading code has been revamped, now + itusesxmlLoadExternalEntity(), some fix on entities processing + wereadded</li> <li>cleaned up WIN32 includes of socket stuff</li> </ul> <h3>1.8.2: Dec 21 1999</h3> <ul> - <li>I got another problem with includes and C++, I hope this issue is fixed - for good this time</li> - <li>Added a few tree modification functions: xmlReplaceNode, - xmlAddPrevSibling, xmlAddNextSibling, xmlNodeSetName and - xmlDocSetRootElement</li> + <li>I got another problem with includes and C++, I hope this issue + isfixedfor good this time</li> + <li>Added a few tree modification + functions:xmlReplaceNode,xmlAddPrevSibling, xmlAddNextSibling, + xmlNodeSetNameandxmlDocSetRootElement</li> <li>Tried to improve the HTML output with help from <a href="mailto:clahey@umich.edu">Chris Lahey</a></li> </ul> <h3>1.8.1: Dec 18 1999</h3> <ul> - <li>various patches to avoid troubles when using libxml with C++ compilers - the "namespace" keyword and C escaping in include files</li> + <li>various patches to avoid troubles when using libxml with + C++compilersthe "namespace" keyword and C escaping in include files</li> <li>a problem in one of the core macros IS_CHAR was corrected</li> - <li>fixed a bug introduced in 1.8.0 breaking default namespace processing, - and more specifically the Dia application</li> - <li>fixed a posteriori validation (validation after parsing, or by using a - Dtd not specified in the original document)</li> + <li>fixed a bug introduced in 1.8.0 breaking default + namespaceprocessing,and more specifically the Dia application</li> + <li>fixed a posteriori validation (validation after parsing, or by + usingaDtd not specified in the original document)</li> <li>fixed a bug in</li> </ul> <h3>1.8.0: Dec 12 1999</h3> <ul> <li>cleanup, especially memory wise</li> - <li>the parser should be more reliable, especially the HTML one, it should - not crash, whatever the input !</li> - <li>Integrated various patches, especially a speedup improvement for large - dataset from <a href="mailto:cnygard@bellatlantic.net">Carl Nygard</a>, - configure with --with-buffers to enable them.</li> + <li>the parser should be more reliable, especially the HTML one, + itshouldnot crash, whatever the input !</li> + <li>Integrated various patches, especially a speedup improvement + forlargedataset from <a + href="mailto:cnygard@bellatlantic.net">CarlNygard</a>,configure with + --with-buffers to enable them.</li> <li>attribute normalization, oops should have been added long ago !</li> - <li>attributes defaulted from DTDs should be available, xmlSetProp() now - does entities escaping by default.</li> + <li>attributes defaulted from DTDs should be available, xmlSetProp()nowdoes + entities escaping by default.</li> </ul> <h3>1.7.4: Oct 25 1999</h3> @@ -2417,40 +2449,40 @@ it's actually not compiled in by default. The real fixes are:</p> <h3>1.7.3: Sep 29 1999</h3> <ul> <li>portability problems fixed</li> - <li>snprintf was used unconditionally, leading to link problems on system - were it's not available, fixed</li> + <li>snprintf was used unconditionally, leading to link problems + onsystemwere it's not available, fixed</li> </ul> <h3>1.7.1: Sep 24 1999</h3> <ul> - <li>The basic type for strings manipulated by libxml has been renamed in - 1.7.1 from <strong>CHAR</strong> to <strong>xmlChar</strong>. The reason - is that CHAR was conflicting with a predefined type on Windows. However - on non WIN32 environment, compatibility is provided by the way of a - <strong>#define </strong>.</li> - <li>Changed another error : the use of a structure field called errno, and - leading to troubles on platforms where it's a macro</li> + <li>The basic type for strings manipulated by libxml has been + renamedin1.7.1 from <strong>CHAR</strong>to <strong>xmlChar</strong>. + Thereasonis that CHAR was conflicting with a predefined type on + Windows.Howeveron non WIN32 environment, compatibility is provided by the + way ofa<strong>#define </strong>.</li> + <li>Changed another error : the use of a structure field called + errno,andleading to troubles on platforms where it's a macro</li> </ul> <h3>1.7.0: Sep 23 1999</h3> <ul> <li>Added the ability to fetch remote DTD or parsed entities, see the <a - href="html/libxml-nanohttp.html">nanohttp</a> module.</li> - <li>Added an errno to report errors by another mean than a simple printf - like callback</li> + href="html/libxml-nanohttp.html">nanohttp</a>module.</li> + <li>Added an errno to report errors by another mean than a simpleprintflike + callback</li> <li>Finished ID/IDREF support and checking when validation</li> <li>Serious memory leaks fixed (there is now a <a - href="html/libxml-xmlmemory.html">memory wrapper</a> module)</li> - <li>Improvement of <a href="http://www.w3.org/TR/xpath">XPath</a> - implementation</li> + href="html/libxml-xmlmemory.html">memory wrapper</a>module)</li> + <li>Improvement of <a + href="http://www.w3.org/TR/xpath">XPath</a>implementation</li> <li>Added an HTML parser front-end</li> </ul> <h2><a name="XML">XML</a></h2> -<p><a href="http://www.w3.org/TR/REC-xml">XML is a standard</a> for -markup-based structured documents. Here is <a name="example">an example XML -document</a>:</p> +<p><a href="http://www.w3.org/TR/REC-xml">XML is astandard</a>formarkup-based +structured documents. Here is <a name="example">an example +XMLdocument</a>:</p> <pre><?xml version="1.0"?> <EXAMPLE prop1="gnome is great" prop2="&amp; linux too"> <head> @@ -2464,141 +2496,146 @@ document</a>:</p> </chapter> </EXAMPLE></pre> -<p>The first line specifies that it is an XML document and gives useful -information about its encoding. Then the rest of the document is a text -format whose structure is specified by tags between brackets. <strong>Each -tag opened has to be closed</strong>. XML is pedantic about this. However, if -a tag is empty (no content), a single tag can serve as both the opening and -closing tag if it ends with <code>/></code> rather than with -<code>></code>. Note that, for example, the image tag has no content (just -an attribute) and is closed by ending the tag with <code>/></code>.</p> - -<p>XML can be applied successfully to a wide range of tasks, ranging from -long term structured document maintenance (where it follows the steps of -SGML) to simple data encoding mechanisms like configuration file formatting -(glade), spreadsheets (gnumeric), or even shorter lived documents such as -WebDAV where it is used to encode remote calls between a client and a -server.</p> +<p>The first line specifies that it is an XML document and +givesusefulinformation about its encoding. Then the rest of the document is +atextformat whose structure is specified by tags between +brackets.<strong>Eachtag opened has to be closed</strong>. XML is pedantic +about this.However, ifa tag is empty (no content), a single tag can serve as +both theopening andclosing tag if it ends with <code>/></code>rather +thanwith<code>></code>. Note that, for example, the image tag has no +content(justan attribute) and is closed by ending the tag +with<code>/></code>.</p> + +<p>XML can be applied successfully to a wide range of tasks, ranging +fromlongterm structured document maintenance (where it follows the steps +ofSGML) tosimple data encoding mechanisms like configuration file +formatting(glade),spreadsheets (gnumeric), or even shorter lived documents +such asWebDAV whereit is used to encode remote calls between a client and +aserver.</p> <h2><a name="XSLT">XSLT</a></h2> <p>Check <a href="http://xmlsoft.org/XSLT">the separate libxslt page</a></p> -<p><a href="http://www.w3.org/TR/xslt">XSL Transformations</a>, is a -language for transforming XML documents into other XML documents (or -HTML/textual output).</p> +<p><a href="http://www.w3.org/TR/xslt">XSL Transformations</a>, is +alanguagefor transforming XML documents into other XML documents +(orHTML/textualoutput).</p> -<p>A separate library called libxslt is available implementing XSLT-1.0 for -libxml2. This module "libxslt" too can be found in the Gnome CVS base.</p> +<p>A separate library called libxslt is available implementing +XSLT-1.0forlibxml2. This module "libxslt" too can be found in the Gnome CVS +base.</p> <p>You can check the progresses on the libxslt <a href="http://xmlsoft.org/XSLT/ChangeLog.html">Changelog</a>.</p> <h2><a name="Python">Python and bindings</a></h2> -<p>There are a number of language bindings and wrappers available for -libxml2, the list below is not exhaustive. Please contact the <a -href="http://mail.gnome.org/mailman/listinfo/xml-bindings">xml-bindings@gnome.org</a> -(<a href="http://mail.gnome.org/archives/xml-bindings/">archives</a>) in -order to get updates to this list or to discuss the specific topic of libxml2 -or libxslt wrappers or bindings:</p> -<ul> - <li><a href="http://libxmlplusplus.sourceforge.net/">Libxml++</a> seems the - most up-to-date C++ bindings for libxml2, check the <a - href="http://libxmlplusplus.sourceforge.net/reference/html/hierarchy.html">documentation</a> - and the <a +<p>There are a number of language bindings and wrappers available +forlibxml2,the list below is not exhaustive. Please contact the <a +href="http://mail.gnome.org/mailman/listinfo/xml-bindings">xml-bindings@gnome.org</a>(<a +href="http://mail.gnome.org/archives/xml-bindings/">archives</a>) inorder +toget updates to this list or to discuss the specific topic of +libxml2orlibxslt wrappers or bindings:</p> +<ul> + <li><a + href="http://libxmlplusplus.sourceforge.net/">Libxml++</a>seemsthemost + up-to-date C++ bindings for libxml2, check the <a + href="http://libxmlplusplus.sourceforge.net/reference/html/hierarchy.html">documentation</a>andthe + <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/libxmlplusplus/libxml%2b%2b/examples/">examples</a>.</li> - <li>There is another <a href="http://libgdome-cpp.berlios.de/">C++ wrapper - based on the gdome2 bindings</a> maintained by Tobias Peters.</li> + <li>There is another <a + href="http://libgdome-cpp.berlios.de/">C++wrapperbased on the gdome2 + bindings</a>maintained by Tobias Peters.</li> <li>and a third C++ wrapper by Peter Jones <pjones@pmade.org> <p>Website: <a href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a></p> </li> <li><a - href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt - Sergeant</a> developed <a - href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl wrapper for - libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML - application server</a>.</li> + href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">MattSergeant</a>developed<a + href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl + wrapperforlibxml2/libxslt as part of the <a + href="http://axkit.com/">AxKitXMLapplication server</a>.</li> <li>If you're interested into scripting XML processing, have a look at <a - href="http://xsh.sourceforge.net/">XSH</a> an XML editing shell based on - Libxml2 Perl bindings.</li> - <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides an - earlier version of the libxml/libxslt <a + href="http://xsh.sourceforge.net/">XSH</a>an XML editing shell + basedonLibxml2 Perl bindings.</li> + <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave + Kuhlman</a>providesanearlier version of the libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a>.</li> <li>Gopal.V and Peter Minten develop <a - href="http://savannah.gnu.org/projects/libxmlsharp">libxml#</a>, a set of - C# libxml2 bindings.</li> + href="http://savannah.gnu.org/projects/libxmlsharp">libxml#</a>, a + setofC# libxml2 bindings.</li> <li>Petr Kozelka provides <a - href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue - libxml2</a> with Kylix, Delphi and other Pascal compilers.</li> + href="http://sourceforge.net/projects/libxml2-pas">Pascal units + togluelibxml2</a>with Kylix, Delphi and other Pascal compilers.</li> <li>Uwe Fechner also provides <a - href="http://sourceforge.net/projects/idom2-pas/">idom2</a>, a DOM2 - implementation for Kylix2/D5/D6 from Borland.</li> - <li>There is <a href="http://libxml.rubyforge.org/">bindings for Ruby</a> - and libxml2 bindings are also available in Ruby through the <a - href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a> module - maintained by Tobias Peters.</li> + href="http://sourceforge.net/projects/idom2-pas/">idom2</a>, + aDOM2implementation for Kylix2/D5/D6 from Borland.</li> + <li>There is <a href="http://libxml.rubyforge.org/">bindings forRuby</a>and + libxml2 bindings are also available in Ruby through the <a + href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a>modulemaintainedby + Tobias Peters.</li> <li>Steve Ball and contributors maintains <a - href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for - Tcl</a>.</li> + href="http://tclxml.sourceforge.net/">libxml2 and libxslt + bindingsforTcl</a>.</li> <li>libxml2 and libxslt is the default XML library for PHP5.</li> - <li><a href="http://savannah.gnu.org/projects/classpathx/">LibxmlJ</a> is - an effort to create a 100% JAXP-compatible Java wrapper for libxml2 and - libxslt as part of GNU ClasspathX project.</li> - <li>Patrick McPhee provides Rexx bindings fof libxml2 and libxslt, look for - <a href="http://www.interlog.com/~ptjm/software.html">RexxXML</a>.</li> <li><a - href="http://www.satimage.fr/software/en/xml_suite.html">Satimage</a> - provides <a - href="http://www.satimage.fr/software/en/downloads_osaxen.html">XMLLib - osax</a>. This is an osax for Mac OS X with a set of commands to - implement in AppleScript the XML DOM, XPATH and XSLT. Also includes - commands for Property-lists (Apple's fast lookup table XML format.)</li> + href="http://savannah.gnu.org/projects/classpathx/">LibxmlJ</a>isaneffort + to create a 100% JAXP-compatible Java wrapper for libxml2andlibxslt as + part of GNU ClasspathX project.</li> + <li>Patrick McPhee provides Rexx bindings fof libxml2 and libxslt, + lookfor<a + href="http://www.interlog.com/~ptjm/software.html">RexxXML</a>.</li> + <li><a + href="http://www.satimage.fr/software/en/xml_suite.html">Satimage</a>provides<a + href="http://www.satimage.fr/software/en/downloads_osaxen.html">XMLLibosax</a>.This + is an osax for Mac OS X with a set of commands toimplement inAppleScript + the XML DOM, XPATH and XSLT. Also includescommands forProperty-lists + (Apple's fast lookup table XML format.)</li> <li>Francesco Montorsi developped <a - href="https://sourceforge.net/project/showfiles.php?group_id=51305&package_id=45182">wxXml2</a> - wrappers that interface libxml2, allowing wxWidgets applications to - load/save/edit XML instances.</li> -</ul> - -<p>The distribution includes a set of Python bindings, which are guaranteed -to be maintained as part of the library in the future, though the Python -interface have not yet reached the completeness of the C API.</p> - -<p>Note that some of the Python purist dislike the default set of Python -bindings, rather than complaining I suggest they have a look at <a -href="http://codespeak.net/lxml/">lxml the more pythonic bindings for libxml2 -and libxslt</a> and <a -href="http://codespeak.net/mailman/listinfo/lxml-dev">help Martijn -Faassen</a> complete those.</p> - -<p><a href="mailto:stephane.bidoul@softwareag.com">Stéphane Bidoul</a> -maintains <a href="http://users.skynet.be/sbi/libxml-python/">a Windows port -of the Python bindings</a>.</p> - -<p>Note to people interested in building bindings, the API is formalized as -<a href="libxml2-api.xml">an XML API description file</a> which allows to -automate a large part of the Python bindings, this includes function -descriptions, enums, structures, typedefs, etc... The Python script used to -build the bindings is python/generator.py in the source distribution.</p> + href="https://sourceforge.net/project/showfiles.php?group_id=51305&package_id=45182">wxXml2</a>wrappersthat + interface libxml2, allowing wxWidgets applications toload/save/editXML + instances.</li> +</ul> + +<p>The distribution includes a set of Python bindings, which are +guaranteedtobe maintained as part of the library in the future, though +thePythoninterface have not yet reached the completeness of the C API.</p> + +<p>Note that some of the Python purist dislike the default set +ofPythonbindings, rather than complaining I suggest they have a look at <a +href="http://codespeak.net/lxml/">lxml the more pythonic bindings +forlibxml2and libxslt</a>and <a +href="http://codespeak.net/mailman/listinfo/lxml-dev">helpMartijnFaassen</a>complete +those.</p> + +<p><a +href="mailto:stephane.bidoul@softwareag.com">StéphaneBidoul</a>maintains <a +href="http://users.skynet.be/sbi/libxml-python/">aWindows portof the Python +bindings</a>.</p> + +<p>Note to people interested in building bindings, the API is formalized as<a +href="libxml2-api.xml">an XML API description file</a>which allows +toautomatea large part of the Python bindings, this includes +functiondescriptions,enums, structures, typedefs, etc... The Python script +used tobuild thebindings is python/generator.py in the source +distribution.</p> <p>To install the Python bindings there are 2 options:</p> <ul> <li>If you use an RPM based distribution, simply install the <a - href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-python - RPM</a> (and if needed the <a - href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-python - RPM</a>).</li> - <li>Otherwise use the <a href="ftp://xmlsoft.org/libxml2/python/">libxml2-python - module distribution</a> corresponding to your installed version of - libxml2 and libxslt. Note that to install it you will need both libxml2 - and libxslt installed and run "python setup.py build install" in the - module tree.</li> + href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-pythonRPM</a>(andif + needed the <a + href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-pythonRPM</a>).</li> + <li>Otherwise use the <a + href="ftp://xmlsoft.org/libxml2/python/">libxml2-pythonmoduledistribution</a>corresponding + to your installed version oflibxml2 andlibxslt. Note that to install it + you will need both libxml2and libxsltinstalled and run "python setup.py + build install" in themodule tree.</li> </ul> -<p>The distribution includes a set of examples and regression tests for the -python bindings in the <code>python/tests</code> directory. Here are some -excerpts from those tests:</p> +<p>The distribution includes a set of examples and regression tests +forthepython bindings in the <code>python/tests</code>directory. Here +aresomeexcerpts from those tests:</p> <h3>tst.py:</h3> @@ -2619,32 +2656,33 @@ if child.name != "foo": sys.exit(1) doc.freeDoc()</pre> -<p>The Python module is called libxml2; parseFile is the equivalent of -xmlParseFile (most of the bindings are automatically generated, and the xml -prefix is removed and the casing convention are kept). All node seen at the -binding level share the same subset of accessors:</p> -<ul> - <li><code>name</code> : returns the node name</li> - <li><code>type</code> : returns a string indicating the node type</li> - <li><code>content</code> : returns the content of the node, it is based on - xmlNodeGetContent() and hence is recursive.</li> - <li><code>parent</code> , <code>children</code>, <code>last</code>, - <code>next</code>, <code>prev</code>, <code>doc</code>, - <code>properties</code>: pointing to the associated element in the tree, - those may return None in case no such link exists.</li> -</ul> - -<p>Also note the need to explicitly deallocate documents with freeDoc() . -Reference counting for libxml2 trees would need quite a lot of work to -function properly, and rather than risk memory leaks if not implemented -correctly it sounds safer to have an explicit function to free a tree. The -wrapper python objects like doc, root or child are them automatically garbage -collected.</p> +<p>The Python module is called libxml2; parseFile is the +equivalentofxmlParseFile (most of the bindings are automatically generated, +and thexmlprefix is removed and the casing convention are kept). All node +seen atthebinding level share the same subset of accessors:</p> +<ul> + <li><code>name</code>: returns the node name</li> + <li><code>type</code>: returns a string indicating the node type</li> + <li><code>content</code>: returns the content of the node, it is + basedonxmlNodeGetContent() and hence is recursive.</li> + <li><code>parent</code>, + <code>children</code>,<code>last</code>,<code>next</code>, + <code>prev</code>,<code>doc</code>,<code>properties</code>: pointing to + the associatedelement in the tree,those may return None in case no such + linkexists.</li> +</ul> + +<p>Also note the need to explicitly deallocate documents with +freeDoc().Reference counting for libxml2 trees would need quite a lot of +worktofunction properly, and rather than risk memory leaks if +notimplementedcorrectly it sounds safer to have an explicit function to free +atree. Thewrapper python objects like doc, root or child are +themautomatically garbagecollected.</p> <h3>validate.py:</h3> -<p>This test check the validation interfaces and redirection of error -messages:</p> +<p>This test check the validation interfaces and redirection +oferrormessages:</p> <pre>import libxml2 #deactivate error messages from the validation @@ -2662,19 +2700,19 @@ doc.freeDoc() if valid != 0: print "validity check failed"</pre> -<p>The first thing to notice is the call to registerErrorHandler(), it -defines a new error handler global to the library. It is used to avoid seeing -the error messages when trying to validate the invalid document.</p> +<p>The first thing to notice is the call to registerErrorHandler(), +itdefinesa new error handler global to the library. It is used to avoid +seeingtheerror messages when trying to validate the invalid document.</p> -<p>The main interest of that test is the creation of a parser context with -createFileParserCtxt() and how the behaviour can be changed before calling -parseDocument() . Similarly the informations resulting from the parsing phase -are also available using context methods.</p> +<p>The main interest of that test is the creation of a parser +contextwithcreateFileParserCtxt() and how the behaviour can be changed +beforecallingparseDocument() . Similarly the informations resulting from +theparsing phaseare also available using context methods.</p> -<p>Contexts like nodes are defined as class and the libxml2 wrappers maps the -C function interfaces in terms of objects method as much as possible. The -best to get a complete view of what methods are supported is to look at the -libxml2.py module containing all the wrappers.</p> +<p>Contexts like nodes are defined as class and the libxml2 wrappers mapstheC +function interfaces in terms of objects method as much as possible.Thebest to +get a complete view of what methods are supported is to look atthelibxml2.py +module containing all the wrappers.</p> <h3>push.py:</h3> @@ -2687,19 +2725,21 @@ doc = ctxt.doc() doc.freeDoc()</pre> -<p>The context is created with a special call based on the -xmlCreatePushParser() from the C library. The first argument is an optional -SAX callback object, then the initial set of data, the length and the name of -the resource in case URI-References need to be computed by the parser.</p> +<p>The context is created with a special call based +onthexmlCreatePushParser() from the C library. The first argument is +anoptionalSAX callback object, then the initial set of data, the length and +thename ofthe resource in case URI-References need to be computed by +theparser.</p> -<p>Then the data are pushed using the parseChunk() method, the last call -setting the third argument terminate to 1.</p> +<p>Then the data are pushed using the parseChunk() method, the +lastcallsetting the third argument terminate to 1.</p> <h3>pushSAX.py:</h3> -<p>this test show the use of the event based parsing interfaces. In this case -the parser does not build a document, but provides callback information as -the parser makes progresses analyzing the data being provided:</p> +<p>this test show the use of the event based parsing interfaces. In +thiscasethe parser does not build a document, but provides callback +informationasthe parser makes progresses analyzing the data being +provided:</p> <pre>import libxml2 log = "" @@ -2750,17 +2790,18 @@ if log != reference: print "Error got: %s" % log print "Expected: %s" % reference</pre> -<p>The key object in that test is the handler, it provides a number of entry -points which can be called by the parser as it makes progresses to indicate -the information set obtained. The full set of callback is larger than what -the callback class in that specific example implements (see the SAX -definition for a complete list). The wrapper will only call those supplied by -the object when activated. The startElement receives the names of the element -and a dictionary containing the attributes carried by this element.</p> +<p>The key object in that test is the handler, it provides a number +ofentrypoints which can be called by the parser as it makes progresses +toindicatethe information set obtained. The full set of callback is larger +thanwhatthe callback class in that specific example implements (see +theSAXdefinition for a complete list). The wrapper will only call those +suppliedbythe object when activated. The startElement receives the names of +theelementand a dictionary containing the attributes carried by this +element.</p> -<p>Also note that the reference string generated from the callback shows a -single character call even though the string "bar" is passed to the parser -from 2 different call to parseChunk()</p> +<p>Also note that the reference string generated from the callback +showsasingle character call even though the string "bar" is passed to +theparserfrom 2 different call to parseChunk()</p> <h3>xpath.py:</h3> @@ -2779,18 +2820,19 @@ if res[0].name != "doc" or res[1].name != "foo": doc.freeDoc() ctxt.xpathFreeContext()</pre> -<p>This test parses a file, then create an XPath context to evaluate XPath -expression on it. The xpathEval() method execute an XPath query and returns -the result mapped in a Python way. String and numbers are natively converted, -and node sets are returned as a tuple of libxml2 Python nodes wrappers. Like -the document, the XPath context need to be freed explicitly, also not that -the result of the XPath query may point back to the document tree and hence -the document must be freed after the result of the query is used.</p> +<p>This test parses a file, then create an XPath context to +evaluateXPathexpression on it. The xpathEval() method execute an XPath query +andreturnsthe result mapped in a Python way. String and numbers are +nativelyconverted,and node sets are returned as a tuple of libxml2 Python +nodeswrappers. Likethe document, the XPath context need to be freed +explicitly,also not thatthe result of the XPath query may point back to the +documenttree and hencethe document must be freed after the result of the +query isused.</p> <h3>xpathext.py:</h3> -<p>This test shows how to extend the XPath engine with functions written in -python:</p> +<p>This test shows how to extend the XPath engine with functions +writteninpython:</p> <pre>import libxml2 def foo(ctx, x): @@ -2805,13 +2847,14 @@ if res != 2: doc.freeDoc() ctxt.xpathFreeContext()</pre> -<p>Note how the extension function is registered with the context (but that -part is not yet finalized, this may change slightly in the future).</p> +<p>Note how the extension function is registered with the context +(butthatpart is not yet finalized, this may change slightly in the +future).</p> <h3>tstxpath.py:</h3> -<p>This test is similar to the previous one but shows how the extension -function can access the XPath evaluation context:</p> +<p>This test is similar to the previous one but shows how +theextensionfunction can access the XPath evaluation context:</p> <pre>def foo(ctx, x): global called @@ -2823,9 +2866,9 @@ function can access the XPath evaluation context:</p> called = ctxt.function() return x + 1</pre> -<p>All the interfaces around the XPath parser(or rather evaluation) context -are not finalized, but it should be sufficient to do contextual work at the -evaluation point.</p> +<p>All the interfaces around the XPath parser(or rather evaluation)contextare +not finalized, but it should be sufficient to do contextual workat +theevaluation point.</p> <h3>Memory debugging:</h3> @@ -2842,15 +2885,15 @@ else: print "Memory leak %d bytes" % (libxml2.debugMemory(1)) libxml2.dumpMemory()</pre> -<p>Those activate the memory debugging interface of libxml2 where all -allocated block in the library are tracked. The prologue then cleans up the -library state and checks that all allocated memory has been freed. If not it -calls dumpMemory() which saves that list in a <code>.memdump</code> file.</p> +<p>Those activate the memory debugging interface of libxml2 whereallallocated +block in the library are tracked. The prologue then cleans upthelibrary state +and checks that all allocated memory has been freed. If notitcalls +dumpMemory() which saves that list in a <code>.memdump</code>file.</p> <h2><a name="architecture">libxml2 architecture</a></h2> -<p>Libxml2 is made of multiple components; some of them are optional, and -most of the block interfaces are public. The main components are:</p> +<p>Libxml2 is made of multiple components; some of them are optional, +andmostof the block interfaces are public. The main components are:</p> <ul> <li>an Input/Output layer</li> <li>FTP and HTTP client layers (optional)</li> @@ -2861,8 +2904,7 @@ most of the block interfaces are public. The main components are:</p> <li>a SAX tree module to build an in-memory DOM representation</li> <li>a tree module to manipulate the DOM representation</li> <li>a validation module using the DOM representation (optional)</li> - <li>an XPath module for global lookup in a DOM representation - (optional)</li> + <li>an XPath module for global lookup in a DOM representation(optional)</li> <li>a debug module (optional)</li> </ul> @@ -2874,28 +2916,29 @@ most of the block interfaces are public. The main components are:</p> <h2><a name="tree">The tree output</a></h2> -<p>The parser returns a tree built during the document analysis. The value -returned is an <strong>xmlDocPtr</strong> (i.e., a pointer to an -<strong>xmlDoc</strong> structure). This structure contains information such -as the file name, the document type, and a <strong>children</strong> pointer -which is the root of the document (or more exactly the first child under the -root which is the document). The tree is made of <strong>xmlNode</strong>s, -chained in double-linked lists of siblings and with a children<->parent -relationship. An xmlNode can also carry properties (a chain of xmlAttr -structures). An attribute may have a value which is a list of TEXT or -ENTITY_REF nodes.</p> +<p>The parser returns a tree built during the document analysis. +Thevaluereturned is an <strong>xmlDocPtr</strong>(i.e., a pointer +toan<strong>xmlDoc</strong>structure). This structure contains +informationsuchas the file name, the document type, and +a<strong>children</strong>pointerwhich is the root of the document (or +moreexactly the first child under theroot which is the document). The tree +ismade of <strong>xmlNode</strong>s,chained in double-linked lists of +siblingsand with a children<->parentrelationship. An xmlNode can also +carryproperties (a chain of xmlAttrstructures). An attribute may have a +valuewhich is a list of TEXT orENTITY_REF nodes.</p> -<p>Here is an example (erroneous with respect to the XML spec since there -should be only one ELEMENT under the root):</p> +<p>Here is an example (erroneous with respect to the XML spec +sincethereshould be only one ELEMENT under the root):</p> <p><img src="structure.gif" alt=" structure.gif "></p> -<p>In the source package there is a small program (not installed by default) -called <strong>xmllint</strong> which parses XML files given as argument and -prints them back as parsed. This is useful for detecting errors both in XML -code and in the XML parser itself. It has an option <strong>--debug</strong> -which prints the actual in-memory structure of the document; here is the -result with the <a href="#example">example</a> given before:</p> +<p>In the source package there is a small program (not installed +bydefault)called <strong>xmllint</strong>which parses XML files given +asargument andprints them back as parsed. This is useful for detecting +errorsboth in XMLcode and in the XML parser itself. It has an +option<strong>--debug</strong>which prints the actual in-memory structure of +thedocument; here is theresult with the <a +href="#example">example</a>givenbefore:</p> <pre>DOCUMENT version=1.0 standalone=true @@ -2930,24 +2973,23 @@ standalone=true <h2><a name="interface">The SAX interface</a></h2> -<p>Sometimes the DOM tree output is just too large to fit reasonably into -memory. In that case (and if you don't expect to save back the XML document -loaded using libxml), it's better to use the SAX interface of libxml. SAX is -a <strong>callback-based interface</strong> to the parser. Before parsing, -the application layer registers a customized set of callbacks which are -called by the library as it progresses through the XML input.</p> - -<p>To get more detailed step-by-step guidance on using the SAX interface of -libxml, see the <a -href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nice -documentation</a>.written by <a href="mailto:james@daa.com.au">James -Henstridge</a>.</p> - -<p>You can debug the SAX behaviour by using the <strong>testSAX</strong> -program located in the gnome-xml module (it's usually not shipped in the -binary packages of libxml, but you can find it in the tar source -distribution). Here is the sequence of callbacks that would be reported by -testSAX when parsing the example XML document shown earlier:</p> +<p>Sometimes the DOM tree output is just too large to fit +reasonablyintomemory. In that case (and if you don't expect to save back the +XMLdocumentloaded using libxml), it's better to use the SAX interface of +libxml.SAX isa <strong>callback-based interface</strong>to the parser. +Beforeparsing,the application layer registers a customized set of callbacks +whicharecalled by the library as it progresses through the XML input.</p> + +<p>To get more detailed step-by-step guidance on using the SAX +interfaceoflibxml, see the <a +href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nicedocumentation</a>.writtenby +<a href="mailto:james@daa.com.au">JamesHenstridge</a>.</p> + +<p>You can debug the SAX behaviour by using +the<strong>testSAX</strong>program located in the gnome-xml module (it's +usuallynot shipped in thebinary packages of libxml, but you can find it in +the tarsourcedistribution). Here is the sequence of callbacks that would be +reportedbytestSAX when parsing the example XML document shown earlier:</p> <pre>SAX.setDocumentLocator() SAX.startDocument() SAX.getEntity(amp) @@ -2983,11 +3025,11 @@ SAX.characters( , 1) SAX.endElement(EXAMPLE) SAX.endDocument()</pre> -<p>Most of the other interfaces of libxml2 are based on the DOM tree-building -facility, so nearly everything up to the end of this document presupposes the -use of the standard DOM tree build. Note that the DOM tree itself is built by -a set of registered default callbacks, without internal specific -interface.</p> +<p>Most of the other interfaces of libxml2 are based on the +DOMtree-buildingfacility, so nearly everything up to the end of this +documentpresupposes theuse of the standard DOM tree build. Note that the DOM +treeitself is built bya set of registered default callbacks, without +internalspecificinterface.</p> <h2><a name="Validation">Validation & DTDs</a></h2> @@ -3011,67 +3053,70 @@ interface.</p> <p>Well what is validation and what is a DTD ?</p> -<p>DTD is the acronym for Document Type Definition. This is a description of -the content for a family of XML files. This is part of the XML 1.0 -specification, and allows one to describe and verify that a given document -instance conforms to the set of rules detailing its structure and content.</p> +<p>DTD is the acronym for Document Type Definition. This is a +descriptionofthe content for a family of XML files. This is part of the +XML1.0specification, and allows one to describe and verify that a +givendocumentinstance conforms to the set of rules detailing its structure +andcontent.</p> -<p>Validation is the process of checking a document against a DTD (more -generally against a set of construction rules).</p> +<p>Validation is the process of checking a document against a +DTD(moregenerally against a set of construction rules).</p> -<p>The validation process and building DTDs are the two most difficult parts -of the XML life cycle. Briefly a DTD defines all the possible elements to be -found within your document, what is the formal shape of your document tree -(by defining the allowed content of an element; either text, a regular -expression for the allowed list of children, or mixed content i.e. both text -and children). The DTD also defines the valid attributes for all elements and -the types of those attributes.</p> +<p>The validation process and building DTDs are the two most difficultpartsof +the XML life cycle. Briefly a DTD defines all the possible elementsto befound +within your document, what is the formal shape of your documenttree(by +defining the allowed content of an element; either text, aregularexpression +for the allowed list of children, or mixed content i.e.both textand +children). The DTD also defines the valid attributes for allelements andthe +types of those attributes.</p> <h3><a name="definition1">The definition</a></h3> -<p>The <a href="http://www.w3.org/TR/REC-xml">W3C XML Recommendation</a> (<a -href="http://www.xml.com/axml/axml.html">Tim Bray's annotated version of -Rev1</a>):</p> +<p>The <a href="http://www.w3.org/TR/REC-xml">W3C XML Recommendation</a>(<a +href="http://www.xml.com/axml/axml.html">Tim Bray's annotated +versionofRev1</a>):</p> <ul> - <li><a href="http://www.w3.org/TR/REC-xml#elemdecls">Declaring - elements</a></li> - <li><a href="http://www.w3.org/TR/REC-xml#attdecls">Declaring - attributes</a></li> + <li><a + href="http://www.w3.org/TR/REC-xml#elemdecls">Declaringelements</a></li> + <li><a + href="http://www.w3.org/TR/REC-xml#attdecls">Declaringattributes</a></li> </ul> -<p>(unfortunately) all this is inherited from the SGML world, the syntax is -ancient...</p> +<p>(unfortunately) all this is inherited from the SGML world, the +syntaxisancient...</p> <h3><a name="Simple1">Simple rules</a></h3> -<p>Writing DTDs can be done in many ways. The rules to build them if you need -something permanent or something which can evolve over time can be radically -different. Really complex DTDs like DocBook ones are flexible but quite -harder to design. I will just focus on DTDs for a formats with a fixed simple -structure. It is just a set of basic rules, and definitely not exhaustive nor -usable for complex DTD design.</p> +<p>Writing DTDs can be done in many ways. The rules to build them if +youneedsomething permanent or something which can evolve over time can +beradicallydifferent. Really complex DTDs like DocBook ones are flexible +butquiteharder to design. I will just focus on DTDs for a formats with a +fixedsimplestructure. It is just a set of basic rules, and definitely +notexhaustive norusable for complex DTD design.</p> <h4><a name="reference1">How to reference a DTD from a document</a>:</h4> -<p>Assuming the top element of the document is <code>spec</code> and the dtd -is placed in the file <code>mydtd</code> in the subdirectory -<code>dtds</code> of the directory from where the document were loaded:</p> +<p>Assuming the top element of the document is <code>spec</code>and the +dtdisplaced in the file <code>mydtd</code>in the +subdirectory<code>dtds</code>ofthe directory from where the document were +loaded:</p> <p><code><!DOCTYPE spec SYSTEM "dtds/mydtd"></code></p> <p>Notes:</p> <ul> <li>The system string is actually an URI-Reference (as defined in <a - href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) so you can use a - full URL string indicating the location of your DTD on the Web. This is a - really good thing to do if you want others to validate your document.</li> - <li>It is also possible to associate a <code>PUBLIC</code> identifier (a - magic string) so that the DTD is looked up in catalogs on the client side - without having to locate it on the web.</li> - <li>A DTD contains a set of element and attribute declarations, but they - don't define what the root of the document should be. This is explicitly - told to the parser/validator as the first element of the - <code>DOCTYPE</code> declaration.</li> + href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) so you can + useafull URL string indicating the location of your DTD on the Web. This + isareally good thing to do if you want others to validate + yourdocument.</li> + <li>It is also possible to associate a <code>PUBLIC</code>identifier(amagic + string) so that the DTD is looked up in catalogs on the clientsidewithout + having to locate it on the web.</li> + <li>A DTD contains a set of element and attribute declarations, + buttheydon't define what the root of the document should be. This + isexplicitlytold to the parser/validator as the first element + ofthe<code>DOCTYPE</code>declaration.</li> </ul> <h4><a name="Declaring2">Declaring elements</a>:</h4> @@ -3080,29 +3125,29 @@ is placed in the file <code>mydtd</code> in the subdirectory <p><code><!ELEMENT spec (front, body, back?)></code></p> -<p>It also expresses that the spec element contains one <code>front</code>, -one <code>body</code> and one optional <code>back</code> children elements in -this order. The declaration of one element of the structure and its content -are done in a single declaration. Similarly the following declares -<code>div1</code> elements:</p> +<p>It also expresses that the spec element contains one<code>front</code>,one +<code>body</code>and one optional<code>back</code>children elements inthis +order. The declaration of oneelement of the structure and its contentare done +in a single declaration.Similarly the following +declares<code>div1</code>elements:</p> <p><code><!ELEMENT div1 (head, (p | list | note)*, div2?)></code></p> -<p>which means div1 contains one <code>head</code> then a series of optional -<code>p</code>, <code>list</code>s and <code>note</code>s and then an -optional <code>div2</code>. And last but not least an element can contain -text:</p> +<p>which means div1 contains one <code>head</code>then a series +ofoptional<code>p</code>, <code>list</code>s and <code>note</code>s and +thenanoptional <code>div2</code>. And last but not least an element +cancontaintext:</p> <p><code><!ELEMENT b (#PCDATA)></code></p> -<p><code>b</code> contains text or being of mixed content (text and elements -in no particular order):</p> +<p><code>b</code>contains text or being of mixed content (text and +elementsinno particular order):</p> <p><code><!ELEMENT p (#PCDATA|a|ul|b|i|em)*></code></p> -<p><code>p </code>can contain text or <code>a</code>, <code>ul</code>, -<code>b</code>, <code>i </code>or <code>em</code> elements in no particular -order.</p> +<p><code>p </code>can contain text or +<code>a</code>,<code>ul</code>,<code>b</code>, <code>i </code>or +<code>em</code>elements inno particularorder.</p> <h4><a name="Declaring1">Declaring attributes</a>:</h4> @@ -3110,83 +3155,82 @@ order.</p> <p><code><!ATTLIST termdef name CDATA #IMPLIED></code></p> -<p>means that the element <code>termdef</code> can have a <code>name</code> -attribute containing text (<code>CDATA</code>) and which is optional -(<code>#IMPLIED</code>). The attribute value can also be defined within a -set:</p> +<p>means that the element <code>termdef</code>can have +a<code>name</code>attribute containing text (<code>CDATA</code>) and which +isoptional(<code>#IMPLIED</code>). The attribute value can also be +definedwithin aset:</p> -<p><code><!ATTLIST list type (bullets|ordered|glossary) -"ordered"></code></p> +<p><code><!ATTLIST list +type(bullets|ordered|glossary)"ordered"></code></p> -<p>means <code>list</code> element have a <code>type</code> attribute with 3 -allowed values "bullets", "ordered" or "glossary" and which default to -"ordered" if the attribute is not explicitly specified.</p> +<p>means <code>list</code>element have a <code>type</code>attribute +with3allowed values "bullets", "ordered" or "glossary" and which +defaultto"ordered" if the attribute is not explicitly specified.</p> -<p>The content type of an attribute can be text (<code>CDATA</code>), -anchor/reference/references -(<code>ID</code>/<code>IDREF</code>/<code>IDREFS</code>), entity(ies) -(<code>ENTITY</code>/<code>ENTITIES</code>) or name(s) -(<code>NMTOKEN</code>/<code>NMTOKENS</code>). The following defines that a -<code>chapter</code> element can have an optional <code>id</code> attribute -of type <code>ID</code>, usable for reference from attribute of type -IDREF:</p> +<p>The content type of an attribute can be +text(<code>CDATA</code>),anchor/reference/references(<code>ID</code>/<code>IDREF</code>/<code>IDREFS</code>),entity(ies)(<code>ENTITY</code>/<code>ENTITIES</code>) +orname(s)(<code>NMTOKEN</code>/<code>NMTOKENS</code>). The following +definesthat a<code>chapter</code>element can have an +optional<code>id</code>attributeof type <code>ID</code>, usable for reference +fromattribute of typeIDREF:</p> <p><code><!ATTLIST chapter id ID #IMPLIED></code></p> -<p>The last value of an attribute definition can be <code>#REQUIRED -</code>meaning that the attribute has to be given, <code>#IMPLIED</code> -meaning that it is optional, or the default value (possibly prefixed by -<code>#FIXED</code> if it is the only allowed).</p> +<p>The last value of an attribute definition can +be<code>#REQUIRED</code>meaning that the attribute has to be +given,<code>#IMPLIED</code>meaning that it is optional, or the default +value(possibly prefixed by<code>#FIXED</code>if it is the only allowed).</p> <p>Notes:</p> <ul> - <li>Usually the attributes pertaining to a given element are declared in a - single expression, but it is just a convention adopted by a lot of DTD - writers: + <li>Usually the attributes pertaining to a given element are declared + inasingle expression, but it is just a convention adopted by a lot + ofDTDwriters: <pre><!ATTLIST termdef id ID #REQUIRED name CDATA #IMPLIED></pre> - <p>The previous construct defines both <code>id</code> and - <code>name</code> attributes for the element <code>termdef</code>.</p> + <p>The previous construct defines + both<code>id</code>and<code>name</code>attributes for the + element<code>termdef</code>.</p> </li> </ul> <h3><a name="Some1">Some examples</a></h3> -<p>The directory <code>test/valid/dtds/</code> in the libxml2 distribution -contains some complex DTD examples. The example in the file -<code>test/valid/dia.xml</code> shows an XML file where the simple DTD is -directly included within the document.</p> +<p>The directory <code>test/valid/dtds/</code>in the +libxml2distributioncontains some complex DTD examples. The example in +thefile<code>test/valid/dia.xml</code>shows an XML file where the simple +DTDisdirectly included within the document.</p> <h3><a name="validate1">How to validate</a></h3> -<p>The simplest way is to use the xmllint program included with libxml. The -<code>--valid</code> option turns-on validation of the files given as input. -For example the following validates a copy of the first revision of the XML -1.0 specification:</p> +<p>The simplest way is to use the xmllint program included with +libxml.The<code>--valid</code>option turns-on validation of the files given +asinput.For example the following validates a copy of the first revision of +theXML1.0 specification:</p> <p><code>xmllint --valid --noout test/valid/REC-xml-19980210.xml</code></p> <p>the -- noout is used to disable output of the resulting tree.</p> -<p>The <code>--dtdvalid dtd</code> allows validation of the document(s) -against a given DTD.</p> +<p>The <code>--dtdvalid dtd</code>allows validation of the +document(s)againsta given DTD.</p> <p>Libxml2 exports an API to handle DTDs and validation, check the <a -href="http://xmlsoft.org/html/libxml-valid.html">associated -description</a>.</p> +href="http://xmlsoft.org/html/libxml-valid.html">associateddescription</a>.</p> <h3><a name="Other1">Other resources</a></h3> -<p>DTDs are as old as SGML. So there may be a number of examples on-line, I -will just list one for now, others pointers welcome:</p> +<p>DTDs are as old as SGML. So there may be a number of examples +on-line,Iwill just list one for now, others pointers welcome:</p> <ul> <li><a href="http://www.xml101.com:8081/dtd/">XML-101 DTD</a></li> </ul> -<p>I suggest looking at the examples found under test/valid/dtd and any of -the large number of books available on XML. The dia example in test/valid -should be both simple and complete enough to allow you to build your own.</p> +<p>I suggest looking at the examples found under test/valid/dtd and any +ofthelarge number of books available on XML. The dia example in +test/validshouldbe both simple and complete enough to allow you to build your +own.</p> <p></p> @@ -3204,180 +3248,182 @@ should be both simple and complete enough to allow you to build your own.</p> <h3><a name="General3">General overview</a></h3> <p>The module <code><a -href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlmemory.h</a></code> -provides the interfaces to the libxml2 memory system:</p> +href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlmemory.h</a></code>providesthe +interfaces to the libxml2 memory system:</p> <ul> - <li>libxml2 does not use the libc memory allocator directly but xmlFree(), - xmlMalloc() and xmlRealloc()</li> - <li>those routines can be reallocated to a specific set of routine, by - default the libc ones i.e. free(), malloc() and realloc()</li> + <li>libxml2 does not use the libc memory allocator directly + butxmlFree(),xmlMalloc() and xmlRealloc()</li> + <li>those routines can be reallocated to a specific set of + routine,bydefault the libc ones i.e. free(), malloc() and realloc()</li> <li>the xmlmemory.c module includes a set of debugging routine</li> </ul> <h3><a name="setting">Setting libxml2 set of memory routines</a></h3> -<p>It is sometimes useful to not use the default memory allocator, either for -debugging, analysis or to implement a specific behaviour on memory management -(like on embedded systems). Two function calls are available to do so:</p> +<p>It is sometimes useful to not use the default memory allocator, +eitherfordebugging, analysis or to implement a specific behaviour on +memorymanagement(like on embedded systems). Two function calls are available +to doso:</p> <ul> - <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet - ()</a> which return the current set of functions in use by the parser</li> <li><a - href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a> - which allow to set up a new set of memory allocation functions</li> + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet()</a>whichreturn + the current set of functions in use by the parser</li> + <li><a + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a>whichallow + to set up a new set of memory allocation functions</li> </ul> -<p>Of course a call to xmlMemSetup() should probably be done before calling -any other libxml2 routines (unless you are sure your allocations routines are -compatibles).</p> +<p>Of course a call to xmlMemSetup() should probably be done beforecallingany +other libxml2 routines (unless you are sure your allocationsroutines +arecompatibles).</p> <h3><a name="cleanup">Cleaning up after parsing</a></h3> -<p>Libxml2 is not stateless, there is a few set of memory structures needing -allocation before the parser is fully functional (some encoding structures -for example). This also mean that once parsing is finished there is a tiny -amount of memory (a few hundred bytes) which can be recollected if you don't -reuse the parser immediately:</p> +<p>Libxml2 is not stateless, there is a few set of memory +structuresneedingallocation before the parser is fully functional (some +encodingstructuresfor example). This also mean that once parsing is finished +there isa tinyamount of memory (a few hundred bytes) which can be recollected +if youdon'treuse the parser immediately:</p> <ul> - <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser - ()</a> is a centralized routine to free the parsing states. Note that it - won't deallocate any produced tree if any (use the xmlFreeDoc() and - related routines for this).</li> - <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser - ()</a> is the dual routine allowing to preallocate the parsing state - which can be useful for example to avoid initialization reentrancy - problems when using libxml2 in multithreaded applications</li> + <li><a + href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser()</a>isa + centralized routine to free the parsing states. Note that + itwon'tdeallocate any produced tree if any (use the xmlFreeDoc() + andrelatedroutines for this).</li> + <li><a + href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser()</a>isthe + dual routine allowing to preallocate the parsing statewhich can beuseful + for example to avoid initialization reentrancyproblems when usinglibxml2 + in multithreaded applications</li> </ul> -<p>Generally xmlCleanupParser() is safe, if needed the state will be rebuild -at the next invocation of parser routines, but be careful of the consequences -in multithreaded applications.</p> +<p>Generally xmlCleanupParser() is safe, if needed the state will berebuildat +the next invocation of parser routines, but be careful of theconsequencesin +multithreaded applications.</p> <h3><a name="Debugging">Debugging routines</a></h3> -<p>When configured using --with-mem-debug flag (off by default), libxml2 uses -a set of memory allocation debugging routines keeping track of all allocated -blocks and the location in the code where the routine was called. A couple of -other debugging routines allow to dump the memory allocated infos to a file -or call a specific routine when a given block number is allocated:</p> +<p>When configured using --with-mem-debug flag (off by default), libxml2usesa +set of memory allocation debugging routines keeping track of +allallocatedblocks and the location in the code where the routine was called. +Acouple ofother debugging routines allow to dump the memory allocated infos +toa fileor call a specific routine when a given block number is allocated:</p> <ul> <li><a - href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMallocLoc()</a> - <a - href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlReallocLoc()</a> - and <a - href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemStrdupLoc()</a> - are the memory debugging replacement allocation routines</li> - <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump - ()</a> dumps all the informations about the allocated memory block lefts - in the <code>.memdump</code> file</li> -</ul> - -<p>When developing libxml2 memory debug is enabled, the tests programs call -xmlMemoryDump () and the "make test" regression tests will check for any -memory leak during the full regression test sequence, this helps a lot -ensuring that libxml2 does not leak memory and bullet proof memory -allocations use (some libc implementations are known to be far too permissive -resulting in major portability problems!).</p> - -<p>If the .memdump reports a leak, it displays the allocation function and -also tries to give some informations about the content and structure of the -allocated blocks left. This is sufficient in most cases to find the culprit, -but not always. Assuming the allocation problem is reproducible, it is -possible to find more easily:</p> + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMallocLoc()</a><a + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlReallocLoc()</a>and<a + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemStrdupLoc()</a>arethe + memory debugging replacement allocation routines</li> + <li><a + href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump()</a>dumpsall + the informations about the allocated memory block leftsin + the<code>.memdump</code>file</li> +</ul> + +<p>When developing libxml2 memory debug is enabled, the tests +programscallxmlMemoryDump () and the "make test" regression tests will check +foranymemory leak during the full regression test sequence, this helps +alotensuring that libxml2 does not leak memory and bullet +proofmemoryallocations use (some libc implementations are known to be far +toopermissiveresulting in major portability problems!).</p> + +<p>If the .memdump reports a leak, it displays the allocation functionandalso +tries to give some informations about the content and structure +oftheallocated blocks left. This is sufficient in most cases to find +theculprit,but not always. Assuming the allocation problem is reproducible, +itispossible to find more easily:</p> <ol> <li>write down the block number xxxx not allocated</li> - <li>export the environment variable XML_MEM_BREAKPOINT=xxxx , the easiest - when using GDB is to simply give the command + <li>export the environment variable XML_MEM_BREAKPOINT=xxxx , + theeasiestwhen using GDB is to simply give the command <p><code>set environment XML_MEM_BREAKPOINT xxxx</code></p> <p>before running the program.</p> </li> - <li>run the program under a debugger and set a breakpoint on - xmlMallocBreakpoint() a specific function called when this precise block - is allocated</li> - <li>when the breakpoint is reached you can then do a fine analysis of the - allocation an step to see the condition resulting in the missing - deallocation.</li> + <li>run the program under a debugger and set a + breakpointonxmlMallocBreakpoint() a specific function called when this + preciseblockis allocated</li> + <li>when the breakpoint is reached you can then do a fine analysis + oftheallocation an step to see the condition resulting in + themissingdeallocation.</li> </ol> -<p>I used to use a commercial tool to debug libxml2 memory problems but after -noticing that it was not detecting memory leaks that simple mechanism was -used and proved extremely efficient until now. Lately I have also used <a -href="http://developer.kde.org/~sewardj/">valgrind</a> with quite some -success, it is tied to the i386 architecture since it works by emulating the -processor and instruction set, it is slow but extremely efficient, i.e. it -spot memory usage errors in a very precise way.</p> +<p>I used to use a commercial tool to debug libxml2 memory problems +butafternoticing that it was not detecting memory leaks that simple +mechanismwasused and proved extremely efficient until now. Lately I have also +used <a href="http://developer.kde.org/~sewardj/">valgrind</a>with quite +somesuccess,it is tied to the i386 architecture since it works by emulating +theprocessorand instruction set, it is slow but extremely efficient, i.e. +itspot memoryusage errors in a very precise way.</p> <h3><a name="General4">General memory requirements</a></h3> -<p>How much libxml2 memory require ? It's hard to tell in average it depends -of a number of things:</p> -<ul> - <li>the parser itself should work in a fixed amount of memory, except for - information maintained about the stacks of names and entities locations. - The I/O and encoding handlers will probably account for a few KBytes. - This is true for both the XML and HTML parser (though the HTML parser - need more state).</li> - <li>If you are generating the DOM tree then memory requirements will grow - nearly linear with the size of the data. In general for a balanced - textual document the internal memory requirement is about 4 times the - size of the UTF8 serialization of this document (example the XML-1.0 - recommendation is a bit more of 150KBytes and takes 650KBytes of main - memory when parsed). Validation will add a amount of memory required for - maintaining the external Dtd state which should be linear with the - complexity of the content model defined by the Dtd</li> - <li>If you need to work with fixed memory requirements or don't need the - full DOM tree then using the <a href="xmlreader.html">xmlReader - interface</a> is probably the best way to proceed, it still allows to - validate or operate on subset of the tree if needed.</li> - <li>If you don't care about the advanced features of libxml2 like - validation, DOM, XPath or XPointer, don't use entities, need to work with - fixed memory requirements, and try to get the fastest parsing possible - then the SAX interface should be used, but it has known restrictions.</li> +<p>How much libxml2 memory require ? It's hard to tell in average itdependsof +a number of things:</p> +<ul> + <li>the parser itself should work in a fixed amount of memory, + exceptforinformation maintained about the stacks of names and + entitieslocations.The I/O and encoding handlers will probably account for + a fewKBytes.This is true for both the XML and HTML parser (though the + HTMLparserneed more state).</li> + <li>If you are generating the DOM tree then memory requirements + willgrownearly linear with the size of the data. In general for + abalancedtextual document the internal memory requirement is about 4 + timesthesize of the UTF8 serialization of this document (example + theXML-1.0recommendation is a bit more of 150KBytes and takes 650KBytes + ofmainmemory when parsed). Validation will add a amount of memory + requiredformaintaining the external Dtd state which should be linear + withthecomplexity of the content model defined by the Dtd</li> + <li>If you need to work with fixed memory requirements or don't needthefull + DOM tree then using the <a href="xmlreader.html">xmlReaderinterface</a>is + probably the best way toproceed, it still allows tovalidate or operate on + subset of the tree ifneeded.</li> + <li>If you don't care about the advanced features of libxml2likevalidation, + DOM, XPath or XPointer, don't use entities, need to workwithfixed memory + requirements, and try to get the fastest parsingpossiblethen the SAX + interface should be used, but it has knownrestrictions.</li> </ul> <p></p> <h2><a name="Encodings">Encodings support</a></h2> -<p>If you are not really familiar with Internationalization (usual shortcut -is I18N) , Unicode, characters and glyphs, I suggest you read a <a -href="http://www.tbray.org/ongoing/When/200x/2003/04/06/Unicode">presentation</a> -by Tim Bray on Unicode and why you should care about it.</p> +<p>If you are not really familiar with Internationalization (usual +shortcutisI18N) , Unicode, characters and glyphs, I suggest you read a <a +href="http://www.tbray.org/ongoing/When/200x/2003/04/06/Unicode">presentation</a>byTim +Bray on Unicode and why you should care about it.</p> -<p>If you don't understand why <b>it does not make sense to have a string -without knowing what encoding it uses</b>, then as Joel Spolsky said <a -href="http://www.joelonsoftware.com/articles/Unicode.html">please do not -write another line of code until you finish reading that article.</a>. It is -a prerequisite to understand this page, and avoid a lot of problems with -libxml2, XML or text processing in general.</p> +<p>If you don't understand why <b>it does not make sense to have +astringwithout knowing what encoding it uses</b>, then as Joel Spolsky said +<a href="http://www.joelonsoftware.com/articles/Unicode.html">please do +notwriteanother line of code until you finish reading that article.</a>. It +isaprerequisite to understand this page, and avoid a lot of +problemswithlibxml2, XML or text processing in general.</p> <p>Table of Content:</p> <ol> - <li><a href="encoding.html#What">What does internationalization support - mean ?</a></li> - <li><a href="encoding.html#internal">The internal encoding, how and - why</a></li> + <li><a href="encoding.html#What">What does internationalization + supportmean?</a></li> + <li><a href="encoding.html#internal">The internal encoding, + howandwhy</a></li> <li><a href="encoding.html#implemente">How is it implemented ?</a></li> <li><a href="encoding.html#Default">Default supported encodings</a></li> - <li><a href="encoding.html#extend">How to extend the existing - support</a></li> + <li><a href="encoding.html#extend">How to extend theexistingsupport</a></li> </ol> <h3><a name="What">What does internationalization support mean ?</a></h3> -<p>XML was designed from the start to allow the support of any character set -by using Unicode. Any conformant XML parser has to support the UTF-8 and -UTF-16 default encodings which can both express the full unicode ranges. UTF8 -is a variable length encoding whose greatest points are to reuse the same -encoding for ASCII and to save space for Western encodings, but it is a bit -more complex to handle in practice. UTF-16 use 2 bytes per character (and -sometimes combines two pairs), it makes implementation easier, but looks a -bit overkill for Western languages encoding. Moreover the XML specification -allows the document to be encoded in other encodings at the condition that -they are clearly labeled as such. For example the following is a wellformed -XML document encoded in ISO-8859-1 and using accentuated letters that we -French like for both markup and content:</p> +<p>XML was designed from the start to allow the support of any charactersetby +using Unicode. Any conformant XML parser has to support the UTF-8andUTF-16 +default encodings which can both express the full unicode ranges.UTF8is a +variable length encoding whose greatest points are to reuse thesameencoding +for ASCII and to save space for Western encodings, but it is abitmore complex +to handle in practice. UTF-16 use 2 bytes per character(andsometimes combines +two pairs), it makes implementation easier, but looksabit overkill for +Western languages encoding. Moreover the XMLspecificationallows the document +to be encoded in other encodings at thecondition thatthey are clearly labeled +as such. For example the following isa wellformedXML document encoded in +ISO-8859-1 and using accentuated lettersthat weFrench like for both markup +and content:</p> <pre><?xml version="1.0" encoding="ISO-8859-1"?> <très>là</très></pre> @@ -3387,18 +3433,18 @@ French like for both markup and content:</p> <li>informations about it's encoding are saved</li> <li>it can be modified</li> <li>it can be saved in its original encoding</li> - <li>it can also be saved in another encoding supported by libxml2 (for - example straight UTF8 or even an ASCII form)</li> + <li>it can also be saved in another encoding supported by + libxml2(forexample straight UTF8 or even an ASCII form)</li> </ul> -<p>Another very important point is that the whole libxml2 API, with the -exception of a few routines to read with a specific encoding or save to a -specific encoding, is completely agnostic about the original encoding of the -document.</p> +<p>Another very important point is that the whole libxml2 API, +withtheexception of a few routines to read with a specific encoding or save +toaspecific encoding, is completely agnostic about the original encoding +ofthedocument.</p> -<p>It should be noted too that the HTML parser embedded in libxml2 now obey -the same rules too, the following document will be (as of 2.2.2) handled in -an internationalized fashion by libxml2 too:</p> +<p>It should be noted too that the HTML parser embedded in libxml2 nowobeythe +same rules too, the following document will be (as of 2.2.2) handledinan +internationalized fashion by libxml2 too:</p> <pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="fr"> @@ -3411,73 +3457,75 @@ an internationalized fashion by libxml2 too:</p> <h3><a name="internal">The internal encoding, how and why</a></h3> -<p>One of the core decisions was to force all documents to be converted to a -default internal encoding, and that encoding to be UTF-8, here are the -rationales for those choices:</p> -<ul> - <li>keeping the native encoding in the internal form would force the libxml - users (or the code associated) to be fully aware of the encoding of the - original document, for examples when adding a text node to a document, - the content would have to be provided in the document encoding, i.e. the - client code would have to check it before hand, make sure it's conformant - to the encoding, etc ... Very hard in practice, though in some specific - cases this may make sense.</li> - <li>the second decision was which encoding. From the XML spec only UTF8 and - UTF16 really makes sense as being the two only encodings for which there - is mandatory support. UCS-4 (32 bits fixed size encoding) could be - considered an intelligent choice too since it's a direct Unicode mapping - support. I selected UTF-8 on the basis of efficiency and compatibility - with surrounding software: +<p>One of the core decisions was to force all documents to be converted +toadefault internal encoding, and that encoding to be UTF-8, here +aretherationales for those choices:</p> +<ul> + <li>keeping the native encoding in the internal form would force + thelibxmlusers (or the code associated) to be fully aware of the encoding + oftheoriginal document, for examples when adding a text node to + adocument,the content would have to be provided in the document + encoding,i.e. theclient code would have to check it before hand, make + sure it'sconformantto the encoding, etc ... Very hard in practice, though + in somespecificcases this may make sense.</li> + <li>the second decision was which encoding. From the XML spec only + UTF8andUTF16 really makes sense as being the two only encodings for + whichthereis mandatory support. UCS-4 (32 bits fixed size encoding) + couldbeconsidered an intelligent choice too since it's a direct + Unicodemappingsupport. I selected UTF-8 on the basis of efficiency + andcompatibilitywith surrounding software: <ul> - <li>UTF-8 while a bit more complex to convert from/to (i.e. slightly - more costly to import and export CPU wise) is also far more compact - than UTF-16 (and UCS-4) for a majority of the documents I see it used - for right now (RPM RDF catalogs, advogato data, various configuration - file formats, etc.) and the key point for today's computer - architecture is efficient uses of caches. If one nearly double the - memory requirement to store the same amount of data, this will trash - caches (main memory/external caches/internal caches) and my take is - that this harms the system far more than the CPU requirements needed - for the conversion to UTF-8</li> - <li>Most of libxml2 version 1 users were using it with straight ASCII - most of the time, doing the conversion with an internal encoding - requiring all their code to be rewritten was a serious show-stopper - for using UTF-16 or UCS-4.</li> - <li>UTF-8 is being used as the de-facto internal encoding standard for - related code like the <a href="http://www.pango.org/">pango</a> - upcoming Gnome text widget, and a lot of Unix code (yet another place - where Unix programmer base takes a different approach from Microsoft - - they are using UTF-16)</li> + <li>UTF-8 while a bit more complex to convert from/to (i.e.slightlymore + costly to import and export CPU wise) is also far morecompactthan + UTF-16 (and UCS-4) for a majority of the documents I seeit usedfor + right now (RPM RDF catalogs, advogato data, variousconfigurationfile + formats, etc.) and the key point for today'scomputerarchitecture is + efficient uses of caches. If one nearlydouble thememory requirement + to store the same amount of data, thiswill trashcaches (main + memory/external caches/internal caches) and mytake isthat this harms + the system far more than the CPU requirementsneededfor the conversion + to UTF-8</li> + <li>Most of libxml2 version 1 users were using it with + straightASCIImost of the time, doing the conversion with an + internalencodingrequiring all their code to be rewritten was a + seriousshow-stopperfor using UTF-16 or UCS-4.</li> + <li>UTF-8 is being used as the de-facto internal encoding + standardforrelated code like the <a + href="http://www.pango.org/">pango</a>upcoming Gnome text widget, + anda lot of Unix code (yet another placewhere Unix programmer base + takesa different approach from Microsoft- they are using UTF-16)</li> </ul> </li> </ul> <p>What does this mean in practice for the libxml2 user:</p> <ul> - <li>xmlChar, the libxml2 data type is a byte, those bytes must be assembled - as UTF-8 valid strings. The proper way to terminate an xmlChar * string - is simply to append 0 byte, as usual.</li> - <li>One just need to make sure that when using chars outside the ASCII set, - the values has been properly converted to UTF-8</li> + <li>xmlChar, the libxml2 data type is a byte, those bytes must + beassembledas UTF-8 valid strings. The proper way to terminate an xmlChar + *stringis simply to append 0 byte, as usual.</li> + <li>One just need to make sure that when using chars outside the + ASCIIset,the values has been properly converted to UTF-8</li> </ul> <h3><a name="implemente">How is it implemented ?</a></h3> -<p>Let's describe how all this works within libxml, basically the I18N -(internationalization) support get triggered only during I/O operation, i.e. -when reading a document or saving one. Let's look first at the reading -sequence:</p> +<p>Let's describe how all this works within libxml, basically +theI18N(internationalization) support get triggered only during I/O +operation,i.e.when reading a document or saving one. Let's look first at +thereadingsequence:</p> <ol> - <li>when a document is processed, we usually don't know the encoding, a - simple heuristic allows to detect UTF-16 and UCS-4 from encodings where - the ASCII range (0-0x7F) maps with ASCII</li> - <li>the xml declaration if available is parsed, including the encoding - declaration. At that point, if the autodetected encoding is different - from the one declared a call to xmlSwitchEncoding() is issued.</li> - <li>If there is no encoding declaration, then the input has to be in either - UTF-8 or UTF-16, if it is not then at some point when processing the - input, the converter/checker of UTF-8 form will raise an encoding error. - You may end-up with a garbled document, or no document at all ! Example: + <li>when a document is processed, we usually don't know the + encoding,asimple heuristic allows to detect UTF-16 and UCS-4 from + encodingswherethe ASCII range (0-0x7F) maps with ASCII</li> + <li>the xml declaration if available is parsed, including + theencodingdeclaration. At that point, if the autodetected encoding + isdifferentfrom the one declared a call to xmlSwitchEncoding() + isissued.</li> + <li>If there is no encoding declaration, then the input has to be + ineitherUTF-8 or UTF-16, if it is not then at some point when + processingtheinput, the converter/checker of UTF-8 form will raise an + encodingerror.You may end-up with a garbled document, or no document at + all !Example: <pre>~/XML -> ./xmllint err.xml err.xml:1: error: Input is not proper UTF-8, indicate encoding ! <très>là</très> @@ -3486,58 +3534,58 @@ err.xml:1: error: Bytes: 0xE8 0x73 0x3E 0x6C <très>là</très> ^</pre> </li> - <li>xmlSwitchEncoding() does an encoding name lookup, canonicalize it, and - then search the default registered encoding converters for that encoding. - If it's not within the default set and iconv() support has been compiled - it, it will ask iconv for such an encoder. If this fails then the parser - will report an error and stops processing: + <li>xmlSwitchEncoding() does an encoding name lookup, canonicalize + it,andthen search the default registered encoding converters for + thatencoding.If it's not within the default set and iconv() support has + beencompiledit, it will ask iconv for such an encoder. If this fails then + theparserwill report an error and stops processing: <pre>~/XML -> ./xmllint err2.xml err2.xml:1: error: Unsupported encoding UnsupportedEnc <?xml version="1.0" encoding="UnsupportedEnc"?> ^</pre> </li> - <li>From that point the encoder processes progressively the input (it is - plugged as a front-end to the I/O module) for that entity. It captures - and converts on-the-fly the document to be parsed to UTF-8. The parser - itself just does UTF-8 checking of this input and process it - transparently. The only difference is that the encoding information has - been added to the parsing context (more precisely to the input - corresponding to this entity).</li> - <li>The result (when using DOM) is an internal form completely in UTF-8 - with just an encoding information on the document node.</li> + <li>From that point the encoder processes progressively the input + (itisplugged as a front-end to the I/O module) for that entity. + Itcapturesand converts on-the-fly the document to be parsed to UTF-8. + Theparseritself just does UTF-8 checking of this input and + processittransparently. The only difference is that the encoding + informationhasbeen added to the parsing context (more precisely to + theinputcorresponding to this entity).</li> + <li>The result (when using DOM) is an internal form completely in + UTF-8withjust an encoding information on the document node.</li> </ol> -<p>Ok then what happens when saving the document (assuming you -collected/built an xmlDoc DOM like structure) ? It depends on the function -called, xmlSaveFile() will just try to save in the original encoding, while -xmlSaveFileTo() and xmlSaveFileEnc() can optionally save to a given -encoding:</p> +<p>Ok then what happens when saving the document (assuming +youcollected/builtan xmlDoc DOM like structure) ? It depends on the +functioncalled,xmlSaveFile() will just try to save in the original +encoding,whilexmlSaveFileTo() and xmlSaveFileEnc() can optionally save to +agivenencoding:</p> <ol> - <li>if no encoding is given, libxml2 will look for an encoding value - associated to the document and if it exists will try to save to that - encoding, + <li>if no encoding is given, libxml2 will look for an + encodingvalueassociated to the document and if it exists will try to save + tothatencoding, <p>otherwise everything is written in the internal form, i.e. UTF-8</p> </li> - <li>so if an encoding was specified, either at the API level or on the - document, libxml2 will again canonicalize the encoding name, lookup for a - converter in the registered set or through iconv. If not found the - function will return an error code</li> - <li>the converter is placed before the I/O buffer layer, as another kind of - buffer, then libxml2 will simply push the UTF-8 serialization to through - that buffer, which will then progressively be converted and pushed onto - the I/O layer.</li> - <li>It is possible that the converter code fails on some input, for example - trying to push an UTF-8 encoded Chinese character through the UTF-8 to - ISO-8859-1 converter won't work. Since the encoders are progressive they - will just report the error and the number of bytes converted, at that - point libxml2 will decode the offending character, remove it from the - buffer and replace it with the associated charRef encoding &#123; and - resume the conversion. This guarantees that any document will be saved - without losses (except for markup names where this is not legal, this is - a problem in the current version, in practice avoid using non-ascii - characters for tag or attribute names). A special "ascii" encoding name - is used to save documents to a pure ascii form can be used when - portability is really crucial</li> + <li>so if an encoding was specified, either at the API level or + onthedocument, libxml2 will again canonicalize the encoding name, + lookupfor aconverter in the registered set or through iconv. If not + foundthefunction will return an error code</li> + <li>the converter is placed before the I/O buffer layer, as another + kindofbuffer, then libxml2 will simply push the UTF-8 serialization + tothroughthat buffer, which will then progressively be converted and + pushedontothe I/O layer.</li> + <li>It is possible that the converter code fails on some input, + forexampletrying to push an UTF-8 encoded Chinese character through + theUTF-8 toISO-8859-1 converter won't work. Since the encoders + areprogressive theywill just report the error and the number of + bytesconverted, at thatpoint libxml2 will decode the offending + character,remove it from thebuffer and replace it with the associated + charRefencoding &#123; andresume the conversion. This guarantees that + anydocument will be savedwithout losses (except for markup names where + thisis not legal, this isa problem in the current version, in practice + avoidusing non-asciicharacters for tag or attribute names). A special + "ascii"encoding nameis used to save documents to a pure ascii form can be + usedwhenportability is really crucial</li> </ol> <p>Here are a few examples based on the same test document:</p> @@ -3546,52 +3594,51 @@ encoding:</p> <très>là</très> ~/XML -> ./xmllint --encode UTF-8 isolat1 <?xml version="1.0" encoding="UTF-8"?> -<très>là </très> +<très>là </très> ~/XML -> </pre> -<p>The same processing is applied (and reuse most of the code) for HTML I18N -processing. Looking up and modifying the content encoding is a bit more -difficult since it is located in a <meta> tag under the <head>, -so a couple of functions htmlGetMetaEncoding() and htmlSetMetaEncoding() have -been provided. The parser also attempts to switch encoding on the fly when -detecting such a tag on input. Except for that the processing is the same -(and again reuses the same code).</p> +<p>The same processing is applied (and reuse most of the code) for +HTMLI18Nprocessing. Looking up and modifying the content encoding is a +bitmoredifficult since it is located in a <meta> tag under +the<head>,so a couple of functions htmlGetMetaEncoding() +andhtmlSetMetaEncoding() havebeen provided. The parser also attempts to +switchencoding on the fly whendetecting such a tag on input. Except for that +theprocessing is the same(and again reuses the same code).</p> <h3><a name="Default">Default supported encodings</a></h3> -<p>libxml2 has a set of default converters for the following encodings -(located in encoding.c):</p> +<p>libxml2 has a set of default converters for the followingencodings(located +in encoding.c):</p> <ol> <li>UTF-8 is supported by default (null handlers)</li> <li>UTF-16, both little and big endian</li> <li>ISO-Latin-1 (ISO-8859-1) covering most western languages</li> <li>ASCII, useful mostly for saving</li> - <li>HTML, a specific handler for the conversion of UTF-8 to ASCII with HTML - predefined entities like &copy; for the Copyright sign.</li> + <li>HTML, a specific handler for the conversion of UTF-8 to ASCII + withHTMLpredefined entities like &copy; for the Copyright sign.</li> </ol> -<p>More over when compiled on an Unix platform with iconv support the full -set of encodings supported by iconv can be instantly be used by libxml. On a -linux machine with glibc-2.1 the list of supported encodings and aliases fill -3 full pages, and include UCS-4, the full set of ISO-Latin encodings, and the -various Japanese ones.</p> +<p>More over when compiled on an Unix platform with iconv support the +fullsetof encodings supported by iconv can be instantly be used by libxml. On +alinuxmachine with glibc-2.1 the list of supported encodings and aliases +fill3 fullpages, and include UCS-4, the full set of ISO-Latin encodings, and +thevariousJapanese ones.</p> -<p>To convert from the UTF-8 values returned from the API to another encoding -then it is possible to use the function provided from <a -href="html/libxml-encoding.html">the encoding module</a> like <a -href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a>, or use the -POSIX <a -href="http://www.opengroup.org/onlinepubs/009695399/functions/iconv.html">iconv()</a> -API directly.</p> +<p>To convert from the UTF-8 values returned from the API to +anotherencodingthen it is possible to use the function provided from <a +href="html/libxml-encoding.html">the encoding module</a>like <a +href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a>, or +usethePOSIX <a +href="http://www.opengroup.org/onlinepubs/009695399/functions/iconv.html">iconv()</a>APIdirectly.</p> <h4>Encoding aliases</h4> -<p>From 2.2.3, libxml2 has support to register encoding names aliases. The -goal is to be able to parse document whose encoding is supported but where -the name differs (for example from the default set of names accepted by -iconv). The following functions allow to register and handle new aliases for -existing encodings. Once registered libxml2 will automatically lookup the -aliases when handling a document:</p> +<p>From 2.2.3, libxml2 has support to register encoding names aliases.Thegoal +is to be able to parse document whose encoding is supported butwherethe name +differs (for example from the default set of names acceptedbyiconv). The +following functions allow to register and handle new aliasesforexisting +encodings. Once registered libxml2 will automatically lookupthealiases when +handling a document:</p> <ul> <li>int xmlAddEncodingAlias(const char *name, const char *alias);</li> <li>int xmlDelEncodingAlias(const char *alias);</li> @@ -3601,14 +3648,14 @@ aliases when handling a document:</p> <h3><a name="extend">How to extend the existing support</a></h3> -<p>Well adding support for new encoding, or overriding one of the encoders -(assuming it is buggy) should not be hard, just write input and output -conversion routines to/from UTF-8, and register them using -xmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx), and they will be -called automatically if the parser(s) encounter such an encoding name -(register it uppercase, this will help). The description of the encoders, -their arguments and expected return values are described in the encoding.h -header.</p> +<p>Well adding support for new encoding, or overriding one of +theencoders(assuming it is buggy) should not be hard, just write input +andoutputconversion routines to/from UTF-8, and register +themusingxmlNewCharEncodingHandler(name, xxxToUTF8, UTF8Toxxx), and they +willbecalled automatically if the parser(s) encounter such an +encodingname(register it uppercase, this will help). The description of +theencoders,their arguments and expected return values are described in +theencoding.hheader.</p> <h2><a name="IO">I/O Interfaces</a></h2> @@ -3625,91 +3672,92 @@ header.</p> <h3><a name="General1">General overview</a></h3> <p>The module <code><a -href="http://xmlsoft.org/html/libxml-xmlio.html">xmlIO.h</a></code> provides -the interfaces to the libxml2 I/O system. This consists of 4 main parts:</p> -<ul> - <li>Entities loader, this is a routine which tries to fetch the entities - (files) based on their PUBLIC and SYSTEM identifiers. The default loader - don't look at the public identifier since libxml2 do not maintain a - catalog. You can redefine you own entity loader by using - <code>xmlGetExternalEntityLoader()</code> and - <code>xmlSetExternalEntityLoader()</code>. <a href="#entities">Check the - example</a>.</li> - <li>Input I/O buffers which are a commodity structure used by the parser(s) - input layer to handle fetching the informations to feed the parser. This - provides buffering and is also a placeholder where the encoding - converters to UTF8 are piggy-backed.</li> - <li>Output I/O buffers are similar to the Input ones and fulfill similar - task but when generating a serialization from a tree.</li> - <li>A mechanism to register sets of I/O callbacks and associate them with - specific naming schemes like the protocol part of the URIs. - <p>This affect the default I/O operations and allows to use specific I/O - handlers for certain names.</p> +href="http://xmlsoft.org/html/libxml-xmlio.html">xmlIO.h</a></code>providestheinterfaces +to the libxml2 I/O system. This consists of 4 main parts:</p> +<ul> + <li>Entities loader, this is a routine which tries to fetch + theentities(files) based on their PUBLIC and SYSTEM identifiers. The + defaultloaderdon't look at the public identifier since libxml2 do not + maintainacatalog. You can redefine you own entity loader + byusing<code>xmlGetExternalEntityLoader()</code>and<code>xmlSetExternalEntityLoader()</code>.<a + href="#entities">Check theexample</a>.</li> + <li>Input I/O buffers which are a commodity structure used by + theparser(s)input layer to handle fetching the informations to feed + theparser. Thisprovides buffering and is also a placeholder where + theencodingconverters to UTF8 are piggy-backed.</li> + <li>Output I/O buffers are similar to the Input ones and fulfillsimilartask + but when generating a serialization from a tree.</li> + <li>A mechanism to register sets of I/O callbacks and associate + themwithspecific naming schemes like the protocol part of the URIs. + <p>This affect the default I/O operations and allows to use + specificI/Ohandlers for certain names.</p> </li> </ul> -<p>The general mechanism used when loading http://rpmfind.net/xml.html for -example in the HTML parser is the following:</p> +<p>The general mechanism used when loading +http://rpmfind.net/xml.htmlforexample in the HTML parser is the following:</p> <ol> - <li>The default entity loader calls <code>xmlNewInputFromFile()</code> with - the parsing context and the URI string.</li> - <li>the URI string is checked against the existing registered handlers - using their match() callback function, if the HTTP module was compiled - in, it is registered and its match() function will succeeds</li> - <li>the open() function of the handler is called and if successful will - return an I/O Input buffer</li> - <li>the parser will the start reading from this buffer and progressively - fetch information from the resource, calling the read() function of the - handler until the resource is exhausted</li> - <li>if an encoding change is detected it will be installed on the input - buffer, providing buffering and efficient use of the conversion - routines</li> - <li>once the parser has finished, the close() function of the handler is - called once and the Input buffer and associated resources are - deallocated.</li> + <li>The default entity loader + calls<code>xmlNewInputFromFile()</code>withthe parsing context and the + URIstring.</li> + <li>the URI string is checked against the existing registered + handlersusingtheir match() callback function, if the HTTP module was + compiledin, it isregistered and its match() function will succeeds</li> + <li>the open() function of the handler is called and if + successfulwillreturn an I/O Input buffer</li> + <li>the parser will the start reading from this buffer + andprogressivelyfetch information from the resource, calling the + read()function of thehandler until the resource is exhausted</li> + <li>if an encoding change is detected it will be installed on + theinputbuffer, providing buffering and efficient use of + theconversionroutines</li> + <li>once the parser has finished, the close() function of the + handleriscalled once and the Input buffer and associated + resourcesaredeallocated.</li> </ol> -<p>The user defined callbacks are checked first to allow overriding of the -default libxml2 I/O routines.</p> +<p>The user defined callbacks are checked first to allow overriding +ofthedefault libxml2 I/O routines.</p> <h3><a name="basic">The basic buffer type</a></h3> -<p>All the buffer manipulation handling is done using the -<code>xmlBuffer</code> type define in <code><a -href="http://xmlsoft.org/html/libxml-tree.html">tree.h</a> </code>which is a -resizable memory buffer. The buffer allocation strategy can be selected to be -either best-fit or use an exponential doubling one (CPU vs. memory use -trade-off). The values are <code>XML_BUFFER_ALLOC_EXACT</code> and -<code>XML_BUFFER_ALLOC_DOUBLEIT</code>, and can be set individually or on a -system wide basis using <code>xmlBufferSetAllocationScheme()</code>. A number -of functions allows to manipulate buffers with names starting with the -<code>xmlBuffer...</code> prefix.</p> +<p>All the buffer manipulation handling is done +usingthe<code>xmlBuffer</code>type define in <code><a +href="http://xmlsoft.org/html/libxml-tree.html">tree.h</a></code>which +isaresizable memory buffer. The buffer allocation strategy can be selected +tobeeither best-fit or use an exponential doubling one (CPU vs. +memoryusetrade-off). The values +are<code>XML_BUFFER_ALLOC_EXACT</code>and<code>XML_BUFFER_ALLOC_DOUBLEIT</code>,and +can be set individually or on asystem wide basis +using<code>xmlBufferSetAllocationScheme()</code>. A numberof functions allows +tomanipulate buffers with names starting +withthe<code>xmlBuffer...</code>prefix.</p> <h3><a name="Input">Input I/O handlers</a></h3> -<p>An Input I/O handler is a simple structure -<code>xmlParserInputBuffer</code> containing a context associated to the -resource (file descriptor, or pointer to a protocol handler), the read() and -close() callbacks to use and an xmlBuffer. And extra xmlBuffer and a charset -encoding handler are also present to support charset conversion when -needed.</p> +<p>An Input I/O handler is a +simplestructure<code>xmlParserInputBuffer</code>containing a context +associated totheresource (file descriptor, or pointer to a protocol handler), +the read()andclose() callbacks to use and an xmlBuffer. And extra xmlBuffer +and acharsetencoding handler are also present to support charset +conversionwhenneeded.</p> <h3><a name="Output">Output I/O handlers</a></h3> -<p>An Output handler <code>xmlOutputBuffer</code> is completely similar to an -Input one except the callbacks are write() and close().</p> +<p>An Output handler <code>xmlOutputBuffer</code>is completely similar +toanInput one except the callbacks are write() and close().</p> <h3><a name="entities">The entities loader</a></h3> -<p>The entity loader resolves requests for new entities and create inputs for -the parser. Creating an input from a filename or an URI string is done -through the xmlNewInputFromFile() routine. The default entity loader do not -handle the PUBLIC identifier associated with an entity (if any). So it just -calls xmlNewInputFromFile() with the SYSTEM identifier (which is mandatory in -XML).</p> +<p>The entity loader resolves requests for new entities and create +inputsforthe parser. Creating an input from a filename or an URI string +isdonethrough the xmlNewInputFromFile() routine. The default entity loader +donothandle the PUBLIC identifier associated with an entity (if any). So +itjustcalls xmlNewInputFromFile() with the SYSTEM identifier (which +ismandatory inXML).</p> -<p>If you want to hook up a catalog mechanism then you simply need to -override the default entity loader, here is an example:</p> +<p>If you want to hook up a catalog mechanism then you simply need +tooverridethe default entity loader, here is an example:</p> <pre>#include <libxml/xmlIO.h> xmlExternalEntityLoader defaultLoader = NULL; @@ -3743,29 +3791,29 @@ int main(..) { <h3><a name="Example2">Example of customized I/O</a></h3> -<p>This example come from <a href="http://xmlsoft.org/messages/0708.html">a -real use case</a>, xmlDocDump() closes the FILE * passed by the application -and this was a problem. The <a -href="http://xmlsoft.org/messages/0711.html">solution</a> was to redefine a -new output handler with the closing call deactivated:</p> +<p>This example come from <a +href="http://xmlsoft.org/messages/0708.html">areal use case</a>,xmlDocDump() +closes the FILE * passed by the applicationand this was aproblem. The <a +href="http://xmlsoft.org/messages/0711.html">solution</a>wasto redefine anew +output handler with the closing call deactivated:</p> <ol> - <li>First define a new I/O output allocator where the output don't close - the file: + <li>First define a new I/O output allocator where the output don't + closethefile: <pre>xmlOutputBufferPtr xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { - xmlOutputBufferPtr ret; - - if (xmlOutputCallbackInitialized == 0) - xmlRegisterDefaultOutputCallbacks(); - - if (file == NULL) return(NULL); - ret = xmlAllocOutputBuffer(encoder); - if (ret != NULL) { - ret->context = file; - ret->writecallback = xmlFileWrite; - ret->closecallback = NULL; /* No close callback */ - } - return(ret); + xmlOutputBufferPtr ret; + + if (xmlOutputCallbackInitialized == 0) + xmlRegisterDefaultOutputCallbacks(); + + if (file == NULL) return(NULL); + ret = xmlAllocOutputBuffer(encoder); + if (ret != NULL) { + ret->context = file; + ret->writecallback = xmlFileWrite; + ret->closecallback = NULL; /* No close callback */ + } + return(ret); } </pre> </li> <li>And then use it to save the document: @@ -3794,90 +3842,92 @@ res = xmlSaveFileTo(output, doc, NULL); <li><a href="#reference">How to tune catalog usage</a></li> <li><a href="#validate">How to debug catalog processing</a></li> <li><a href="#Declaring">How to create and maintain catalogs</a></li> - <li><a href="#implemento">The implementor corner quick review of the - API</a></li> + <li><a href="#implemento">The implementor corner quick review + oftheAPI</a></li> <li><a href="#Other">Other resources</a></li> </ol> <h3><a name="General2">General overview</a></h3> -<p>What is a catalog? Basically it's a lookup mechanism used when an entity -(a file or a remote resource) references another entity. The catalog lookup -is inserted between the moment the reference is recognized by the software -(XML parser, stylesheet processing, or even images referenced for inclusion -in a rendering) and the time where loading that resource is actually -started.</p> +<p>What is a catalog? Basically it's a lookup mechanism used when an +entity(afile or a remote resource) references another entity. The catalog +lookupisinserted between the moment the reference is recognized by the +software(XMLparser, stylesheet processing, or even images referenced for +inclusionin arendering) and the time where loading that resource is +actuallystarted.</p> <p>It is basically used for 3 things:</p> <ul> - <li>mapping from "logical" names, the public identifiers and a more - concrete name usable for download (and URI). For example it can associate - the logical name + <li>mapping from "logical" names, the public identifiers and a + moreconcretename usable for download (and URI). For example it can + associatethelogical name <p>"-//OASIS//DTD DocBook XML V4.1.2//EN"</p> - <p>of the DocBook 4.1.2 XML DTD with the actual URL where it can be - downloaded</p> + <p>of the DocBook 4.1.2 XML DTD with the actual URL where it + canbedownloaded</p> <p>http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd</p> </li> - <li>remapping from a given URL to another one, like an HTTP indirection - saying that + <li>remapping from a given URL to another one, like an + HTTPindirectionsaying that <p>"http://www.oasis-open.org/committes/tr.xsl"</p> <p>should really be looked at</p> <p>"http://www.oasis-open.org/committes/entity/stylesheets/base/tr.xsl"</p> </li> - <li>providing a local cache mechanism allowing to load the entities - associated to public identifiers or remote resources, this is a really - important feature for any significant deployment of XML or SGML since it - allows to avoid the aleas and delays associated to fetching remote - resources.</li> + <li>providing a local cache mechanism allowing to load + theentitiesassociated to public identifiers or remote resources, this is + areallyimportant feature for any significant deployment of XML or + SGMLsince itallows to avoid the aleas and delays associated to + fetchingremoteresources.</li> </ul> <h3><a name="definition">The definitions</a></h3> <p>Libxml, as of 2.4.3 implements 2 kind of catalogs:</p> <ul> - <li>the older SGML catalogs, the official spec is SGML Open Technical - Resolution TR9401:1997, but is better understood by reading <a - href="http://www.jclark.com/sp/catalog.htm">the SP Catalog page</a> from - James Clark. This is relatively old and not the preferred mode of - operation of libxml.</li> - <li><a href="http://www.oasis-open.org/committees/entity/spec.html">XML - Catalogs</a> is far more flexible, more recent, uses an XML syntax and - should scale quite better. This is the default option of libxml.</li> + <li>the older SGML catalogs, the official spec is SGML + OpenTechnicalResolution TR9401:1997, but is better understood by reading + <a href="http://www.jclark.com/sp/catalog.htm">the SP + Catalogpage</a>fromJames Clark. This is relatively old and not the + preferredmode ofoperation of libxml.</li> + <li><a + href="http://www.oasis-open.org/committees/entity/spec.html">XMLCatalogs</a>isfar + more flexible, more recent, uses an XML syntax andshould scale + quitebetter. This is the default option of libxml.</li> </ul> <p></p> <h3><a name="Simple">Using catalog</a></h3> -<p>In a normal environment libxml2 will by default check the presence of a -catalog in /etc/xml/catalog, and assuming it has been correctly populated, -the processing is completely transparent to the document user. To take a -concrete example, suppose you are authoring a DocBook document, this one -starts with the following DOCTYPE definition:</p> +<p>In a normal environment libxml2 will by default check the presence +ofacatalog in /etc/xml/catalog, and assuming it has been +correctlypopulated,the processing is completely transparent to the document +user. Totake aconcrete example, suppose you are authoring a DocBook document, +thisonestarts with the following DOCTYPE definition:</p> <pre><?xml version='1.0'?> <!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.4//EN" "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd"></pre> -<p>When validating the document with libxml, the catalog will be -automatically consulted to lookup the public identifier "-//Norman Walsh//DTD -DocBk XML V3.1.4//EN" and the system identifier -"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if these entities have -been installed on your system and the catalogs actually point to them, libxml -will fetch them from the local disk.</p> +<p>When validating the document with libxml, the catalog will +beautomaticallyconsulted to lookup the public identifier "-//Norman +Walsh//DTDDocBk XMLV3.1.4//EN" and the +systemidentifier"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if +theseentities havebeen installed on your system and the catalogs actually +point tothem, libxmlwill fetch them from the local disk.</p> -<p style="font-size: 10pt"><strong>Note</strong>: Really don't use this -DOCTYPE example it's a really old version, but is fine as an example.</p> +<p style="font-size: 10pt"><strong>Note</strong>: Really don't usethisDOCTYPE +example it's a really old version, but is fine as an example.</p> -<p>Libxml2 will check the catalog each time that it is requested to load an -entity, this includes DTD, external parsed entities, stylesheets, etc ... If -your system is correctly configured all the authoring phase and processing -should use only local files, even if your document stays portable because it -uses the canonical public and system ID, referencing the remote document.</p> +<p>Libxml2 will check the catalog each time that it is requested to +loadanentity, this includes DTD, external parsed entities, stylesheets, etc +...Ifyour system is correctly configured all the authoring phase +andprocessingshould use only local files, even if your document stays +portablebecause ituses the canonical public and system ID, referencing the +remotedocument.</p> <h3><a name="Some">Some examples:</a></h3> -<p>Here is a couple of fragments from XML Catalogs used in libxml2 early -regression tests in <code>test/catalogs</code> :</p> +<p>Here is a couple of fragments from XML Catalogs used in +libxml2earlyregression tests in <code>test/catalogs</code>:</p> <pre><?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" @@ -3887,22 +3937,21 @@ regression tests in <code>test/catalogs</code> :</p> uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/> ...</pre> -<p>This is the beginning of a catalog for DocBook 4.1.2, XML Catalogs are -written in XML, there is a specific namespace for catalog elements -"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry in this -catalog is a <code>public</code> mapping it allows to associate a Public -Identifier with an URI.</p> +<p>This is the beginning of a catalog for DocBook 4.1.2, XML +Catalogsarewritten in XML, there is a specific namespace for +catalogelements"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry +inthiscatalog is a <code>public</code>mapping it allows to associate +aPublicIdentifier with an URI.</p> <pre>... <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/" rewritePrefix="file:///usr/share/xml/docbook/"/> ...</pre> -<p>A <code>rewriteSystem</code> is a very powerful instruction, it says that -any URI starting with a given prefix should be looked at another URI -constructed by replacing the prefix with an new one. In effect this acts like -a cache system for a full area of the Web. In practice it is extremely useful -with a file prefix if you have installed a copy of those resources on your -local system.</p> +<p>A <code>rewriteSystem</code>is a very powerful instruction, it saysthatany +URI starting with a given prefix should be looked at anotherURIconstructed by +replacing the prefix with an new one. In effect this actslikea cache system +for a full area of the Web. In practice it is extremelyusefulwith a file +prefix if you have installed a copy of those resources onyourlocal system.</p> <pre>... <delegatePublic publicIdStartString="-//OASIS//DTD XML Catalog //" catalog="file:///usr/share/xml/docbook.xml"/> @@ -3916,29 +3965,29 @@ local system.</p> catalog="file:///usr/share/xml/docbook.xml"/> ...</pre> -<p>Delegation is the core features which allows to build a tree of catalogs, -easier to maintain than a single catalog, based on Public Identifier, System -Identifier or URI prefixes it instructs the catalog software to look up -entries in another resource. This feature allow to build hierarchies of -catalogs, the set of entries presented should be sufficient to redirect the -resolution of all DocBook references to the specific catalog in -<code>/usr/share/xml/docbook.xml</code> this one in turn could delegate all -references for DocBook 4.2.1 to a specific catalog installed at the same time -as the DocBook resources on the local machine.</p> +<p>Delegation is the core features which allows to build a tree +ofcatalogs,easier to maintain than a single catalog, based on +PublicIdentifier, SystemIdentifier or URI prefixes it instructs the +catalogsoftware to look upentries in another resource. This feature allow to +buildhierarchies ofcatalogs, the set of entries presented should be +sufficient toredirect theresolution of all DocBook references to the specific +catalogin<code>/usr/share/xml/docbook.xml</code>this one in turn could +delegateallreferences for DocBook 4.2.1 to a specific catalog installed at +the sametimeas the DocBook resources on the local machine.</p> <h3><a name="reference">How to tune catalog usage:</a></h3> -<p>The user can change the default catalog behaviour by redirecting queries -to its own set of catalogs, this can be done by setting the -<code>XML_CATALOG_FILES</code> environment variable to a list of catalogs, an -empty one should deactivate loading the default <code>/etc/xml/catalog</code> -default catalog</p> +<p>The user can change the default catalog behaviour by redirecting +queriestoits own set of catalogs, this can be done by +settingthe<code>XML_CATALOG_FILES</code>environment variable to a list of +catalogs,anempty one should deactivate loading the +default<code>/etc/xml/catalog</code>default catalog</p> <h3><a name="validate">How to debug catalog processing:</a></h3> -<p>Setting up the <code>XML_DEBUG_CATALOG</code> environment variable will -make libxml2 output debugging informations for each catalog operations, for -example:</p> +<p>Setting up the <code>XML_DEBUG_CATALOG</code>environment variable +willmakelibxml2 output debugging informations for each catalog +operations,forexample:</p> <pre>orchis:~/XML -> xmllint --memory --noout test/ent2 warning: failed to load external entity "title.xml" orchis:~/XML -> export XML_DEBUG_CATALOG= @@ -3949,24 +3998,24 @@ warning: failed to load external entity "title.xml" Catalogs cleanup orchis:~/XML -> </pre> -<p>The test/ent2 references an entity, running the parser from memory makes -the base URI unavailable and the the "title.xml" entity cannot be loaded. -Setting up the debug environment variable allows to detect that an attempt is -made to load the <code>/etc/xml/catalog</code> but since it's not present the -resolution fails.</p> +<p>The test/ent2 references an entity, running the parser from memorymakesthe +base URI unavailable and the the "title.xml" entity cannot beloaded.Setting +up the debug environment variable allows to detect that anattempt ismade to +load the <code>/etc/xml/catalog</code>but since it's notpresent theresolution +fails.</p> -<p>But the most advanced way to debug XML catalog processing is to use the -<strong>xmlcatalog</strong> command shipped with libxml2, it allows to load -catalogs and make resolution queries to see what is going on. This is also -used for the regression tests:</p> +<p>But the most advanced way to debug XML catalog processing is to +usethe<strong>xmlcatalog</strong>command shipped with libxml2, it allows +toloadcatalogs and make resolution queries to see what is going on. This +isalsoused for the regression tests:</p> <pre>orchis:~/XML -> ./xmlcatalog test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd orchis:~/XML -> </pre> -<p>For debugging what is going on, adding one -v flags increase the verbosity -level to indicate the processing done (adding a second flag also indicate -what elements are recognized at parsing):</p> +<p>For debugging what is going on, adding one -v flags increase +theverbositylevel to indicate the processing done (adding a second flag +alsoindicatewhat elements are recognized at parsing):</p> <pre>orchis:~/XML -> ./xmlcatalog -v test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" Parsing catalog test/catalogs/docbook.xml's content @@ -3975,8 +4024,8 @@ http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd Catalogs cleanup orchis:~/XML -> </pre> -<p>A shell interface is also available to debug and process multiple queries -(and for regression tests):</p> +<p>A shell interface is also available to debug and process +multiplequeries(and for regression tests):</p> <pre>orchis:~/XML -> ./xmlcatalog -shell test/catalogs/docbook.xml \ "-//OASIS//DTD DocBook XML V4.1.2//EN" > help @@ -3995,14 +4044,14 @@ http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd > quit orchis:~/XML -> </pre> -<p>This should be sufficient for most debugging purpose, this was actually -used heavily to debug the XML Catalog implementation itself.</p> +<p>This should be sufficient for most debugging purpose, this wasactuallyused +heavily to debug the XML Catalog implementation itself.</p> -<h3><a name="Declaring">How to create and maintain</a> catalogs:</h3> +<h3><a name="Declaring">How to create and maintain</a>catalogs:</h3> -<p>Basically XML Catalogs are XML files, you can either use XML tools to -manage them or use <strong>xmlcatalog</strong> for this. The basic step is -to create a catalog the -create option provide this facility:</p> +<p>Basically XML Catalogs are XML files, you can either use XML toolstomanage +them or use <strong>xmlcatalog</strong>for this. The basic stepisto create a +catalog the -create option provide this facility:</p> <pre>orchis:~/XML -> ./xmlcatalog --create tst.xml <?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" @@ -4010,10 +4059,10 @@ to create a catalog the -create option provide this facility:</p> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/> orchis:~/XML -> </pre> -<p>By default xmlcatalog does not overwrite the original catalog and save the -result on the standard output, this can be overridden using the -noout -option. The <code>-add</code> command allows to add entries in the -catalog:</p> +<p>By default xmlcatalog does not overwrite the original catalog and +savetheresult on the standard output, this can be overridden using +the-nooutoption. The <code>-add</code>command allows to add entries +inthecatalog:</p> <pre>orchis:~/XML -> ./xmlcatalog --noout --create --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd tst.xml @@ -4027,12 +4076,12 @@ orchis:~/XML -> cat tst.xml </catalog> orchis:~/XML -> </pre> -<p>The <code>-add</code> option will always take 3 parameters even if some of -the XML Catalog constructs (like nextCatalog) will have only a single -argument, just pass a third empty string, it will be ignored.</p> +<p>The <code>-add</code>option will always take 3 parameters even if +someofthe XML Catalog constructs (like nextCatalog) will have only +asingleargument, just pass a third empty string, it will be ignored.</p> -<p>Similarly the <code>-del</code> option remove matching entries from the -catalog:</p> +<p>Similarly the <code>-del</code>option remove matching entries +fromthecatalog:</p> <pre>orchis:~/XML -> ./xmlcatalog --del \ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" tst.xml <?xml version="1.0"?> @@ -4041,156 +4090,158 @@ catalog:</p> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/> orchis:~/XML -> </pre> -<p>The catalog is now empty. Note that the matching of <code>-del</code> is -exact and would have worked in a similar fashion with the Public ID -string.</p> +<p>The catalog is now empty. Note that the matching +of<code>-del</code>isexact and would have worked in a similar fashion with +thePublic IDstring.</p> -<p>This is rudimentary but should be sufficient to manage a not too complex -catalog tree of resources.</p> +<p>This is rudimentary but should be sufficient to manage a not +toocomplexcatalog tree of resources.</p> -<h3><a name="implemento">The implementor corner quick review of the -API:</a></h3> +<h3><a name="implemento">The implementor corner quick review +oftheAPI:</a></h3> -<p>First, and like for every other module of libxml, there is an -automatically generated <a href="html/libxml-catalog.html">API page for -catalog support</a>.</p> +<p>First, and like for every other module of libxml, there is +anautomaticallygenerated <a href="html/libxml-catalog.html">API page +forcatalogsupport</a>.</p> <p>The header for the catalog interfaces should be included as:</p> <pre>#include <libxml/catalog.h></pre> -<p>The API is voluntarily kept very simple. First it is not obvious that -applications really need access to it since it is the default behaviour of -libxml2 (Note: it is possible to completely override libxml2 default catalog -by using <a href="html/libxml-parser.html">xmlSetExternalEntityLoader</a> to -plug an application specific resolver).</p> +<p>The API is voluntarily kept very simple. First it is not +obviousthatapplications really need access to it since it is the default +behaviouroflibxml2 (Note: it is possible to completely override libxml2 +defaultcatalogby using <a +href="html/libxml-parser.html">xmlSetExternalEntityLoader</a>toplug +anapplication specific resolver).</p> <p>Basically libxml2 support 2 catalog lists:</p> <ul> <li>the default one, global shared by all the application</li> - <li>a per-document catalog, this one is built if the document uses the - <code>oasis-xml-catalog</code> PIs to specify its own catalog list, it is - associated to the parser context and destroyed when the parsing context - is destroyed.</li> + <li>a per-document catalog, this one is built if the document + usesthe<code>oasis-xml-catalog</code>PIs to specify its own catalog list, + itisassociated to the parser context and destroyed when the + parsingcontextis destroyed.</li> </ul> <p>the document one will be used first if it exists.</p> <h4>Initialization routines:</h4> -<p>xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs() should be -used at startup to initialize the catalog, if the catalog should be -initialized with specific values xmlLoadCatalog() or xmlLoadCatalogs() -should be called before xmlInitializeCatalog() which would otherwise do a -default initialization first.</p> +<p>xmlInitializeCatalog(), xmlLoadCatalog() and xmlLoadCatalogs() +shouldbeused at startup to initialize the catalog, if the catalog +shouldbeinitialized with specific values xmlLoadCatalog() +orxmlLoadCatalogs()should be called before xmlInitializeCatalog() which +wouldotherwise do adefault initialization first.</p> -<p>The xmlCatalogAddLocal() call is used by the parser to grow the document -own catalog list if needed.</p> +<p>The xmlCatalogAddLocal() call is used by the parser to grow thedocumentown +catalog list if needed.</p> <h4>Preferences setup:</h4> -<p>The XML Catalog spec requires the possibility to select default -preferences between public and system delegation, -xmlCatalogSetDefaultPrefer() allows this, xmlCatalogSetDefaults() and -xmlCatalogGetDefaults() allow to control if XML Catalogs resolution should -be forbidden, allowed for global catalog, for document catalog or both, the -default is to allow both.</p> +<p>The XML Catalog spec requires the possibility to select +defaultpreferencesbetween public and system +delegation,xmlCatalogSetDefaultPrefer() allowsthis, xmlCatalogSetDefaults() +andxmlCatalogGetDefaults() allow to control ifXML Catalogs resolution +shouldbe forbidden, allowed for global catalog, fordocument catalog or both, +thedefault is to allow both.</p> -<p>And of course xmlCatalogSetDebug() allows to generate debug messages -(through the xmlGenericError() mechanism).</p> +<p>And of course xmlCatalogSetDebug() allows to generate +debugmessages(through the xmlGenericError() mechanism).</p> <h4>Querying routines:</h4> -<p>xmlCatalogResolve(), xmlCatalogResolveSystem(), xmlCatalogResolvePublic() -and xmlCatalogResolveURI() are relatively explicit if you read the XML -Catalog specification they correspond to section 7 algorithms, they should -also work if you have loaded an SGML catalog with a simplified semantic.</p> +<p>xmlCatalogResolve(), +xmlCatalogResolveSystem(),xmlCatalogResolvePublic()and xmlCatalogResolveURI() +are relatively explicitif you read the XMLCatalog specification they +correspond to section 7algorithms, they shouldalso work if you have loaded an +SGML catalog with asimplified semantic.</p> -<p>xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the same but -operate on the document catalog list</p> +<p>xmlCatalogLocalResolve() and xmlCatalogLocalResolveURI() are the +samebutoperate on the document catalog list</p> <h4>Cleanup and Miscellaneous:</h4> -<p>xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal() is -the per-document equivalent.</p> +<p>xmlCatalogCleanup() free-up the global catalog, xmlCatalogFreeLocal()isthe +per-document equivalent.</p> -<p>xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically modify the -first catalog in the global list, and xmlCatalogDump() allows to dump a -catalog state, those routines are primarily designed for xmlcatalog, I'm not -sure that exposing more complex interfaces (like navigation ones) would be -really useful.</p> +<p>xmlCatalogAdd() and xmlCatalogRemove() are used to dynamically +modifythefirst catalog in the global list, and xmlCatalogDump() allows to +dumpacatalog state, those routines are primarily designed for xmlcatalog, +I'mnotsure that exposing more complex interfaces (like navigation ones) +wouldbereally useful.</p> -<p>The xmlParseCatalogFile() is a function used to load XML Catalog files, -it's similar as xmlParseFile() except it bypass all catalog lookups, it's -provided because this functionality may be useful for client tools.</p> +<p>The xmlParseCatalogFile() is a function used to load XML Catalogfiles,it's +similar as xmlParseFile() except it bypass all catalog lookups,it'sprovided +because this functionality may be useful for client tools.</p> <h4>threaded environments:</h4> -<p>Since the catalog tree is built progressively, some care has been taken to -try to avoid troubles in multithreaded environments. The code is now thread -safe assuming that the libxml2 library has been compiled with threads -support.</p> +<p>Since the catalog tree is built progressively, some care has been +takentotry to avoid troubles in multithreaded environments. The code is +nowthreadsafe assuming that the libxml2 library has been compiled +withthreadssupport.</p> <p></p> <h3><a name="Other">Other resources</a></h3> -<p>The XML Catalog specification is relatively recent so there isn't much -literature to point at:</p> +<p>The XML Catalog specification is relatively recent so there +isn'tmuchliterature to point at:</p> <ul> <li>You can find a good rant from Norm Walsh about <a - href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">the - need for catalogs</a>, it provides a lot of context informations even if - I don't agree with everything presented. Norm also wrote a more recent - article <a - href="http://wwws.sun.com/software/xml/developers/resolver/article/">XML - entities and URI resolvers</a> describing them.</li> - <li>An <a href="http://home.ccil.org/~cowan/XML/XCatalog.html">old XML - catalog proposal</a> from John Cowan</li> - <li>The <a href="http://www.rddl.org/">Resource Directory Description - Language</a> (RDDL) another catalog system but more oriented toward - providing metadata for XML namespaces.</li> + href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">theneedfor + catalogs</a>, it provides a lot of context informations even ifIdon't + agree with everything presented. Norm also wrote a morerecentarticle <a + href="http://wwws.sun.com/software/xml/developers/resolver/article/">XMLentitiesand + URI resolvers</a>describing them.</li> + <li>An <a + href="http://home.ccil.org/~cowan/XML/XCatalog.html">oldXMLcatalog + proposal</a>from John Cowan</li> + <li>The <a href="http://www.rddl.org/">Resource + DirectoryDescriptionLanguage</a>(RDDL) another catalog system but more + orientedtowardproviding metadata for XML namespaces.</li> <li>the page from the OASIS Technical <a - href="http://www.oasis-open.org/committees/entity/">Committee on Entity - Resolution</a> who maintains XML Catalog, you will find pointers to the - specification update, some background and pointers to others tools - providing XML Catalog support</li> - <li>There is a <a href="buildDocBookCatalog">shell script</a> to generate - XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/ - directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on - the resources found on the system. Otherwise it will just create - ~/xmlcatalog and ~/dbkxmlcatalog and doing: + href="http://www.oasis-open.org/committees/entity/">Committee + onEntityResolution</a>who maintains XML Catalog, you will find pointers + tothespecification update, some background and pointers to + otherstoolsproviding XML Catalog support</li> + <li>There is a <a href="buildDocBookCatalog">shell script</a>to + generateXMLCatalogs for DocBook 4.1.2 . If it can write to the + /etc/xml/directory,it will set-up /etc/xml/catalog and /etc/xml/docbook + based ontheresources found on the system. Otherwise it will just + create~/xmlcatalogand ~/dbkxmlcatalog and doing: <p><code>export XML_CATALOG_FILES=$HOME/xmlcatalog</code></p> - <p>should allow to process DocBook documentations without requiring - network accesses for the DTD or stylesheets</p> + <p>should allow to process DocBook documentations withoutrequiringnetwork + accesses for the DTD or stylesheets</p> </li> - <li>I have uploaded <a href="ftp://xmlsoft.org/libxml2/test/dbk412catalog.tar.gz">a - small tarball</a> containing XML Catalogs for DocBook 4.1.2 which seems - to work fine for me too</li> - <li>The <a href="http://www.xmlsoft.org/xmlcatalog_man.html">xmlcatalog - manual page</a></li> + <li>I have uploaded <a + href="ftp://xmlsoft.org/libxml2/test/dbk412catalog.tar.gz">asmalltarball</a>containing + XML Catalogs for DocBook 4.1.2 which seemsto workfine for me too</li> + <li>The <a + href="http://www.xmlsoft.org/xmlcatalog_man.html">xmlcatalogmanualpage</a></li> </ul> -<p>If you have suggestions for corrections or additions, simply contact -me:</p> +<p>If you have suggestions for corrections or additions, simply contactme:</p> <h2><a name="library">The parser interfaces</a></h2> -<p>This section is directly intended to help programmers getting bootstrapped -using the XML tollkit from the C language. It is not intended to be -extensive. I hope the automatically generated documents will provide the -completeness required, but as a separate set of documents. The interfaces of -the XML parser are by principle low level, Those interested in a higher level -API should <a href="#DOM">look at DOM</a>.</p> +<p>This section is directly intended to help programmers +gettingbootstrappedusing the XML tollkit from the C language. It is not +intended tobeextensive. I hope the automatically generated documents will +providethecompleteness required, but as a separate set of documents. The +interfacesofthe XML parser are by principle low level, Those interested in a +higherlevelAPI should <a href="#DOM">look at DOM</a>.</p> -<p>The <a href="html/libxml-parser.html">parser interfaces for XML</a> are -separated from the <a href="html/libxml-htmlparser.html">HTML parser -interfaces</a>. Let's have a look at how the XML parser can be called:</p> +<p>The <a href="html/libxml-parser.html">parser interfaces +forXML</a>areseparated from the <a +href="html/libxml-htmlparser.html">HTMLparserinterfaces</a>. Let's have a +look at how the XML parser can becalled:</p> <h3><a name="Invoking">Invoking the parser : the pull method</a></h3> -<p>Usually, the first thing to do is to read an XML input. The parser accepts -documents either from in-memory strings or from files. The functions are -defined in "parser.h":</p> +<p>Usually, the first thing to do is to read an XML input. The +parseracceptsdocuments either from in-memory strings or from files. The +functionsaredefined in "parser.h":</p> <dl> <dt><code>xmlDocPtr xmlParseMemory(char *buffer, int size);</code></dt> <dd><p>Parse a null-terminated string containing the document.</p> @@ -4198,20 +4249,18 @@ defined in "parser.h":</p> </dl> <dl> <dt><code>xmlDocPtr xmlParseFile(const char *filename);</code></dt> - <dd><p>Parse an XML document contained in a (possibly compressed) - file.</p> + <dd><p>Parse an XML document contained in a (possibly compressed)file.</p> </dd> </dl> -<p>The parser returns a pointer to the document structure (or NULL in case of -failure).</p> +<p>The parser returns a pointer to the document structure (or NULL in +caseoffailure).</p> <h3 id="Invoking1">Invoking the parser: the push method</h3> -<p>In order for the application to keep the control when the document is -being fetched (which is common for GUI based programs) libxml2 provides a -push interface, too, as of version 1.8.3. Here are the interface -functions:</p> +<p>In order for the application to keep the control when the document +isbeingfetched (which is common for GUI based programs) libxml2 provides +apushinterface, too, as of version 1.8.3. Here are the interfacefunctions:</p> <pre>xmlParserCtxtPtr xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, const char *chunk, @@ -4244,25 +4293,26 @@ int xmlParseChunk (xmlParserCtxtPtr ctxt, } }</pre> -<p>The HTML parser embedded into libxml2 also has a push interface; the -functions are just prefixed by "html" rather than "xml".</p> +<p>The HTML parser embedded into libxml2 also has a push +interface;thefunctions are just prefixed by "html" rather than "xml".</p> <h3 id="Invoking2">Invoking the parser: the SAX interface</h3> -<p>The tree-building interface makes the parser memory-hungry, first loading -the document in memory and then building the tree itself. Reading a document -without building the tree is possible using the SAX interfaces (see SAX.h and -<a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">James -Henstridge's documentation</a>). Note also that the push interface can be -limited to SAX: just use the two first arguments of -<code>xmlCreatePushParserCtxt()</code>.</p> +<p>The tree-building interface makes the parser memory-hungry, +firstloadingthe document in memory and then building the tree itself. Reading +adocumentwithout building the tree is possible using the SAX interfaces +(seeSAX.h and<a +href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">JamesHenstridge'sdocumentation</a>). +Note also that the push interface can belimited to SAX:just use the two first +arguments of<code>xmlCreatePushParserCtxt()</code>.</p> <h3><a name="Building">Building a tree from scratch</a></h3> -<p>The other way to get an XML tree in memory is by building it. Basically -there is a set of functions dedicated to building new elements. (These are -also described in <libxml/tree.h>.) For example, here is a piece of -code that produces the XML document used in the previous examples:</p> +<p>The other way to get an XML tree in memory is by building +it.Basicallythere is a set of functions dedicated to building new +elements.(These arealso described in <libxml/tree.h>.) For example, +here is apiece ofcode that produces the XML document used in the previous +examples:</p> <pre> #include <libxml/tree.h> xmlDocPtr doc; xmlNodePtr tree, subtree; @@ -4283,66 +4333,65 @@ code that produces the XML document used in the previous examples:</p> <h3><a name="Traversing">Traversing the tree</a></h3> -<p>Basically by <a href="html/libxml-tree.html">including "tree.h"</a> your -code has access to the internal structure of all the elements of the tree. -The names should be somewhat simple like <strong>parent</strong>, -<strong>children</strong>, <strong>next</strong>, <strong>prev</strong>, -<strong>properties</strong>, etc... For example, still with the previous -example:</p> +<p>Basically by <a href="html/libxml-tree.html">including"tree.h"</a>yourcode +has access to the internal structure of all the elementsof the tree.The names +should be somewhat simple +like<strong>parent</strong>,<strong>children</strong>, +<strong>next</strong>,<strong>prev</strong>,<strong>properties</strong>, +etc... For example, stillwith the previousexample:</p> <pre><code>doc->children->children->children</code></pre> <p>points to the title element,</p> <pre>doc->children->children->next->children->children</pre> -<p>points to the text node containing the chapter title "The Linux -adventure".</p> +<p>points to the text node containing the chapter title +"TheLinuxadventure".</p> -<p><strong>NOTE</strong>: XML allows <em>PI</em>s and <em>comments</em> to be -present before the document root, so <code>doc->children</code> may point -to an element which is not the document Root Element; a function -<code>xmlDocGetRootElement()</code> was added for this purpose.</p> +<p><strong>NOTE</strong>: XML allows <em>PI</em>s and +<em>comments</em>tobepresent before the document root, so +<code>doc->children</code>maypointto an element which is not the document +Root Element; afunction<code>xmlDocGetRootElement()</code>was added for this +purpose.</p> <h3><a name="Modifying">Modifying the tree</a></h3> -<p>Functions are provided for reading and writing the document content. Here -is an excerpt from the <a href="html/libxml-tree.html">tree API</a>:</p> +<p>Functions are provided for reading and writing the document content.Hereis +an excerpt from the <a href="html/libxml-tree.html">tree API</a>:</p> <dl> - <dt><code>xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar *name, const - xmlChar *value);</code></dt> - <dd><p>This sets (or changes) an attribute carried by an ELEMENT node. - The value can be NULL.</p> + <dt><code>xmlAttrPtr xmlSetProp(xmlNodePtr node, const xmlChar + *name,constxmlChar *value);</code></dt> + <dd><p>This sets (or changes) an attribute carried by an ELEMENT + node.Thevalue can be NULL.</p> </dd> </dl> <dl> - <dt><code>const xmlChar *xmlGetProp(xmlNodePtr node, const xmlChar - *name);</code></dt> - <dd><p>This function returns a pointer to new copy of the property - content. Note that the user must deallocate the result.</p> + <dt><code>const xmlChar *xmlGetProp(xmlNodePtr node, + constxmlChar*name);</code></dt> + <dd><p>This function returns a pointer to new copy of thepropertycontent. + Note that the user must deallocate the result.</p> </dd> </dl> -<p>Two functions are provided for reading and writing the text associated -with elements:</p> +<p>Two functions are provided for reading and writing the text +associatedwithelements:</p> <dl> - <dt><code>xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc, const xmlChar - *value);</code></dt> - <dd><p>This function takes an "external" string and converts it to one - text node or possibly to a list of entity and text nodes. All - non-predefined entity references like &Gnome; will be stored - internally as entity nodes, hence the result of the function may not be - a single node.</p> + <dt><code>xmlNodePtr xmlStringGetNodeList(xmlDocPtr doc, + constxmlChar*value);</code></dt> + <dd><p>This function takes an "external" string and converts it toonetext + node or possibly to a list of entity and text nodes.Allnon-predefined + entity references like &Gnome; will bestoredinternally as entity + nodes, hence the result of the function maynot bea single node.</p> </dd> </dl> <dl> - <dt><code>xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr list, int - inLine);</code></dt> - <dd><p>This function is the inverse of - <code>xmlStringGetNodeList()</code>. It generates a new string - containing the content of the text and entity nodes. Note the extra - argument inLine. If this argument is set to 1, the function will expand - entity references. For example, instead of returning the &Gnome; - XML encoding in the string, it will substitute it with its value (say, - "GNU Network Object Model Environment").</p> + <dt><code>xmlChar *xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr + list,intinLine);</code></dt> + <dd><p>This function is the inverseof<code>xmlStringGetNodeList()</code>. + It generates a newstringcontaining the content of the text and entity + nodes. Note theextraargument inLine. If this argument is set to 1, the + function willexpandentity references. For example, instead of + returning the&Gnome;XML encoding in the string, it will substitute + it with itsvalue (say,"GNU Network Object Model Environment").</p> </dd> </dl> @@ -4350,8 +4399,8 @@ with elements:</p> <p>Basically 3 options are possible:</p> <dl> - <dt><code>void xmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int - *size);</code></dt> + <dt><code>void xmlDocDumpMemory(xmlDocPtr cur, + xmlChar**mem,int*size);</code></dt> <dd><p>Returns a buffer into which the document has been saved.</p> </dd> </dl> @@ -4362,16 +4411,16 @@ with elements:</p> </dl> <dl> <dt><code>int xmlSaveFile(const char *filename, xmlDocPtr cur);</code></dt> - <dd><p>Saves the document to a file. In this case, the compression - interface is triggered if it has been turned on.</p> + <dd><p>Saves the document to a file. In this case, + thecompressioninterface is triggered if it has been turned on.</p> </dd> </dl> <h3><a name="Compressio">Compression</a></h3> -<p>The library transparently handles compression when doing file-based -accesses. The level of compression on saves can be turned on either globally -or individually for one file:</p> +<p>The library transparently handles compression when +doingfile-basedaccesses. The level of compression on saves can be turned on +eithergloballyor individually for one file:</p> <dl> <dt><code>int xmlGetDocCompressMode (xmlDocPtr doc);</code></dt> <dd><p>Gets the document compression ratio (0-9).</p> @@ -4395,12 +4444,12 @@ or individually for one file:</p> <h2><a name="Entities">Entities or no entities</a></h2> -<p>Entities in principle are similar to simple C macros. An entity defines an -abbreviation for a given string that you can reuse many times throughout the -content of your document. Entities are especially useful when a given string -may occur frequently within a document, or to confine the change needed to a -document to a restricted area in the internal subset of the document (at the -beginning). Example:</p> +<p>Entities in principle are similar to simple C macros. An entity +definesanabbreviation for a given string that you can reuse many times +throughoutthecontent of your document. Entities are especially useful when a +givenstringmay occur frequently within a document, or to confine the change +neededto adocument to a restricted area in the internal subset of the +document (atthebeginning). Example:</p> <pre>1 <?xml version="1.0"?> 2 <!DOCTYPE EXAMPLE SYSTEM "example.dtd" [ 3 <!ENTITY xml "Extensible Markup Language"> @@ -4409,28 +4458,29 @@ beginning). Example:</p> 6 &xml; 7 </EXAMPLE></pre> -<p>Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing -its name with '&' and following it by ';' without any spaces added. There -are 5 predefined entities in libxml2 allowing you to escape characters with -predefined meaning in some parts of the xml document content: -<strong>&lt;</strong> for the character '<', <strong>&gt;</strong> -for the character '>', <strong>&apos;</strong> for the character ''', -<strong>&quot;</strong> for the character '"', and -<strong>&amp;</strong> for the character '&'.</p> - -<p>One of the problems related to entities is that you may want the parser to -substitute an entity's content so that you can see the replacement text in -your application. Or you may prefer to keep entity references as such in the -content to be able to save the document back without losing this usually -precious information (if the user went through the pain of explicitly -defining entities, he may have a a rather negative attitude if you blindly -substitute them as saving time). The <a -href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault()</a> -function allows you to check and change the behaviour, which is to not -substitute entities by default.</p> - -<p>Here is the DOM tree built by libxml2 for the previous document in the -default case:</p> +<p>Line 3 declares the xml entity. Line 6 uses the xml entity, byprefixingits +name with '&' and following it by ';' without any spacesadded. Thereare 5 +predefined entities in libxml2 allowing you to escapecharacters +withpredefined meaning in some parts of the xml +documentcontent:<strong>&lt;</strong>for the character +'<',<strong>&gt;</strong>for the character +'>',<strong>&apos;</strong>for the +character''',<strong>&quot;</strong>for the character +'"',and<strong>&amp;</strong>for the character '&'.</p> + +<p>One of the problems related to entities is that you may want the +parsertosubstitute an entity's content so that you can see the replacement +textinyour application. Or you may prefer to keep entity references as such +inthecontent to be able to save the document back without losing +thisusuallyprecious information (if the user went through the pain +ofexplicitlydefining entities, he may have a a rather negative attitude if +youblindlysubstitute them as saving time). The <a +href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault()</a>functionallows +you to check and change the behaviour, which is to notsubstituteentities by +default.</p> + +<p>Here is the DOM tree built by libxml2 for the previous document +inthedefault case:</p> <pre>/gnome/src/gnome-xml -> ./xmllint --debug test/ent1 DOCUMENT version=1.0 @@ -4451,62 +4501,63 @@ version=1.0 TEXT content= Extensible Markup Language</pre> -<p>So, entities or no entities? Basically, it depends on your use case. I -suggest that you keep the non-substituting default behaviour and avoid using -entities in your XML document or data if you are not willing to handle the -entity references elements in the DOM tree.</p> - -<p>Note that at save time libxml2 enforces the conversion of the predefined -entities where necessary to prevent well-formedness problems, and will also -transparently replace those with chars (i.e. it will not generate entity -reference elements in the DOM tree or call the reference() SAX callback when -finding them in the input).</p> - -<p><span style="background-color: #FF0000">WARNING</span>: handling entities -on top of the libxml2 SAX interface is difficult!!! If you plan to use -non-predefined entities in your documents, then the learning curve to handle -then using the SAX API may be long. If you plan to use complex documents, I -strongly suggest you consider using the DOM interface instead and let libxml -deal with the complexity rather than trying to do it yourself.</p> +<p>So, entities or no entities? Basically, it depends on your use +case.Isuggest that you keep the non-substituting default behaviour and +avoidusingentities in your XML document or data if you are not willing to +handletheentity references elements in the DOM tree.</p> + +<p>Note that at save time libxml2 enforces the conversion of +thepredefinedentities where necessary to prevent well-formedness problems, +andwill alsotransparently replace those with chars (i.e. it will not +generateentityreference elements in the DOM tree or call the reference() SAX +callbackwhenfinding them in the input).</p> + +<p><span style="background-color: #FF0000">WARNING</span>: handlingentitieson +top of the libxml2 SAX interface is difficult!!! If you plan +tousenon-predefined entities in your documents, then the learning curve +tohandlethen using the SAX API may be long. If you plan to use +complexdocuments, Istrongly suggest you consider using the DOM interface +instead andlet libxmldeal with the complexity rather than trying to do it +yourself.</p> <h2><a name="Namespaces">Namespaces</a></h2> <p>The libxml2 library implements <a -href="http://www.w3.org/TR/REC-xml-names/">XML namespaces</a> support by -recognizing namespace constructs in the input, and does namespace lookup -automatically when building the DOM tree. A namespace declaration is -associated with an in-memory structure and all elements or attributes within -that namespace point to it. Hence testing the namespace is a simple and fast -equality operation at the user level.</p> - -<p>I suggest that people using libxml2 use a namespace, and declare it in the -root element of their document as the default namespace. Then they don't need -to use the prefix in the content but we will have a basis for future semantic -refinement and merging of data from different sources. This doesn't increase -the size of the XML output significantly, but significantly increases its -value in the long-term. Example:</p> +href="http://www.w3.org/TR/REC-xml-names/">XML +namespaces</a>supportbyrecognizing namespace constructs in the input, and +does namespacelookupautomatically when building the DOM tree. A namespace +declarationisassociated with an in-memory structure and all elements or +attributeswithinthat namespace point to it. Hence testing the namespace is a +simple andfastequality operation at the user level.</p> + +<p>I suggest that people using libxml2 use a namespace, and declare it +intheroot element of their document as the default namespace. Then they +don'tneedto use the prefix in the content but we will have a basis for +futuresemanticrefinement and merging of data from different sources. This +doesn'tincreasethe size of the XML output significantly, but significantly +increasesitsvalue in the long-term. Example:</p> <pre><mydoc xmlns="http://mydoc.example.org/schemas/"> <elem1>...</elem1> <elem2>...</elem2> </mydoc></pre> -<p>The namespace value has to be an absolute URL, but the URL doesn't have to -point to any existing resource on the Web. It will bind all the element and -attributes with that URL. I suggest to use an URL within a domain you -control, and that the URL should contain some kind of version information if -possible. For example, <code>"http://www.gnome.org/gnumeric/1.0/"</code> is a -good namespace scheme.</p> - -<p>Then when you load a file, make sure that a namespace carrying the -version-independent prefix is installed on the root element of your document, -and if the version information don't match something you know, warn the user -and be liberal in what you accept as the input. Also do *not* try to base -namespace checking on the prefix value. <foo:text> may be exactly the -same as <bar:text> in another document. What really matters is the URI -associated with the element or the attribute, not the prefix string (which is -just a shortcut for the full URI). In libxml, element and attributes have an -<code>ns</code> field pointing to an xmlNs structure detailing the namespace -prefix and its URI.</p> +<p>The namespace value has to be an absolute URL, but the URL doesn't +havetopoint to any existing resource on the Web. It will bind all the +elementandattributes with that URL. I suggest to use an URL within a +domainyoucontrol, and that the URL should contain some kind of version +informationifpossible. For example, +<code>"http://www.gnome.org/gnumeric/1.0/"</code>isagood namespace scheme.</p> + +<p>Then when you load a file, make sure that a namespace +carryingtheversion-independent prefix is installed on the root element of +yourdocument,and if the version information don't match something you know, +warnthe userand be liberal in what you accept as the input. Also do *not* try +tobasenamespace checking on the prefix value. <foo:text> may be +exactlythesame as <bar:text> in another document. What really matters +is theURIassociated with the element or the attribute, not the prefix string +(whichisjust a shortcut for the full URI). In libxml, element and attributes +havean<code>ns</code>field pointing to an xmlNs structure detailing +thenamespaceprefix and its URI.</p> <p>@@Interfaces@@</p> <pre>xmlNodePtr node; @@ -4516,158 +4567,163 @@ if(!strncmp(node->name,"mytag",5) ... }</pre> -<p>Usually people object to using namespaces together with validity checking. -I will try to make sure that using namespaces won't break validity checking, -so even if you plan to use or currently are using validation I strongly -suggest adding namespaces to your document. A default namespace scheme -<code>xmlns="http://...."</code> should not break validity even on less -flexible parsers. Using namespaces to mix and differentiate content coming -from multiple DTDs will certainly break current validation schemes. To check -such documents one needs to use schema-validation, which is supported in -libxml2 as well. See <a href="http://www.relaxng.org/">relagx-ng</a> and <a +<p>Usually people object to using namespaces together with validitychecking.I +will try to make sure that using namespaces won't break validitychecking,so +even if you plan to use or currently are using validation Istronglysuggest +adding namespaces to your document. A default +namespacescheme<code>xmlns="http://...."</code>should not break validity even +onlessflexible parsers. Using namespaces to mix and differentiate +contentcomingfrom multiple DTDs will certainly break current validation +schemes. Tochecksuch documents one needs to use schema-validation, which is +supportedinlibxml2 as well. See <a +href="http://www.relaxng.org/">relagx-ng</a>and <a href="http://www.w3c.org/XML/Schema">w3c-schema</a>.</p> <h2><a name="Upgrading">Upgrading 1.x code</a></h2> <p>Incompatible changes:</p> -<p>Version 2 of libxml2 is the first version introducing serious backward -incompatible changes. The main goals were:</p> +<p>Version 2 of libxml2 is the first version introducing +seriousbackwardincompatible changes. The main goals were:</p> <ul> - <li>a general cleanup. A number of mistakes inherited from the very early - versions couldn't be changed due to compatibility constraints. Example - the "childs" element in the nodes.</li> - <li>Uniformization of the various nodes, at least for their header and link - parts (doc, parent, children, prev, next), the goal is a simpler - programming model and simplifying the task of the DOM implementors.</li> - <li>better conformances to the XML specification, for example version 1.x - had an heuristic to try to detect ignorable white spaces. As a result the - SAX event generated were ignorableWhitespace() while the spec requires - character() in that case. This also mean that a number of DOM node - containing blank text may populate the DOM tree which were not present - before.</li> + <li>a general cleanup. A number of mistakes inherited from the + veryearlyversions couldn't be changed due to compatibility + constraints.Examplethe "childs" element in the nodes.</li> + <li>Uniformization of the various nodes, at least for their header + andlinkparts (doc, parent, children, prev, next), the goal is + asimplerprogramming model and simplifying the task of the + DOMimplementors.</li> + <li>better conformances to the XML specification, for example version1.xhad + an heuristic to try to detect ignorable white spaces. As a resulttheSAX + event generated were ignorableWhitespace() while the + specrequirescharacter() in that case. This also mean that a number of + DOMnodecontaining blank text may populate the DOM tree which were + notpresentbefore.</li> </ul> <h3>How to fix libxml-1.x code:</h3> -<p>So client code of libxml designed to run with version 1.x may have to be -changed to compile against version 2.x of libxml. Here is a list of changes -that I have collected, they may not be sufficient, so in case you find other -change which are required, <a href="mailto:Daniel.Veillard@w3.org">drop me a -mail</a>:</p> +<p>So client code of libxml designed to run with version 1.x may have +tobechanged to compile against version 2.x of libxml. Here is a list +ofchangesthat I have collected, they may not be sufficient, so in case you +findotherchange which are required, <a +href="mailto:Daniel.Veillard@w3.org">dropme amail</a>:</p> <ol> - <li>The package name have changed from libxml to libxml2, the library name - is now -lxml2 . There is a new xml2-config script which should be used to - select the right parameters libxml2</li> - <li>Node <strong>childs</strong> field has been renamed - <strong>children</strong> so s/childs/children/g should be applied - (probability of having "childs" anywhere else is close to 0+</li> - <li>The document don't have anymore a <strong>root</strong> element it has - been replaced by <strong>children</strong> and usually you will get a - list of element here. For example a Dtd element for the internal subset - and it's declaration may be found in that list, as well as processing - instructions or comments found before or after the document root element. - Use <strong>xmlDocGetRootElement(doc)</strong> to get the root element of - a document. Alternatively if you are sure to not reference DTDs nor have - PIs or comments before or after the root element - s/->root/->children/g will probably do it.</li> - <li>The white space issue, this one is more complex, unless special case of - validating parsing, the line breaks and spaces usually used for indenting - and formatting the document content becomes significant. So they are - reported by SAX and if your using the DOM tree, corresponding nodes are - generated. Too approach can be taken: + <li>The package name have changed from libxml to libxml2, the librarynameis + now -lxml2 . There is a new xml2-config script which should beused + toselect the right parameters libxml2</li> + <li>Node <strong>childs</strong>field has + beenrenamed<strong>children</strong>so s/childs/children/g should + beapplied(probability of having "childs" anywhere else is close to 0+</li> + <li>The document don't have anymore a <strong>root</strong>element + ithasbeen replaced by <strong>children</strong>and usually you will + getalist of element here. For example a Dtd element for the + internalsubsetand it's declaration may be found in that list, as well + asprocessinginstructions or comments found before or after the + documentroot element.Use <strong>xmlDocGetRootElement(doc)</strong>to get + theroot element ofa document. Alternatively if you are sure to not + referenceDTDs nor havePIs or comments before or after the + rootelements/->root/->children/g will probably do it.</li> + <li>The white space issue, this one is more complex, unless special + caseofvalidating parsing, the line breaks and spaces usually used + forindentingand formatting the document content becomes significant. So + theyarereported by SAX and if your using the DOM tree, corresponding + nodesaregenerated. Too approach can be taken: <ol> - <li>lazy one, use the compatibility call - <strong>xmlKeepBlanksDefault(0)</strong> but be aware that you are - relying on a special (and possibly broken) set of heuristics of - libxml to detect ignorable blanks. Don't complain if it breaks or - make your application not 100% clean w.r.t. to it's input.</li> - <li>the Right Way: change you code to accept possibly insignificant - blanks characters, or have your tree populated with weird blank text - nodes. You can spot them using the commodity function - <strong>xmlIsBlankNode(node)</strong> returning 1 for such blank - nodes.</li> + <li>lazy one, use the + compatibilitycall<strong>xmlKeepBlanksDefault(0)</strong>but be aware + that youarerelying on a special (and possibly broken) set of + heuristicsoflibxml to detect ignorable blanks. Don't complain if it + breaksormake your application not 100% clean w.r.t. to it's + input.</li> + <li>the Right Way: change you code to accept + possiblyinsignificantblanks characters, or have your tree populated + withweird blank textnodes. You can spot them using the + commodityfunction<strong>xmlIsBlankNode(node)</strong>returning 1 for + suchblanknodes.</li> </ol> - <p>Note also that with the new default the output functions don't add any - extra indentation when saving a tree in order to be able to round trip - (read and save) without inflating the document with extra formatting - chars.</p> + <p>Note also that with the new default the output functions don't + addanyextra indentation when saving a tree in order to be able to + roundtrip(read and save) without inflating the document with + extraformattingchars.</p> </li> - <li>The include path has changed to $prefix/libxml/ and the includes - themselves uses this new prefix in includes instructions... If you are - using (as expected) the + <li>The include path has changed to $prefix/libxml/ and + theincludesthemselves uses this new prefix in includes instructions... + Ifyou areusing (as expected) the <pre>xml2-config --cflags</pre> - <p>output to generate you compile commands this will probably work out of - the box</p> + <p>output to generate you compile commands this will probably work + outofthe box</p> </li> - <li>xmlDetectCharEncoding takes an extra argument indicating the length in - byte of the head of the document available for character detection.</li> + <li>xmlDetectCharEncoding takes an extra argument indicating the + lengthinbyte of the head of the document available for character + detection.</li> </ol> <h3>Ensuring both libxml-1.x and libxml-2.x compatibility</h3> -<p>Two new version of libxml (1.8.11) and libxml2 (2.3.4) have been released -to allow smooth upgrade of existing libxml v1code while retaining -compatibility. They offers the following:</p> +<p>Two new version of libxml (1.8.11) and libxml2 (2.3.4) have beenreleasedto +allow smooth upgrade of existing libxml v1code whileretainingcompatibility. +They offers the following:</p> <ol> - <li>similar include naming, one should use - <strong>#include<libxml/...></strong> in both cases.</li> - <li>similar identifiers defined via macros for the child and root fields: - respectively <strong>xmlChildrenNode</strong> and - <strong>xmlRootNode</strong></li> - <li>a new macro <strong>LIBXML_TEST_VERSION</strong> which should be - inserted once in the client code</li> + <li>similar include naming, one + shoulduse<strong>#include<libxml/...></strong>in both cases.</li> + <li>similar identifiers defined via macros for the child and + rootfields:respectively<strong>xmlChildrenNode</strong>and<strong>xmlRootNode</strong></li> + <li>a new macro <strong>LIBXML_TEST_VERSION</strong>which should + beinsertedonce in the client code</li> </ol> -<p>So the roadmap to upgrade your existing libxml applications is the -following:</p> +<p>So the roadmap to upgrade your existing libxml applications +isthefollowing:</p> <ol> <li>install the libxml-1.8.8 (and libxml-devel-1.8.8) packages</li> - <li>find all occurrences where the xmlDoc <strong>root</strong> field is - used and change it to <strong>xmlRootNode</strong></li> - <li>similarly find all occurrences where the xmlNode - <strong>childs</strong> field is used and change it to - <strong>xmlChildrenNode</strong></li> - <li>add a <strong>LIBXML_TEST_VERSION</strong> macro somewhere in your - <strong>main()</strong> or in the library init entry point</li> + <li>find all occurrences where the xmlDoc <strong>root</strong>field + isusedand change it to <strong>xmlRootNode</strong></li> + <li>similarly find all occurrences where + thexmlNode<strong>childs</strong>field is used and change + itto<strong>xmlChildrenNode</strong></li> + <li>add a <strong>LIBXML_TEST_VERSION</strong>macro somewhere + inyour<strong>main()</strong>or in the library init entry point</li> <li>Recompile, check compatibility, it should still work</li> - <li>Change your configure script to look first for xml2-config and fall - back using xml-config . Use the --cflags and --libs output of the command - as the Include and Linking parameters needed to use libxml.</li> - <li>install libxml2-2.3.x and libxml2-devel-2.3.x (libxml-1.8.y and - libxml-devel-1.8.y can be kept simultaneously)</li> - <li>remove your config.cache, relaunch your configuration mechanism, and - recompile, if steps 2 and 3 were done right it should compile as-is</li> - <li>Test that your application is still running correctly, if not this may - be due to extra empty nodes due to formating spaces being kept in libxml2 - contrary to libxml1, in that case insert xmlKeepBlanksDefault(1) in your - code before calling the parser (next to - <strong>LIBXML_TEST_VERSION</strong> is a fine place).</li> + <li>Change your configure script to look first for xml2-config and + fallbackusing xml-config . Use the --cflags and --libs output of the + commandasthe Include and Linking parameters needed to use libxml.</li> + <li>install libxml2-2.3.x and libxml2-devel-2.3.x + (libxml-1.8.yandlibxml-devel-1.8.y can be kept simultaneously)</li> + <li>remove your config.cache, relaunch your configuration + mechanism,andrecompile, if steps 2 and 3 were done right it should + compileas-is</li> + <li>Test that your application is still running correctly, if not thismaybe + due to extra empty nodes due to formating spaces being kept + inlibxml2contrary to libxml1, in that case insert + xmlKeepBlanksDefault(1)in yourcode before calling the parser + (nextto<strong>LIBXML_TEST_VERSION</strong>is a fine place).</li> </ol> <p>Following those steps should work. It worked for some of my own code.</p> -<p>Let me put some emphasis on the fact that there is far more changes from -libxml 1.x to 2.x than the ones you may have to patch for. The overall code -has been considerably cleaned up and the conformance to the XML specification -has been drastically improved too. Don't take those changes as an excuse to -not upgrade, it may cost a lot on the long term ...</p> +<p>Let me put some emphasis on the fact that there is far more +changesfromlibxml 1.x to 2.x than the ones you may have to patch for. The +overallcodehas been considerably cleaned up and the conformance to the +XMLspecificationhas been drastically improved too. Don't take those changes +asan excuse tonot upgrade, it may cost a lot on the long term ...</p> <h2><a name="Thread">Thread safety</a></h2> -<p>Starting with 2.4.7, libxml2 makes provisions to ensure that concurrent -threads can safely work in parallel parsing different documents. There is -however a couple of things to do to ensure it:</p> +<p>Starting with 2.4.7, libxml2 makes provisions to ensure +thatconcurrentthreads can safely work in parallel parsing different +documents.There ishowever a couple of things to do to ensure it:</p> <ul> <li>configure the library accordingly using the --with-threads options</li> - <li>call xmlInitParser() in the "main" thread before using any of the - libxml2 API (except possibly selecting a different memory allocator)</li> + <li>call xmlInitParser() in the "main" thread before using any ofthelibxml2 + API (except possibly selecting a different memoryallocator)</li> </ul> -<p>Note that the thread safety cannot be ensured for multiple threads sharing -the same document, the locking must be done at the application level, libxml -exports a basic mutex and reentrant mutexes API in <libxml/threads.h>. -The parts of the library checked for thread safety are:</p> +<p>Note that the thread safety cannot be ensured for multiple +threadssharingthe same document, the locking must be done at the application +level,libxmlexports a basic mutex and reentrant mutexes API +in<libxml/threads.h>.The parts of the library checked for thread +safetyare:</p> <ul> <li>concurrent loading</li> <li>file access resolution</li> @@ -4679,31 +4735,31 @@ The parts of the library checked for thread safety are:</p> <li>memory handling</li> </ul> -<p>XPath is supposed to be thread safe now, but this wasn't tested -seriously.</p> +<p>XPath is supposed to be thread safe now, but this +wasn'ttestedseriously.</p> <h2><a name="DOM"></a><a name="Principles">DOM Principles</a></h2> -<p><a href="http://www.w3.org/DOM/">DOM</a> stands for the <em>Document -Object Model</em>; this is an API for accessing XML or HTML structured -documents. Native support for DOM in Gnome is on the way (module gnome-dom), -and will be based on gnome-xml. This will be a far cleaner interface to -manipulate XML files within Gnome since it won't expose the internal -structure.</p> +<p><a href="http://www.w3.org/DOM/">DOM</a>stands for the +<em>DocumentObjectModel</em>; this is an API for accessing XML or HTML +structureddocuments.Native support for DOM in Gnome is on the way (module +gnome-dom),and will bebased on gnome-xml. This will be a far cleaner +interface tomanipulate XMLfiles within Gnome since it won't expose the +internalstructure.</p> <p>The current DOM implementation on top of libxml2 is the <a -href="http://cvs.gnome.org/lxr/source/gdome2/">gdome2 Gnome module</a>, this -is a full DOM interface, thanks to Paolo Casarini, check the <a -href="http://www.cs.unibo.it/~casarini/gdome2/">Gdome2 homepage</a> for more -informations.</p> +href="http://cvs.gnome.org/lxr/source/gdome2/">gdome2 Gnome module</a>,thisis +a full DOM interface, thanks to Paolo Casarini, check the <a +href="http://www.cs.unibo.it/~casarini/gdome2/">Gdome2 +homepage</a>formoreinformations.</p> <h2><a name="Example"></a><a name="real">A real example</a></h2> -<p>Here is a real size example, where the actual content of the application -data is not kept in the DOM tree but uses internal structures. It is based on -a proposal to keep a database of jobs related to Gnome, with an XML based -storage structure. Here is an <a href="gjobs.xml">XML encoded jobs -base</a>:</p> +<p>Here is a real size example, where the actual content of +theapplicationdata is not kept in the DOM tree but uses internal structures. +Itis based ona proposal to keep a database of jobs related to Gnome, with +anXML basedstorage structure. Here is an <a href="gjobs.xml">XML +encodedjobsbase</a>:</p> <pre><?xml version="1.0"?> <gjob:Helping xmlns:gjob="http://www.gnome.org/some-location"> <gjob:Jobs> @@ -4761,15 +4817,16 @@ base</a>:</p> </gjob:Jobs> </gjob:Helping></pre> -<p>While loading the XML file into an internal DOM tree is a matter of -calling only a couple of functions, browsing the tree to gather the data and -generate the internal structures is harder, and more error prone.</p> +<p>While loading the XML file into an internal DOM tree is a matter +ofcallingonly a couple of functions, browsing the tree to gather the data +andgeneratethe internal structures is harder, and more error prone.</p> -<p>The suggested principle is to be tolerant with respect to the input -structure. For example, the ordering of the attributes is not significant, -the XML specification is clear about it. It's also usually a good idea not to -depend on the order of the children of a given node, unless it really makes -things harder. Here is some code to parse the information for a person:</p> +<p>The suggested principle is to be tolerant with respect to +theinputstructure. For example, the ordering of the attributes is +notsignificant,the XML specification is clear about it. It's also usually a +goodidea not todepend on the order of the children of a given node, unless +itreally makesthings harder. Here is some code to parse the information for +aperson:</p> <pre>/* * A person record */ @@ -4815,23 +4872,24 @@ DEBUG("parsePerson\n"); <p>Here are a couple of things to notice:</p> <ul> - <li>Usually a recursive parsing style is the more convenient one: XML data - is by nature subject to repetitive constructs and usually exhibits highly - structured patterns.</li> - <li>The two arguments of type <em>xmlDocPtr</em> and <em>xmlNsPtr</em>, - i.e. the pointer to the global XML document and the namespace reserved to - the application. Document wide information are needed for example to - decode entities and it's a good coding practice to define a namespace for - your application set of data and test that the element and attributes - you're analyzing actually pertains to your application space. This is - done by a simple equality test (cur->ns == ns).</li> - <li>To retrieve text and attributes value, you can use the function - <em>xmlNodeListGetString</em> to gather all the text and entity reference - nodes generated by the DOM output and produce an single text string.</li> -</ul> - -<p>Here is another piece of code used to parse another level of the -structure:</p> + <li>Usually a recursive parsing style is the more convenient one: XMLdatais + by nature subject to repetitive constructs and usually + exhibitshighlystructured patterns.</li> + <li>The two arguments of type <em>xmlDocPtr</em>and + <em>xmlNsPtr</em>,i.e.the pointer to the global XML document and the + namespace reserved totheapplication. Document wide information are needed + for example todecodeentities and it's a good coding practice to define a + namespace foryourapplication set of data and test that the element and + attributesyou'reanalyzing actually pertains to your application space. + This isdone by asimple equality test (cur->ns == ns).</li> + <li>To retrieve text and attributes value, you can use + thefunction<em>xmlNodeListGetString</em>to gather all the text and + entityreferencenodes generated by the DOM output and produce an single + textstring.</li> +</ul> + +<p>Here is another piece of code used to parse another level +ofthestructure:</p> <pre>#include <libxml/tree.h> /* * a Description for a Job @@ -4884,59 +4942,58 @@ DEBUG("parseJob\n"); return(ret); }</pre> -<p>Once you are used to it, writing this kind of code is quite simple, but -boring. Ultimately, it could be possible to write stubbers taking either C -data structure definitions, a set of XML examples or an XML DTD and produce -the code needed to import and export the content between C data and XML -storage. This is left as an exercise to the reader :-)</p> +<p>Once you are used to it, writing this kind of code is quite +simple,butboring. Ultimately, it could be possible to write stubbers taking +eitherCdata structure definitions, a set of XML examples or an XML DTD +andproducethe code needed to import and export the content between C data +andXMLstorage. This is left as an exercise to the reader :-)</p> -<p>Feel free to use <a href="example/gjobread.c">the code for the full C -parsing example</a> as a template, it is also available with Makefile in the -Gnome CVS base under gnome-xml/example</p> +<p>Feel free to use <a href="example/gjobread.c">the code for the +fullCparsing example</a>as a template, it is also available with Makefile +intheGnome CVS base under gnome-xml/example</p> <h2><a name="Contributi">Contributions</a></h2> <ul> - <li>Bjorn Reese, William Brack and Thomas Broyer have provided a number of - patches, Gary Pennington worked on the validation API, threading support - and Solaris port.</li> + <li>Bjorn Reese, William Brack and Thomas Broyer have provided a + numberofpatches, Gary Pennington worked on the validation API, + threadingsupportand Solaris port.</li> <li>John Fleck helps maintaining the documentation and man pages.</li> - <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a> is now the - maintainer of the Windows port, <a - href="http://www.zlatkovic.com/projects/libxml/index.html">he provides - binaries</a></li> - <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a> provides - <a href="http://garypennington.net/libxml2/">Solaris binaries</a></li> + <li><a href="mailto:igor@zlatkovic.com">Igor Zlatkovic</a>is + nowthemaintainer of the Windows port, <a + href="http://www.zlatkovic.com/projects/libxml/index.html">heprovidesbinaries</a></li> + <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a>provides<a + href="http://garypennington.net/libxml2/">Solaris binaries</a></li> <li><a - href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt - Sergeant</a> developed <a - href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl wrapper for - libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML - application server</a></li> - <li><a href="mailto:fnatter@gmx.net">Felix Natter</a> and <a - href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a - href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions - documentation</li> - <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a> provided <a + href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">MattSergeant</a>developed<a + href="http://axkit.org/download/">XML::LibXSLT</a>, a Perl + wrapperforlibxml2/libxslt as part of the <a + href="http://axkit.com/">AxKitXMLapplication server</a></li> + <li><a href="mailto:fnatter@gmx.net">Felix Natter</a>and <a + href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a>provide <a + href="libxml-doc.el">an emacs module</a>to lookup + libxml(2)functionsdocumentation</li> + <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a>provided <a href="http://xmlsoft.org/messages/0488.html">man pages</a></li> <li>there is a module for <a - href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxslt support - in OpenNSD/AOLServer</a></li> - <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provided the - first version of libxml/libxslt <a + href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxsltsupportin + OpenNSD/AOLServer</a></li> + <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave + Kuhlman</a>providedthefirst version of libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a></li> <li>Petr Kozelka provides <a - href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue - libxml2</a> with Kylix and Delphi and other Pascal compilers</li> - <li><a href="mailto:aleksey@aleksey.com">Aleksey Sanin</a> implemented the - <a href="http://www.w3.org/Signature/">XML Canonicalization and XML - Digital Signature</a> <a - href="http://www.aleksey.com/xmlsec/">implementations for libxml2</a></li> - <li><a href="mailto:Steve.Ball@explain.com.au">Steve Ball</a> and - contributors maintain <a href="http://tclxml.sourceforge.net/">tcl - bindings for libxml2 and libxslt</a>, as well as <a - href="http://tclxml.sf.net/tkxmllint.html">tkxmllint</a> a GUI for - xmllint and <a href="http://tclxml.sf.net/tkxsltproc.html">tkxsltproc</a> - a GUI for xsltproc.</li> + href="http://sourceforge.net/projects/libxml2-pas">Pascal units + togluelibxml2</a>with Kylix and Delphi and other Pascal compilers</li> + <li><a href="mailto:aleksey@aleksey.com">Aleksey Sanin</a>implemented the<a + href="http://www.w3.org/Signature/">XML Canonicalization and + XMLDigitalSignature</a><a + href="http://www.aleksey.com/xmlsec/">implementations forlibxml2</a></li> + <li><a href="mailto:Steve.Ball@explain.com.au">SteveBall</a>andcontributors + maintain <a href="http://tclxml.sourceforge.net/">tclbindings for libxml2 + andlibxslt</a>, as well as <a + href="http://tclxml.sf.net/tkxmllint.html">tkxmllint</a>a GUI + forxmllintand <a + href="http://tclxml.sf.net/tkxsltproc.html">tkxsltproc</a>a GUIfor + xsltproc.</li> </ul> <p></p> diff --git a/doc/xmldtd.html b/doc/xmldtd.html index c5541d6..3f5a797 100644 --- a/doc/xmldtd.html +++ b/doc/xmldtd.html @@ -17,84 +17,84 @@ A:link, A:visited, A:active { text-decoration: underline } <li><a href="#Some">Some examples</a></li> <li><a href="#validate">How to validate</a></li> <li><a href="#Other">Other resources</a></li> -</ol><h3><a name="General5" id="General5">General overview</a></h3><p>Well what is validation and what is a DTD ?</p><p>DTD is the acronym for Document Type Definition. This is a description of -the content for a family of XML files. This is part of the XML 1.0 -specification, and allows one to describe and verify that a given document -instance conforms to the set of rules detailing its structure and content.</p><p>Validation is the process of checking a document against a DTD (more -generally against a set of construction rules).</p><p>The validation process and building DTDs are the two most difficult parts -of the XML life cycle. Briefly a DTD defines all the possible elements to be -found within your document, what is the formal shape of your document tree -(by defining the allowed content of an element; either text, a regular -expression for the allowed list of children, or mixed content i.e. both text -and children). The DTD also defines the valid attributes for all elements and -the types of those attributes.</p><h3><a name="definition1" id="definition1">The definition</a></h3><p>The <a href="http://www.w3.org/TR/REC-xml">W3C XML Recommendation</a> (<a href="http://www.xml.com/axml/axml.html">Tim Bray's annotated version of -Rev1</a>):</p><ul><li><a href="http://www.w3.org/TR/REC-xml#elemdecls">Declaring - elements</a></li> - <li><a href="http://www.w3.org/TR/REC-xml#attdecls">Declaring - attributes</a></li> -</ul><p>(unfortunately) all this is inherited from the SGML world, the syntax is -ancient...</p><h3><a name="Simple1" id="Simple1">Simple rules</a></h3><p>Writing DTDs can be done in many ways. The rules to build them if you need -something permanent or something which can evolve over time can be radically -different. Really complex DTDs like DocBook ones are flexible but quite -harder to design. I will just focus on DTDs for a formats with a fixed simple -structure. It is just a set of basic rules, and definitely not exhaustive nor -usable for complex DTD design.</p><h4><a name="reference1" id="reference1">How to reference a DTD from a document</a>:</h4><p>Assuming the top element of the document is <code>spec</code> and the dtd -is placed in the file <code>mydtd</code> in the subdirectory -<code>dtds</code> of the directory from where the document were loaded:</p><p><code><!DOCTYPE spec SYSTEM "dtds/mydtd"></code></p><p>Notes:</p><ul><li>The system string is actually an URI-Reference (as defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) so you can use a - full URL string indicating the location of your DTD on the Web. This is a - really good thing to do if you want others to validate your document.</li> - <li>It is also possible to associate a <code>PUBLIC</code> identifier (a - magic string) so that the DTD is looked up in catalogs on the client side - without having to locate it on the web.</li> - <li>A DTD contains a set of element and attribute declarations, but they - don't define what the root of the document should be. This is explicitly - told to the parser/validator as the first element of the - <code>DOCTYPE</code> declaration.</li> -</ul><h4><a name="Declaring2" id="Declaring2">Declaring elements</a>:</h4><p>The following declares an element <code>spec</code>:</p><p><code><!ELEMENT spec (front, body, back?)></code></p><p>It also expresses that the spec element contains one <code>front</code>, -one <code>body</code> and one optional <code>back</code> children elements in -this order. The declaration of one element of the structure and its content -are done in a single declaration. Similarly the following declares -<code>div1</code> elements:</p><p><code><!ELEMENT div1 (head, (p | list | note)*, div2?)></code></p><p>which means div1 contains one <code>head</code> then a series of optional -<code>p</code>, <code>list</code>s and <code>note</code>s and then an -optional <code>div2</code>. And last but not least an element can contain -text:</p><p><code><!ELEMENT b (#PCDATA)></code></p><p><code>b</code> contains text or being of mixed content (text and elements -in no particular order):</p><p><code><!ELEMENT p (#PCDATA|a|ul|b|i|em)*></code></p><p><code>p </code>can contain text or <code>a</code>, <code>ul</code>, -<code>b</code>, <code>i </code>or <code>em</code> elements in no particular -order.</p><h4><a name="Declaring1" id="Declaring1">Declaring attributes</a>:</h4><p>Again the attributes declaration includes their content definition:</p><p><code><!ATTLIST termdef name CDATA #IMPLIED></code></p><p>means that the element <code>termdef</code> can have a <code>name</code> -attribute containing text (<code>CDATA</code>) and which is optional -(<code>#IMPLIED</code>). The attribute value can also be defined within a -set:</p><p><code><!ATTLIST list type (bullets|ordered|glossary) -"ordered"></code></p><p>means <code>list</code> element have a <code>type</code> attribute with 3 -allowed values "bullets", "ordered" or "glossary" and which default to -"ordered" if the attribute is not explicitly specified.</p><p>The content type of an attribute can be text (<code>CDATA</code>), -anchor/reference/references -(<code>ID</code>/<code>IDREF</code>/<code>IDREFS</code>), entity(ies) -(<code>ENTITY</code>/<code>ENTITIES</code>) or name(s) -(<code>NMTOKEN</code>/<code>NMTOKENS</code>). The following defines that a -<code>chapter</code> element can have an optional <code>id</code> attribute -of type <code>ID</code>, usable for reference from attribute of type -IDREF:</p><p><code><!ATTLIST chapter id ID #IMPLIED></code></p><p>The last value of an attribute definition can be <code>#REQUIRED -</code>meaning that the attribute has to be given, <code>#IMPLIED</code> -meaning that it is optional, or the default value (possibly prefixed by -<code>#FIXED</code> if it is the only allowed).</p><p>Notes:</p><ul><li>Usually the attributes pertaining to a given element are declared in a - single expression, but it is just a convention adopted by a lot of DTD - writers: +</ol><h3><a name="General5" id="General5">General overview</a></h3><p>Well what is validation and what is a DTD ?</p><p>DTD is the acronym for Document Type Definition. This is a +descriptionofthe content for a family of XML files. This is part of the +XML1.0specification, and allows one to describe and verify that a +givendocumentinstance conforms to the set of rules detailing its structure +andcontent.</p><p>Validation is the process of checking a document against a +DTD(moregenerally against a set of construction rules).</p><p>The validation process and building DTDs are the two most difficultpartsof +the XML life cycle. Briefly a DTD defines all the possible elementsto befound +within your document, what is the formal shape of your documenttree(by +defining the allowed content of an element; either text, aregularexpression +for the allowed list of children, or mixed content i.e.both textand +children). The DTD also defines the valid attributes for allelements andthe +types of those attributes.</p><h3><a name="definition1" id="definition1">The definition</a></h3><p>The <a href="http://www.w3.org/TR/REC-xml">W3C XML Recommendation</a>(<a href="http://www.xml.com/axml/axml.html">Tim Bray's annotated +versionofRev1</a>):</p><ul><li><a href="http://www.w3.org/TR/REC-xml#elemdecls">Declaringelements</a></li> + <li><a href="http://www.w3.org/TR/REC-xml#attdecls">Declaringattributes</a></li> +</ul><p>(unfortunately) all this is inherited from the SGML world, the +syntaxisancient...</p><h3><a name="Simple1" id="Simple1">Simple rules</a></h3><p>Writing DTDs can be done in many ways. The rules to build them if +youneedsomething permanent or something which can evolve over time can +beradicallydifferent. Really complex DTDs like DocBook ones are flexible +butquiteharder to design. I will just focus on DTDs for a formats with a +fixedsimplestructure. It is just a set of basic rules, and definitely +notexhaustive norusable for complex DTD design.</p><h4><a name="reference1" id="reference1">How to reference a DTD from a document</a>:</h4><p>Assuming the top element of the document is <code>spec</code>and the +dtdisplaced in the file <code>mydtd</code>in the +subdirectory<code>dtds</code>ofthe directory from where the document were +loaded:</p><p><code><!DOCTYPE spec SYSTEM "dtds/mydtd"></code></p><p>Notes:</p><ul><li>The system string is actually an URI-Reference (as defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) so you can + useafull URL string indicating the location of your DTD on the Web. This + isareally good thing to do if you want others to validate + yourdocument.</li> + <li>It is also possible to associate a <code>PUBLIC</code>identifier(amagic + string) so that the DTD is looked up in catalogs on the clientsidewithout + having to locate it on the web.</li> + <li>A DTD contains a set of element and attribute declarations, + buttheydon't define what the root of the document should be. This + isexplicitlytold to the parser/validator as the first element + ofthe<code>DOCTYPE</code>declaration.</li> +</ul><h4><a name="Declaring2" id="Declaring2">Declaring elements</a>:</h4><p>The following declares an element <code>spec</code>:</p><p><code><!ELEMENT spec (front, body, back?)></code></p><p>It also expresses that the spec element contains one<code>front</code>,one +<code>body</code>and one optional<code>back</code>children elements inthis +order. The declaration of oneelement of the structure and its contentare done +in a single declaration.Similarly the following +declares<code>div1</code>elements:</p><p><code><!ELEMENT div1 (head, (p | list | note)*, div2?)></code></p><p>which means div1 contains one <code>head</code>then a series +ofoptional<code>p</code>, <code>list</code>s and <code>note</code>s and +thenanoptional <code>div2</code>. And last but not least an element +cancontaintext:</p><p><code><!ELEMENT b (#PCDATA)></code></p><p><code>b</code>contains text or being of mixed content (text and +elementsinno particular order):</p><p><code><!ELEMENT p (#PCDATA|a|ul|b|i|em)*></code></p><p><code>p </code>can contain text or +<code>a</code>,<code>ul</code>,<code>b</code>, <code>i </code>or +<code>em</code>elements inno particularorder.</p><h4><a name="Declaring1" id="Declaring1">Declaring attributes</a>:</h4><p>Again the attributes declaration includes their content definition:</p><p><code><!ATTLIST termdef name CDATA #IMPLIED></code></p><p>means that the element <code>termdef</code>can have +a<code>name</code>attribute containing text (<code>CDATA</code>) and which +isoptional(<code>#IMPLIED</code>). The attribute value can also be +definedwithin aset:</p><p><code><!ATTLIST list +type(bullets|ordered|glossary)"ordered"></code></p><p>means <code>list</code>element have a <code>type</code>attribute +with3allowed values "bullets", "ordered" or "glossary" and which +defaultto"ordered" if the attribute is not explicitly specified.</p><p>The content type of an attribute can be +text(<code>CDATA</code>),anchor/reference/references(<code>ID</code>/<code>IDREF</code>/<code>IDREFS</code>),entity(ies)(<code>ENTITY</code>/<code>ENTITIES</code>) +orname(s)(<code>NMTOKEN</code>/<code>NMTOKENS</code>). The following +definesthat a<code>chapter</code>element can have an +optional<code>id</code>attributeof type <code>ID</code>, usable for reference +fromattribute of typeIDREF:</p><p><code><!ATTLIST chapter id ID #IMPLIED></code></p><p>The last value of an attribute definition can +be<code>#REQUIRED</code>meaning that the attribute has to be +given,<code>#IMPLIED</code>meaning that it is optional, or the default +value(possibly prefixed by<code>#FIXED</code>if it is the only allowed).</p><p>Notes:</p><ul><li>Usually the attributes pertaining to a given element are declared + inasingle expression, but it is just a convention adopted by a lot + ofDTDwriters: <pre><!ATTLIST termdef id ID #REQUIRED name CDATA #IMPLIED></pre> - <p>The previous construct defines both <code>id</code> and - <code>name</code> attributes for the element <code>termdef</code>.</p> + <p>The previous construct defines + both<code>id</code>and<code>name</code>attributes for the + element<code>termdef</code>.</p> </li> -</ul><h3><a name="Some1" id="Some1">Some examples</a></h3><p>The directory <code>test/valid/dtds/</code> in the libxml2 distribution -contains some complex DTD examples. The example in the file -<code>test/valid/dia.xml</code> shows an XML file where the simple DTD is -directly included within the document.</p><h3><a name="validate1" id="validate1">How to validate</a></h3><p>The simplest way is to use the xmllint program included with libxml. The -<code>--valid</code> option turns-on validation of the files given as input. -For example the following validates a copy of the first revision of the XML -1.0 specification:</p><p><code>xmllint --valid --noout test/valid/REC-xml-19980210.xml</code></p><p>the -- noout is used to disable output of the resulting tree.</p><p>The <code>--dtdvalid dtd</code> allows validation of the document(s) -against a given DTD.</p><p>Libxml2 exports an API to handle DTDs and validation, check the <a href="http://xmlsoft.org/html/libxml-valid.html">associated -description</a>.</p><h3><a name="Other1" id="Other1">Other resources</a></h3><p>DTDs are as old as SGML. So there may be a number of examples on-line, I -will just list one for now, others pointers welcome:</p><ul><li><a href="http://www.xml101.com:8081/dtd/">XML-101 DTD</a></li> -</ul><p>I suggest looking at the examples found under test/valid/dtd and any of -the large number of books available on XML. The dia example in test/valid -should be both simple and complete enough to allow you to build your own.</p><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> +</ul><h3><a name="Some1" id="Some1">Some examples</a></h3><p>The directory <code>test/valid/dtds/</code>in the +libxml2distributioncontains some complex DTD examples. The example in +thefile<code>test/valid/dia.xml</code>shows an XML file where the simple +DTDisdirectly included within the document.</p><h3><a name="validate1" id="validate1">How to validate</a></h3><p>The simplest way is to use the xmllint program included with +libxml.The<code>--valid</code>option turns-on validation of the files given +asinput.For example the following validates a copy of the first revision of +theXML1.0 specification:</p><p><code>xmllint --valid --noout test/valid/REC-xml-19980210.xml</code></p><p>the -- noout is used to disable output of the resulting tree.</p><p>The <code>--dtdvalid dtd</code>allows validation of the +document(s)againsta given DTD.</p><p>Libxml2 exports an API to handle DTDs and validation, check the <a href="http://xmlsoft.org/html/libxml-valid.html">associateddescription</a>.</p><h3><a name="Other1" id="Other1">Other resources</a></h3><p>DTDs are as old as SGML. So there may be a number of examples +on-line,Iwill just list one for now, others pointers welcome:</p><ul><li><a href="http://www.xml101.com:8081/dtd/">XML-101 DTD</a></li> +</ul><p>I suggest looking at the examples found under test/valid/dtd and any +ofthelarge number of books available on XML. The dia example in +test/validshouldbe both simple and complete enough to allow you to build your +own.</p><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/doc/xmlio.html b/doc/xmlio.html index 60188df..ae71ba1 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -13,64 +13,64 @@ A:link, A:visited, A:active { text-decoration: underline } <li><a href="#Output">Output I/O handlers</a></li> <li><a href="#entities">The entities loader</a></li> <li><a href="#Example2">Example of customized I/O</a></li> -</ol><h3><a name="General1" id="General1">General overview</a></h3><p>The module <code><a href="http://xmlsoft.org/html/libxml-xmlio.html">xmlIO.h</a></code> provides -the interfaces to the libxml2 I/O system. This consists of 4 main parts:</p><ul><li>Entities loader, this is a routine which tries to fetch the entities - (files) based on their PUBLIC and SYSTEM identifiers. The default loader - don't look at the public identifier since libxml2 do not maintain a - catalog. You can redefine you own entity loader by using - <code>xmlGetExternalEntityLoader()</code> and - <code>xmlSetExternalEntityLoader()</code>. <a href="#entities">Check the - example</a>.</li> - <li>Input I/O buffers which are a commodity structure used by the parser(s) - input layer to handle fetching the informations to feed the parser. This - provides buffering and is also a placeholder where the encoding - converters to UTF8 are piggy-backed.</li> - <li>Output I/O buffers are similar to the Input ones and fulfill similar - task but when generating a serialization from a tree.</li> - <li>A mechanism to register sets of I/O callbacks and associate them with - specific naming schemes like the protocol part of the URIs. - <p>This affect the default I/O operations and allows to use specific I/O - handlers for certain names.</p> +</ol><h3><a name="General1" id="General1">General overview</a></h3><p>The module <code><a href="http://xmlsoft.org/html/libxml-xmlio.html">xmlIO.h</a></code>providestheinterfaces +to the libxml2 I/O system. This consists of 4 main parts:</p><ul><li>Entities loader, this is a routine which tries to fetch + theentities(files) based on their PUBLIC and SYSTEM identifiers. The + defaultloaderdon't look at the public identifier since libxml2 do not + maintainacatalog. You can redefine you own entity loader + byusing<code>xmlGetExternalEntityLoader()</code>and<code>xmlSetExternalEntityLoader()</code>.<a href="#entities">Check theexample</a>.</li> + <li>Input I/O buffers which are a commodity structure used by + theparser(s)input layer to handle fetching the informations to feed + theparser. Thisprovides buffering and is also a placeholder where + theencodingconverters to UTF8 are piggy-backed.</li> + <li>Output I/O buffers are similar to the Input ones and fulfillsimilartask + but when generating a serialization from a tree.</li> + <li>A mechanism to register sets of I/O callbacks and associate + themwithspecific naming schemes like the protocol part of the URIs. + <p>This affect the default I/O operations and allows to use + specificI/Ohandlers for certain names.</p> </li> -</ul><p>The general mechanism used when loading http://rpmfind.net/xml.html for -example in the HTML parser is the following:</p><ol><li>The default entity loader calls <code>xmlNewInputFromFile()</code> with - the parsing context and the URI string.</li> - <li>the URI string is checked against the existing registered handlers - using their match() callback function, if the HTTP module was compiled - in, it is registered and its match() function will succeeds</li> - <li>the open() function of the handler is called and if successful will - return an I/O Input buffer</li> - <li>the parser will the start reading from this buffer and progressively - fetch information from the resource, calling the read() function of the - handler until the resource is exhausted</li> - <li>if an encoding change is detected it will be installed on the input - buffer, providing buffering and efficient use of the conversion - routines</li> - <li>once the parser has finished, the close() function of the handler is - called once and the Input buffer and associated resources are - deallocated.</li> -</ol><p>The user defined callbacks are checked first to allow overriding of the -default libxml2 I/O routines.</p><h3><a name="basic" id="basic">The basic buffer type</a></h3><p>All the buffer manipulation handling is done using the -<code>xmlBuffer</code> type define in <code><a href="http://xmlsoft.org/html/libxml-tree.html">tree.h</a> </code>which is a -resizable memory buffer. The buffer allocation strategy can be selected to be -either best-fit or use an exponential doubling one (CPU vs. memory use -trade-off). The values are <code>XML_BUFFER_ALLOC_EXACT</code> and -<code>XML_BUFFER_ALLOC_DOUBLEIT</code>, and can be set individually or on a -system wide basis using <code>xmlBufferSetAllocationScheme()</code>. A number -of functions allows to manipulate buffers with names starting with the -<code>xmlBuffer...</code> prefix.</p><h3><a name="Input" id="Input">Input I/O handlers</a></h3><p>An Input I/O handler is a simple structure -<code>xmlParserInputBuffer</code> containing a context associated to the -resource (file descriptor, or pointer to a protocol handler), the read() and -close() callbacks to use and an xmlBuffer. And extra xmlBuffer and a charset -encoding handler are also present to support charset conversion when -needed.</p><h3><a name="Output" id="Output">Output I/O handlers</a></h3><p>An Output handler <code>xmlOutputBuffer</code> is completely similar to an -Input one except the callbacks are write() and close().</p><h3><a name="entities" id="entities">The entities loader</a></h3><p>The entity loader resolves requests for new entities and create inputs for -the parser. Creating an input from a filename or an URI string is done -through the xmlNewInputFromFile() routine. The default entity loader do not -handle the PUBLIC identifier associated with an entity (if any). So it just -calls xmlNewInputFromFile() with the SYSTEM identifier (which is mandatory in -XML).</p><p>If you want to hook up a catalog mechanism then you simply need to -override the default entity loader, here is an example:</p><pre>#include <libxml/xmlIO.h> +</ul><p>The general mechanism used when loading +http://rpmfind.net/xml.htmlforexample in the HTML parser is the following:</p><ol><li>The default entity loader + calls<code>xmlNewInputFromFile()</code>withthe parsing context and the + URIstring.</li> + <li>the URI string is checked against the existing registered + handlersusingtheir match() callback function, if the HTTP module was + compiledin, it isregistered and its match() function will succeeds</li> + <li>the open() function of the handler is called and if + successfulwillreturn an I/O Input buffer</li> + <li>the parser will the start reading from this buffer + andprogressivelyfetch information from the resource, calling the + read()function of thehandler until the resource is exhausted</li> + <li>if an encoding change is detected it will be installed on + theinputbuffer, providing buffering and efficient use of + theconversionroutines</li> + <li>once the parser has finished, the close() function of the + handleriscalled once and the Input buffer and associated + resourcesaredeallocated.</li> +</ol><p>The user defined callbacks are checked first to allow overriding +ofthedefault libxml2 I/O routines.</p><h3><a name="basic" id="basic">The basic buffer type</a></h3><p>All the buffer manipulation handling is done +usingthe<code>xmlBuffer</code>type define in <code><a href="http://xmlsoft.org/html/libxml-tree.html">tree.h</a></code>which +isaresizable memory buffer. The buffer allocation strategy can be selected +tobeeither best-fit or use an exponential doubling one (CPU vs. +memoryusetrade-off). The values +are<code>XML_BUFFER_ALLOC_EXACT</code>and<code>XML_BUFFER_ALLOC_DOUBLEIT</code>,and +can be set individually or on asystem wide basis +using<code>xmlBufferSetAllocationScheme()</code>. A numberof functions allows +tomanipulate buffers with names starting +withthe<code>xmlBuffer...</code>prefix.</p><h3><a name="Input" id="Input">Input I/O handlers</a></h3><p>An Input I/O handler is a +simplestructure<code>xmlParserInputBuffer</code>containing a context +associated totheresource (file descriptor, or pointer to a protocol handler), +the read()andclose() callbacks to use and an xmlBuffer. And extra xmlBuffer +and acharsetencoding handler are also present to support charset +conversionwhenneeded.</p><h3><a name="Output" id="Output">Output I/O handlers</a></h3><p>An Output handler <code>xmlOutputBuffer</code>is completely similar +toanInput one except the callbacks are write() and close().</p><h3><a name="entities" id="entities">The entities loader</a></h3><p>The entity loader resolves requests for new entities and create +inputsforthe parser. Creating an input from a filename or an URI string +isdonethrough the xmlNewInputFromFile() routine. The default entity loader +donothandle the PUBLIC identifier associated with an entity (if any). So +itjustcalls xmlNewInputFromFile() with the SYSTEM identifier (which +ismandatory inXML).</p><p>If you want to hook up a catalog mechanism then you simply need +tooverridethe default entity loader, here is an example:</p><pre>#include <libxml/xmlIO.h> xmlExternalEntityLoader defaultLoader = NULL; @@ -99,11 +99,10 @@ int main(..) { xmlSetExternalEntityLoader(xmlMyExternalEntityLoader); ... -}</pre><h3><a name="Example2" id="Example2">Example of customized I/O</a></h3><p>This example come from <a href="http://xmlsoft.org/messages/0708.html">a -real use case</a>, xmlDocDump() closes the FILE * passed by the application -and this was a problem. The <a href="http://xmlsoft.org/messages/0711.html">solution</a> was to redefine a -new output handler with the closing call deactivated:</p><ol><li>First define a new I/O output allocator where the output don't close - the file: +}</pre><h3><a name="Example2" id="Example2">Example of customized I/O</a></h3><p>This example come from <a href="http://xmlsoft.org/messages/0708.html">areal use case</a>,xmlDocDump() +closes the FILE * passed by the applicationand this was aproblem. The <a href="http://xmlsoft.org/messages/0711.html">solution</a>wasto redefine anew +output handler with the closing call deactivated:</p><ol><li>First define a new I/O output allocator where the output don't + closethefile: <pre>xmlOutputBufferPtr xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { xmlOutputBufferPtr ret; diff --git a/doc/xmlmem.html b/doc/xmlmem.html index 58c2987..40dc4cb 100644 --- a/doc/xmlmem.html +++ b/doc/xmlmem.html @@ -12,91 +12,91 @@ A:link, A:visited, A:active { text-decoration: underline } <li><a href="#cleanup">Cleaning up after parsing</a></li> <li><a href="#Debugging">Debugging routines</a></li> <li><a href="#General4">General memory requirements</a></li> -</ol><h3><a name="General3" id="General3">General overview</a></h3><p>The module <code><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlmemory.h</a></code> -provides the interfaces to the libxml2 memory system:</p><ul><li>libxml2 does not use the libc memory allocator directly but xmlFree(), - xmlMalloc() and xmlRealloc()</li> - <li>those routines can be reallocated to a specific set of routine, by - default the libc ones i.e. free(), malloc() and realloc()</li> +</ol><h3><a name="General3" id="General3">General overview</a></h3><p>The module <code><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlmemory.h</a></code>providesthe +interfaces to the libxml2 memory system:</p><ul><li>libxml2 does not use the libc memory allocator directly + butxmlFree(),xmlMalloc() and xmlRealloc()</li> + <li>those routines can be reallocated to a specific set of + routine,bydefault the libc ones i.e. free(), malloc() and realloc()</li> <li>the xmlmemory.c module includes a set of debugging routine</li> -</ul><h3><a name="setting" id="setting">Setting libxml2 set of memory routines</a></h3><p>It is sometimes useful to not use the default memory allocator, either for -debugging, analysis or to implement a specific behaviour on memory management -(like on embedded systems). Two function calls are available to do so:</p><ul><li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet - ()</a> which return the current set of functions in use by the parser</li> - <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a> - which allow to set up a new set of memory allocation functions</li> -</ul><p>Of course a call to xmlMemSetup() should probably be done before calling -any other libxml2 routines (unless you are sure your allocations routines are -compatibles).</p><h3><a name="cleanup" id="cleanup">Cleaning up after parsing</a></h3><p>Libxml2 is not stateless, there is a few set of memory structures needing -allocation before the parser is fully functional (some encoding structures -for example). This also mean that once parsing is finished there is a tiny -amount of memory (a few hundred bytes) which can be recollected if you don't -reuse the parser immediately:</p><ul><li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser - ()</a> is a centralized routine to free the parsing states. Note that it - won't deallocate any produced tree if any (use the xmlFreeDoc() and - related routines for this).</li> - <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser - ()</a> is the dual routine allowing to preallocate the parsing state - which can be useful for example to avoid initialization reentrancy - problems when using libxml2 in multithreaded applications</li> -</ul><p>Generally xmlCleanupParser() is safe, if needed the state will be rebuild -at the next invocation of parser routines, but be careful of the consequences -in multithreaded applications.</p><h3><a name="Debugging" id="Debugging">Debugging routines</a></h3><p>When configured using --with-mem-debug flag (off by default), libxml2 uses -a set of memory allocation debugging routines keeping track of all allocated -blocks and the location in the code where the routine was called. A couple of -other debugging routines allow to dump the memory allocated infos to a file -or call a specific routine when a given block number is allocated:</p><ul><li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMallocLoc()</a> - <a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlReallocLoc()</a> - and <a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemStrdupLoc()</a> - are the memory debugging replacement allocation routines</li> - <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump - ()</a> dumps all the informations about the allocated memory block lefts - in the <code>.memdump</code> file</li> -</ul><p>When developing libxml2 memory debug is enabled, the tests programs call -xmlMemoryDump () and the "make test" regression tests will check for any -memory leak during the full regression test sequence, this helps a lot -ensuring that libxml2 does not leak memory and bullet proof memory -allocations use (some libc implementations are known to be far too permissive -resulting in major portability problems!).</p><p>If the .memdump reports a leak, it displays the allocation function and -also tries to give some informations about the content and structure of the -allocated blocks left. This is sufficient in most cases to find the culprit, -but not always. Assuming the allocation problem is reproducible, it is -possible to find more easily:</p><ol><li>write down the block number xxxx not allocated</li> - <li>export the environment variable XML_MEM_BREAKPOINT=xxxx , the easiest - when using GDB is to simply give the command +</ul><h3><a name="setting" id="setting">Setting libxml2 set of memory routines</a></h3><p>It is sometimes useful to not use the default memory allocator, +eitherfordebugging, analysis or to implement a specific behaviour on +memorymanagement(like on embedded systems). Two function calls are available +to doso:</p><ul><li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet()</a>whichreturn + the current set of functions in use by the parser</li> + <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a>whichallow + to set up a new set of memory allocation functions</li> +</ul><p>Of course a call to xmlMemSetup() should probably be done beforecallingany +other libxml2 routines (unless you are sure your allocationsroutines +arecompatibles).</p><h3><a name="cleanup" id="cleanup">Cleaning up after parsing</a></h3><p>Libxml2 is not stateless, there is a few set of memory +structuresneedingallocation before the parser is fully functional (some +encodingstructuresfor example). This also mean that once parsing is finished +there isa tinyamount of memory (a few hundred bytes) which can be recollected +if youdon'treuse the parser immediately:</p><ul><li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser()</a>isa + centralized routine to free the parsing states. Note that + itwon'tdeallocate any produced tree if any (use the xmlFreeDoc() + andrelatedroutines for this).</li> + <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser()</a>isthe + dual routine allowing to preallocate the parsing statewhich can beuseful + for example to avoid initialization reentrancyproblems when usinglibxml2 + in multithreaded applications</li> +</ul><p>Generally xmlCleanupParser() is safe, if needed the state will berebuildat +the next invocation of parser routines, but be careful of theconsequencesin +multithreaded applications.</p><h3><a name="Debugging" id="Debugging">Debugging routines</a></h3><p>When configured using --with-mem-debug flag (off by default), libxml2usesa +set of memory allocation debugging routines keeping track of +allallocatedblocks and the location in the code where the routine was called. +Acouple ofother debugging routines allow to dump the memory allocated infos +toa fileor call a specific routine when a given block number is allocated:</p><ul><li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMallocLoc()</a><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlReallocLoc()</a>and<a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemStrdupLoc()</a>arethe + memory debugging replacement allocation routines</li> + <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump()</a>dumpsall + the informations about the allocated memory block leftsin + the<code>.memdump</code>file</li> +</ul><p>When developing libxml2 memory debug is enabled, the tests +programscallxmlMemoryDump () and the "make test" regression tests will check +foranymemory leak during the full regression test sequence, this helps +alotensuring that libxml2 does not leak memory and bullet +proofmemoryallocations use (some libc implementations are known to be far +toopermissiveresulting in major portability problems!).</p><p>If the .memdump reports a leak, it displays the allocation functionandalso +tries to give some informations about the content and structure +oftheallocated blocks left. This is sufficient in most cases to find +theculprit,but not always. Assuming the allocation problem is reproducible, +itispossible to find more easily:</p><ol><li>write down the block number xxxx not allocated</li> + <li>export the environment variable XML_MEM_BREAKPOINT=xxxx , + theeasiestwhen using GDB is to simply give the command <p><code>set environment XML_MEM_BREAKPOINT xxxx</code></p> <p>before running the program.</p> </li> - <li>run the program under a debugger and set a breakpoint on - xmlMallocBreakpoint() a specific function called when this precise block - is allocated</li> - <li>when the breakpoint is reached you can then do a fine analysis of the - allocation an step to see the condition resulting in the missing - deallocation.</li> -</ol><p>I used to use a commercial tool to debug libxml2 memory problems but after -noticing that it was not detecting memory leaks that simple mechanism was -used and proved extremely efficient until now. Lately I have also used <a href="http://developer.kde.org/~sewardj/">valgrind</a> with quite some -success, it is tied to the i386 architecture since it works by emulating the -processor and instruction set, it is slow but extremely efficient, i.e. it -spot memory usage errors in a very precise way.</p><h3><a name="General4" id="General4">General memory requirements</a></h3><p>How much libxml2 memory require ? It's hard to tell in average it depends -of a number of things:</p><ul><li>the parser itself should work in a fixed amount of memory, except for - information maintained about the stacks of names and entities locations. - The I/O and encoding handlers will probably account for a few KBytes. - This is true for both the XML and HTML parser (though the HTML parser - need more state).</li> - <li>If you are generating the DOM tree then memory requirements will grow - nearly linear with the size of the data. In general for a balanced - textual document the internal memory requirement is about 4 times the - size of the UTF8 serialization of this document (example the XML-1.0 - recommendation is a bit more of 150KBytes and takes 650KBytes of main - memory when parsed). Validation will add a amount of memory required for - maintaining the external Dtd state which should be linear with the - complexity of the content model defined by the Dtd</li> - <li>If you need to work with fixed memory requirements or don't need the - full DOM tree then using the <a href="xmlreader.html">xmlReader - interface</a> is probably the best way to proceed, it still allows to - validate or operate on subset of the tree if needed.</li> - <li>If you don't care about the advanced features of libxml2 like - validation, DOM, XPath or XPointer, don't use entities, need to work with - fixed memory requirements, and try to get the fastest parsing possible - then the SAX interface should be used, but it has known restrictions.</li> + <li>run the program under a debugger and set a + breakpointonxmlMallocBreakpoint() a specific function called when this + preciseblockis allocated</li> + <li>when the breakpoint is reached you can then do a fine analysis + oftheallocation an step to see the condition resulting in + themissingdeallocation.</li> +</ol><p>I used to use a commercial tool to debug libxml2 memory problems +butafternoticing that it was not detecting memory leaks that simple +mechanismwasused and proved extremely efficient until now. Lately I have also +used <a href="http://developer.kde.org/~sewardj/">valgrind</a>with quite +somesuccess,it is tied to the i386 architecture since it works by emulating +theprocessorand instruction set, it is slow but extremely efficient, i.e. +itspot memoryusage errors in a very precise way.</p><h3><a name="General4" id="General4">General memory requirements</a></h3><p>How much libxml2 memory require ? It's hard to tell in average itdependsof +a number of things:</p><ul><li>the parser itself should work in a fixed amount of memory, + exceptforinformation maintained about the stacks of names and + entitieslocations.The I/O and encoding handlers will probably account for + a fewKBytes.This is true for both the XML and HTML parser (though the + HTMLparserneed more state).</li> + <li>If you are generating the DOM tree then memory requirements + willgrownearly linear with the size of the data. In general for + abalancedtextual document the internal memory requirement is about 4 + timesthesize of the UTF8 serialization of this document (example + theXML-1.0recommendation is a bit more of 150KBytes and takes 650KBytes + ofmainmemory when parsed). Validation will add a amount of memory + requiredformaintaining the external Dtd state which should be linear + withthecomplexity of the content model defined by the Dtd</li> + <li>If you need to work with fixed memory requirements or don't needthefull + DOM tree then using the <a href="xmlreader.html">xmlReaderinterface</a>is + probably the best way toproceed, it still allows tovalidate or operate on + subset of the tree ifneeded.</li> + <li>If you don't care about the advanced features of libxml2likevalidation, + DOM, XPath or XPointer, don't use entities, need to workwithfixed memory + requirements, and try to get the fastest parsingpossiblethen the SAX + interface should be used, but it has knownrestrictions.</li> </ul><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> @@ -2083,7 +2083,8 @@ retry: xmlEncodingErr(XML_I18N_CONV_FAILED, "output conversion failed due to conv error, bytes %s\n", buf); - in->content[0] = ' '; + if (in->alloc != XML_BUFFER_ALLOC_IMMUTABLE) + in->content[0] = ' '; } break; } diff --git a/example/Makefile.in b/example/Makefile.in index 1ec7c35..53d4dcf 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -107,6 +107,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -234,15 +235,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -259,23 +254,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/include/Makefile.in b/include/Makefile.in index ba64744..d601942 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,6 +96,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -223,15 +224,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -248,23 +243,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/include/libxml/Makefile.in b/include/libxml/Makefile.in index 6a078a7..2f7bc9f 100644 --- a/include/libxml/Makefile.in +++ b/include/libxml/Makefile.in @@ -100,6 +100,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -227,15 +228,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -252,23 +247,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h index c83dc95..c5f2164 100644 --- a/include/libxml/xmlerror.h +++ b/include/libxml/xmlerror.h @@ -663,6 +663,7 @@ typedef enum { XML_SCHEMAV_CVC_TYPE_2, /* 1876 */ XML_SCHEMAV_CVC_IDC, /* 1877 */ XML_SCHEMAV_CVC_WILDCARD, /* 1878 */ + XML_SCHEMAV_MISC, /* 1879 */ XML_XPTR_UNKNOWN_SCHEME = 1900, XML_XPTR_CHILDSEQ_START, /* 1901 */ XML_XPTR_EVAL_FAILED, /* 1902 */ diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index ce0d938..cc75dc0 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlversion.h @@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.6.24" +#define LIBXML_DOTTED_VERSION "2.6.26" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20624 +#define LIBXML_VERSION 20626 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20624" +#define LIBXML_VERSION_STRING "20626" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-CVS2772" +#define LIBXML_VERSION_EXTRA "-CVS2798" /** * LIBXML_TEST_VERSION: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20624); +#define LIBXML_TEST_VERSION xmlCheckVersion(20626); #ifndef VMS #if 0 diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 76473a6..febbf78 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -35,6 +35,7 @@ extern "C" { #endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */ #ifdef LIBXML_XPATH_ENABLED + typedef struct _xmlXPathContext xmlXPathContext; typedef xmlXPathContext *xmlXPathContextPtr; typedef struct _xmlXPathParserContext xmlXPathParserContext; @@ -342,7 +343,9 @@ struct _xmlXPathContext { /* dictionnary */ xmlDictPtr dict; /* dictionnary if any */ - int flags; /* flags to control compilation */ + int flags; /* flags to control compilation */
+ /* Cache for reusal of XPath objects */ + void *cache; }; /* @@ -485,9 +488,13 @@ XMLPUBFUN xmlXPathObjectPtr XMLCALL */ XMLPUBFUN xmlXPathContextPtr XMLCALL xmlXPathNewContext (xmlDocPtr doc); -XMLPUBFUN void XMLCALL +XMLPUBFUN void XMLCALL xmlXPathFreeContext (xmlXPathContextPtr ctxt); - +XMLPUBFUN int XMLCALL + xmlXPathContextSetCache(xmlXPathContextPtr ctxt, + int active, + int value, + int options); /** * Evaluation functions. */ @@ -25,6 +25,13 @@ #include <libxml/xmlversion.h> #endif +#if defined(__Lynx__) +#include <stdio.h> /* pull definition of size_t */ +#include <varargs.h> +int snprintf(char *, size_t, const char *, ...); +int vfprintf(FILE *, const char *, va_list); +#endif + #ifndef WITH_TRIO #include <stdio.h> #else diff --git a/libxml.spec.in b/libxml.spec.in index bf5dd5f..2345f3a 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -27,6 +27,7 @@ Summary: Libraries, includes, etc. to develop XML and HTML applications Group: Development/Libraries Requires: libxml2 = %{version} Requires: zlib-devel +Requires: pkgconfig %description devel Libraries, include files, etc you can use to develop XML applications. @@ -130,53 +131,3 @@ rm -fr %{buildroot} * @RELDATE@ Daniel Veillard <veillard@redhat.com> - upstream release @VERSION@ see http://xmlsoft.org/news.html -* Thu Jan 2 2003 Daniel Veillard <veillard@redhat.com> -- integrated drv_libxml2 xml.sax driver from Stéphane Bidoul -- provides the new XmlTextReader interfaces based on C# XML APIs - -* Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com> -- revamped the spec file, cleaned up some rpm building problems - -* Fri Oct 4 2002 Jeremy Katz <katzj@redhat.com> -- build with 'make LIBTOOL=/usr/bin/libtool' to use system libtool - -* Wed Sep 4 2002 Daniel Veillard <veillard@redhat.com> - -- library paths fixed for x86-64 - -* Fri Feb 1 2002 Daniel Veillard <veillard@redhat.com> - -- Added the python package - -* Sun Nov 4 2001 Daniel Veillard <veillard@redhat.com> - -- cleaned up the specfile -- 2.4.7 broke SGML catalogs badly. this fixes it. - -* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu> - -[2.3.7] -- Added libxml.m4 to the distribution file list -- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0 -- Moved programmer documentation into the devel package - -* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com> - -- corrected the spec file alpha stuff -- switched to version 1.7.1 -- Added validation, XPath, nanohttp, removed memory leaks -- Renamed CHAR to xmlChar - -* Wed Jun 2 1999 Daniel Veillard <daniel@veillard.com> - -- Switched to version 1.1: SAX extensions, better entities support, lots of - bug fixes. - -* Sun Oct 4 1998 Daniel Veillard <daniel@veillard.com> - -- Added xml-config to the package - -* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com> - -- Built release 0.30 - diff --git a/libxml2.spec b/libxml2.spec index 1ee50d3..5604bb9 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,6 +1,6 @@ Summary: Library providing XML and HTML support Name: libxml2 -Version: 2.6.24 +Version: 2.6.26 Release: 1 License: MIT Group: Development/Libraries @@ -27,6 +27,7 @@ Summary: Libraries, includes, etc. to develop XML and HTML applications Group: Development/Libraries Requires: libxml2 = %{version} Requires: zlib-devel +Requires: pkgconfig %description devel Libraries, include files, etc you can use to develop XML applications. @@ -127,56 +128,6 @@ rm -fr %{buildroot} %doc doc/python.html %changelog -* Fri Apr 28 2006 Daniel Veillard <veillard@redhat.com> -- upstream release 2.6.24 see http://xmlsoft.org/news.html - -* Thu Jan 2 2003 Daniel Veillard <veillard@redhat.com> -- integrated drv_libxml2 xml.sax driver from Stéphane Bidoul -- provides the new XmlTextReader interfaces based on C# XML APIs - -* Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com> -- revamped the spec file, cleaned up some rpm building problems - -* Fri Oct 4 2002 Jeremy Katz <katzj@redhat.com> -- build with 'make LIBTOOL=/usr/bin/libtool' to use system libtool - -* Wed Sep 4 2002 Daniel Veillard <veillard@redhat.com> - -- library paths fixed for x86-64 - -* Fri Feb 1 2002 Daniel Veillard <veillard@redhat.com> - -- Added the python package - -* Sun Nov 4 2001 Daniel Veillard <veillard@redhat.com> - -- cleaned up the specfile -- 2.4.7 broke SGML catalogs badly. this fixes it. - -* Thu Apr 26 2001 Toshio Kuratomi <badger@prtr-13.ucsc.edu> - -[2.3.7] -- Added libxml.m4 to the distribution file list -- Moved the man pages from /usr/man to /usr/share/man to conform to FHS2.0 -- Moved programmer documentation into the devel package - -* Thu Sep 23 1999 Daniel Veillard <daniel@veillard.com> - -- corrected the spec file alpha stuff -- switched to version 1.7.1 -- Added validation, XPath, nanohttp, removed memory leaks -- Renamed CHAR to xmlChar - -* Wed Jun 2 1999 Daniel Veillard <daniel@veillard.com> - -- Switched to version 1.1: SAX extensions, better entities support, lots of - bug fixes. - -* Sun Oct 4 1998 Daniel Veillard <daniel@veillard.com> - -- Added xml-config to the package - -* Thu Sep 24 1998 Michael Fulbright <msf@redhat.com> - -- Built release 0.30 +* Tue Jun 6 2006 Daniel Veillard <veillard@redhat.com> +- upstream release 2.6.26 see http://xmlsoft.org/news.html @@ -20,7 +20,7 @@ * and indicating we are on / (the document node), probably need * something similar for . * - get rid of the "compile" starting with lowercase - * - get rid of the Strdup/Strndup in case of dictionary + * - DONE (2006-05-16): get rid of the Strdup/Strndup in case of dictionary */ #define IN_LIBXML @@ -76,6 +76,13 @@ #define XML_STREAM_XS_IDC_FIELD(c) ((c)->flags & XML_PATTERN_XSFIELD) +#define XML_PAT_COPY_NSNAME(c, r, nsname) \ + if ((c)->comp->dict) \ + r = (xmlChar *) xmlDictLookup((c)->comp->dict, BAD_CAST nsname, -1); \ + else r = xmlStrdup(BAD_CAST nsname); + +#define XML_PAT_FREE_STRING(c, r) if ((c)->comp->dict == NULL) xmlFree(r); + typedef struct _xmlStreamStep xmlStreamStep; typedef xmlStreamStep *xmlStreamStepPtr; struct _xmlStreamStep { @@ -145,7 +152,7 @@ typedef xmlStepOp *xmlStepOpPtr; struct _xmlStepOp { xmlPatOp op; const xmlChar *value; - const xmlChar *value2; + const xmlChar *value2; /* The namespace name */ }; #define PAT_FROM_ROOT (1<<8) @@ -316,7 +323,7 @@ xmlNewPatParserContext(const xmlChar *pattern, xmlDictPtr dict, static void xmlFreePatParserContext(xmlPatParserContextPtr ctxt) { if (ctxt == NULL) - return; + return; memset(ctxt, -1, sizeof(xmlPatParserContext)); xmlFree(ctxt); } @@ -758,7 +765,10 @@ xmlPatScanLiteral(xmlPatParserContextPtr ctxt) { ctxt->error = 1; return(NULL); } else { - ret = xmlStrndup(q, cur - q); + if (ctxt->dict) + ret = (xmlChar *) xmlDictLookup(ctxt->dict, q, cur - q); + else + ret = xmlStrndup(q, cur - q); } cur += len; CUR_PTR = cur; @@ -774,7 +784,10 @@ xmlPatScanLiteral(xmlPatParserContextPtr ctxt) { ctxt->error = 1; return(NULL); } else { - ret = xmlStrndup(q, cur - q); + if (ctxt->dict) + ret = (xmlChar *) xmlDictLookup(ctxt->dict, q, cur - q); + else + ret = xmlStrndup(q, cur - q); } cur += len; CUR_PTR = cur; @@ -822,7 +835,10 @@ xmlPatScanName(xmlPatParserContextPtr ctxt) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - ret = xmlStrndup(q, cur - q); + if (ctxt->dict) + ret = (xmlChar *) xmlDictLookup(ctxt->dict, q, cur - q); + else + ret = xmlStrndup(q, cur - q); CUR_PTR = cur; return(ret); } @@ -857,7 +873,10 @@ xmlPatScanNCName(xmlPatParserContextPtr ctxt) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - ret = xmlStrndup(q, cur - q); + if (ctxt->dict) + ret = (xmlChar *) xmlDictLookup(ctxt->dict, q, cur - q); + else + ret = xmlStrndup(q, cur - q); CUR_PTR = cur; return(ret); } @@ -921,7 +940,7 @@ xmlCompileAttributeTest(xmlPatParserContextPtr ctxt) { if (IS_BLANK_CH(CUR)) { ERROR5(NULL, NULL, NULL, "Invalid QName.\n", NULL); - xmlFree(prefix); + XML_PAT_FREE_STRING(ctxt, prefix); ctxt->error = 1; goto error; } @@ -932,12 +951,13 @@ xmlCompileAttributeTest(xmlPatParserContextPtr ctxt) { if ((prefix[0] == 'x') && (prefix[1] == 'm') && (prefix[2] == 'l') && - (prefix[3] == 0)) { - URL = xmlStrdup(XML_XML_NAMESPACE); + (prefix[3] == 0)) + { + XML_PAT_COPY_NSNAME(ctxt, URL, XML_XML_NAMESPACE); } else { for (i = 0;i < ctxt->nb_namespaces;i++) { if (xmlStrEqual(ctxt->namespaces[2 * i + 1], prefix)) { - URL = xmlStrdup(ctxt->namespaces[2 * i]); + XML_PAT_COPY_NSNAME(ctxt, URL, ctxt->namespaces[2 * i]) break; } } @@ -949,7 +969,7 @@ xmlCompileAttributeTest(xmlPatParserContextPtr ctxt) { goto error; } } - xmlFree(prefix); + XML_PAT_FREE_STRING(ctxt, prefix); if (token == NULL) { if (CUR == '*') { NEXT; @@ -969,12 +989,11 @@ xmlCompileAttributeTest(xmlPatParserContextPtr ctxt) { return; error: if (URL != NULL) - xmlFree(URL); + XML_PAT_FREE_STRING(ctxt, URL) if (token != NULL) - xmlFree(token); + XML_PAT_FREE_STRING(ctxt, token); } - /** * xmlCompileStepPattern: * @ctxt: the compilation context @@ -1053,12 +1072,13 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { if ((prefix[0] == 'x') && (prefix[1] == 'm') && (prefix[2] == 'l') && - (prefix[3] == 0)) { - URL = xmlStrdup(XML_XML_NAMESPACE); + (prefix[3] == 0)) + { + XML_PAT_COPY_NSNAME(ctxt, URL, XML_XML_NAMESPACE) } else { for (i = 0;i < ctxt->nb_namespaces;i++) { if (xmlStrEqual(ctxt->namespaces[2 * i + 1], prefix)) { - URL = xmlStrdup(ctxt->namespaces[2 * i]); + XML_PAT_COPY_NSNAME(ctxt, URL, ctxt->namespaces[2 * i]) break; } } @@ -1070,7 +1090,7 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { goto error; } } - xmlFree(prefix); + XML_PAT_FREE_STRING(ctxt, prefix); if (token == NULL) { if (CUR == '*') { NEXT; @@ -1086,8 +1106,8 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { } } else { NEXT; - if (xmlStrEqual(name, (const xmlChar *) "child")) { - xmlFree(name); + if (xmlStrEqual(name, (const xmlChar *) "child")) { + XML_PAT_FREE_STRING(ctxt, name); name = xmlPatScanName(ctxt); if (name == NULL) { if (CUR == '*') { @@ -1118,12 +1138,13 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { if ((prefix[0] == 'x') && (prefix[1] == 'm') && (prefix[2] == 'l') && - (prefix[3] == 0)) { - URL = xmlStrdup(XML_XML_NAMESPACE); + (prefix[3] == 0)) + { + XML_PAT_COPY_NSNAME(ctxt, URL, XML_XML_NAMESPACE) } else { for (i = 0;i < ctxt->nb_namespaces;i++) { if (xmlStrEqual(ctxt->namespaces[2 * i + 1], prefix)) { - URL = xmlStrdup(ctxt->namespaces[2 * i]); + XML_PAT_COPY_NSNAME(ctxt, URL, ctxt->namespaces[2 * i]) break; } } @@ -1135,7 +1156,7 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { goto error; } } - xmlFree(prefix); + XML_PAT_FREE_STRING(ctxt, prefix); if (token == NULL) { if (CUR == '*') { NEXT; @@ -1153,7 +1174,7 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { PUSH(XML_OP_CHILD, name, NULL); return; } else if (xmlStrEqual(name, (const xmlChar *) "attribute")) { - xmlFree(name); + XML_PAT_FREE_STRING(ctxt, name) name = NULL; if (XML_STREAM_XS_IDC_SEL(ctxt->comp)) { ERROR5(NULL, NULL, NULL, @@ -1170,8 +1191,7 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { "The 'element' or 'attribute' axis is expected.\n", NULL); ctxt->error = 1; goto error; - } - /* NOT REACHED xmlFree(name); */ + } } } else if (CUR == '*') { if (name != NULL) { @@ -1186,11 +1206,11 @@ xmlCompileStepPattern(xmlPatParserContextPtr ctxt) { return; error: if (URL != NULL) - xmlFree(URL); + XML_PAT_FREE_STRING(ctxt, URL) if (token != NULL) - xmlFree(token); + XML_PAT_FREE_STRING(ctxt, token) if (name != NULL) - xmlFree(name); + XML_PAT_FREE_STRING(ctxt, name) } /** @@ -1831,8 +1851,9 @@ static int xmlStreamPushInternal(xmlStreamCtxtPtr stream, const xmlChar *name, const xmlChar *ns, int nodeType) { - int ret = 0, err = 0, final = 0, tmp, i, m, match, step, desc; + int ret = 0, err = 0, final = 0, tmp, i, m, match, stepNr, desc; xmlStreamCompPtr comp; + xmlStreamStep step; #ifdef DEBUG_STREAMING xmlStreamCtxtPtr orig = stream; #endif @@ -1931,7 +1952,7 @@ xmlStreamPushInternal(xmlStreamCtxtPtr stream, * If there is no "//", then only the last * added state is of interest. */ - step = stream->states[2 * (stream->nbState -1)]; + stepNr = stream->states[2 * (stream->nbState -1)]; /* * TODO: Security check, should not happen, remove it. */ @@ -1948,10 +1969,10 @@ xmlStreamPushInternal(xmlStreamCtxtPtr stream, * occuring in the states, plus any other state for this * level. */ - step = stream->states[2 * i]; + stepNr = stream->states[2 * i]; /* TODO: should not happen anymore: dead states */ - if (step < 0) + if (stepNr < 0) goto next_state; tmp = stream->states[(2 * i) + 1]; @@ -1961,71 +1982,82 @@ xmlStreamPushInternal(xmlStreamCtxtPtr stream, goto next_state; /* skip states at ancestor levels, except if "//" */ - desc = comp->steps[step].flags & XML_STREAM_STEP_DESC; + desc = comp->steps[stepNr].flags & XML_STREAM_STEP_DESC; if ((tmp < stream->level) && (!desc)) goto next_state; } /* * Check for correct node-type. */ - if (comp->steps[step].nodeType != nodeType) { - if (comp->steps[step].nodeType == XML_ATTRIBUTE_NODE) { + step = comp->steps[stepNr]; + if (step.nodeType != nodeType) { + if (step.nodeType == XML_ATTRIBUTE_NODE) { /* * Block this expression for deeper evaluation. */ if ((comp->flags & XML_STREAM_DESC) == 0) stream->blockLevel = stream->level +1; goto next_state; - } else if (comp->steps[step].nodeType != XML_STREAM_ANY_NODE) + } else if (step.nodeType != XML_STREAM_ANY_NODE) goto next_state; } /* * Compare local/namespace-name. */ match = 0; - if (comp->steps[step].nodeType == XML_STREAM_ANY_NODE) { + if (step.nodeType == XML_STREAM_ANY_NODE) { match = 1; + } else if (step.name == NULL) { + if (step.ns == NULL) { + /* + * This lets through all elements/attributes. + */ + match = 1; + } else if (ns != NULL) + match = xmlStrEqual(step.ns, ns); + } else if (((step.ns != NULL) == (ns != NULL)) && + (name != NULL) && + (step.name[0] == name[0]) && + xmlStrEqual(step.name, name) && + ((step.ns == ns) || xmlStrEqual(step.ns, ns))) + { + match = 1; + } +#if 0 +/* +* TODO: Pointer comparison won't work, since not guaranteed that the given +* values are in the same dict; especially if it's the namespace name, +* normally coming from ns->href. We need a namespace dict mechanism ! +*/ } else if (comp->dict) { - if (comp->steps[step].name == NULL) { - if (comp->steps[step].ns == NULL) + if (step.name == NULL) { + if (step.ns == NULL) match = 1; else - match = (comp->steps[step].ns == ns); + match = (step.ns == ns); } else { - match = ((comp->steps[step].name == name) && - (comp->steps[step].ns == ns)); + match = ((step.name == name) && (step.ns == ns)); } - } else { - if (comp->steps[step].name == NULL) { - if (comp->steps[step].ns == NULL) - match = 1; - else - match = xmlStrEqual(comp->steps[step].ns, ns); - } else { - match = ((xmlStrEqual(comp->steps[step].name, name)) && - (xmlStrEqual(comp->steps[step].ns, ns))); - } - } +#endif /* if 0 ------------------------------------------------------- */ if (match) { - final = comp->steps[step].flags & XML_STREAM_STEP_FINAL; + final = step.flags & XML_STREAM_STEP_FINAL; if (desc) { if (final) { ret = 1; } else { /* descending match create a new state */ - xmlStreamCtxtAddState(stream, step + 1, + xmlStreamCtxtAddState(stream, stepNr + 1, stream->level + 1); } } else { if (final) { ret = 1; } else { - xmlStreamCtxtAddState(stream, step + 1, + xmlStreamCtxtAddState(stream, stepNr + 1, stream->level + 1); } } - if ((ret != 1) && - (comp->steps[step].flags & XML_STREAM_STEP_IN_SET)) { + if ((ret != 1) && (step.flags & XML_STREAM_STEP_IN_SET)) { /* * Check if we have a special case like "foo/bar//.", where * "foo" is selected as well. @@ -2053,10 +2085,11 @@ next_state: * Don't reenter if it's an absolute expression like "/foo", * except "//foo". */ - if (comp->steps[0].flags & XML_STREAM_STEP_ROOT) + step = comp->steps[0]; + if (step.flags & XML_STREAM_STEP_ROOT) goto stream_next; - desc = comp->steps[0].flags & XML_STREAM_STEP_DESC; + desc = step.flags & XML_STREAM_STEP_DESC; if (stream->flags & XML_PATTERN_NOTPATTERN) { /* * Re/enter the expression if it is a "descendant" one, @@ -2094,43 +2127,41 @@ compare: /* * Check expected node-type. */ - if (comp->steps[0].nodeType != nodeType) { + if (step.nodeType != nodeType) { if (nodeType == XML_ATTRIBUTE_NODE) goto stream_next; - else if (comp->steps[0].nodeType != XML_STREAM_ANY_NODE) + else if (step.nodeType != XML_STREAM_ANY_NODE) goto stream_next; } /* * Compare local/namespace-name. */ match = 0; - if (comp->steps[0].nodeType == XML_STREAM_ANY_NODE) { + if (step.nodeType == XML_STREAM_ANY_NODE) { match = 1; - } else if (comp->steps[0].name == NULL) { - if (comp->steps[0].ns == NULL) + } else if (step.name == NULL) { + if (step.ns == NULL) { + /* + * This lets through all elements/attributes. + */ match = 1; - else { - if (comp->dict) - match = (comp->steps[0].ns == ns); - else - match = xmlStrEqual(comp->steps[0].ns, ns); - } - } else { - if (comp->dict) - match = ((comp->steps[0].name == name) && - (comp->steps[0].ns == ns)); - else - match = ((xmlStrEqual(comp->steps[0].name, name)) && - (xmlStrEqual(comp->steps[0].ns, ns))); - } - final = comp->steps[0].flags & XML_STREAM_STEP_FINAL; + } else if (ns != NULL) + match = xmlStrEqual(step.ns, ns); + } else if (((step.ns != NULL) == (ns != NULL)) && + (name != NULL) && + (step.name[0] == name[0]) && + xmlStrEqual(step.name, name) && + ((step.ns == ns) || xmlStrEqual(step.ns, ns))) + { + match = 1; + } + final = step.flags & XML_STREAM_STEP_FINAL; if (match) { if (final) ret = 1; else xmlStreamCtxtAddState(stream, 1, stream->level); - if ((ret != 1) && - (comp->steps[0].flags & XML_STREAM_STEP_IN_SET)) { + if ((ret != 1) && (step.flags & XML_STREAM_STEP_IN_SET)) { /* * Check if we have a special case like "foo//.", where * "foo" is selected as well. @@ -2340,9 +2371,16 @@ xmlPatterncompile(const xmlChar *pattern, xmlDict *dict, int flags, } or++; } - if (ctxt == NULL) goto error; + if (ctxt == NULL) goto error; cur = xmlNewPattern(); if (cur == NULL) goto error; + /* + * Assign string dict. + */ + if (dict) { + cur->dict = dict; + xmlDictReference(dict); + } if (ret == NULL) ret = cur; else { diff --git a/python/Makefile.in b/python/Makefile.in index eb6f7e2..d7866ee 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -125,6 +125,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -252,15 +253,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -277,23 +272,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ diff --git a/python/libxml2-py.c b/python/libxml2-py.c index 19617ce..e0559a0 100644 --- a/python/libxml2-py.c +++ b/python/libxml2-py.c @@ -10103,6 +10103,27 @@ libxml_htmlReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { } #endif /* defined(LIBXML_HTML_ENABLED) */ +#if defined(LIBXML_XPATH_ENABLED) +PyObject * +libxml_xmlXPathContextSetCache(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + int c_retval; + xmlXPathContextPtr ctxt; + PyObject *pyobj_ctxt; + int active; + int value; + int options; + + if (!PyArg_ParseTuple(args, (char *)"Oiii:xmlXPathContextSetCache", &pyobj_ctxt, &active, &value, &options)) + return(NULL); + ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt); + + c_retval = xmlXPathContextSetCache(ctxt, active, value, options); + py_retval = libxml_intWrap((int) c_retval); + return(py_retval); +} + +#endif /* defined(LIBXML_XPATH_ENABLED) */ #if defined(LIBXML_UNICODE_ENABLED) PyObject * libxml_xmlUCSIsDingbats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { diff --git a/python/setup.py b/python/setup.py index 2b715c9..99def88 100755 --- a/python/setup.py +++ b/python/setup.py @@ -226,7 +226,7 @@ else: setup (name = "libxml2-python", # On *nix, the version number is created from setup.py.in # On windows, it is set by configure.js - version = "2.6.24", + version = "2.6.26", description = descr, author = "Daniel Veillard", author_email = "veillard@redhat.com", diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in index e7d6c13..6bafab4 100644 --- a/python/tests/Makefile.in +++ b/python/tests/Makefile.in @@ -87,6 +87,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -214,15 +215,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -239,23 +234,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -7394,7 +7394,7 @@ xmlRelaxNGParse(xmlRelaxNGParserCtxtPtr ctxt) if (root == NULL) { xmlRngPErr(ctxt, (xmlNodePtr) doc, XML_RNGP_EMPTY, "xmlRelaxNGParse: %s is empty\n", - (ctxt->URL ? ctxt->URL : "schemas"), NULL); + (ctxt->URL ? ctxt->URL : BAD_CAST "schemas"), NULL); xmlFreeDoc(ctxt->document); ctxt->document = NULL; @@ -225,6 +225,16 @@ initializeLibxml2(void) { xmlInitParser(); xmlSetExternalEntityLoader(testExternalEntityLoader); ctxtXPath = xmlXPathNewContext(NULL); + /* + * Deactivate the cache if created; otherwise we have to create/free it + * for every test, since it will confuse the memory leak detection. + * Note that normally this need not be done, since the cache is not + * created until set explicitely with xmlXPathContextSetCache(); + * but for test purposes it is sometimes usefull to activate the + * cache by default for the whole library. + */ + if (ctxtXPath->cache != NULL) + xmlXPathContextSetCache(ctxtXPath, 0, -1, 0); /* used as default nanemspace in xstc tests */ xmlXPathRegisterNs(ctxtXPath, BAD_CAST "ts", BAD_CAST "TestSuite"); xmlXPathRegisterNs(ctxtXPath, BAD_CAST "xlink", @@ -1158,7 +1168,6 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { printf("Total %d tests, %d errors, %d leaks\n", nb_tests, nb_errors, nb_leaks); } - xmlXPathFreeContext(ctxtXPath); xmlCleanupParser(); xmlMemoryDump(); @@ -45559,6 +45559,61 @@ test_xmlXPathCompiledEval(void) { static int +test_xmlXPathContextSetCache(void) { + int test_ret = 0; + +#if defined(LIBXML_XPATH_ENABLED) + int mem_base; + int ret_val; + xmlXPathContextPtr ctxt; /* the XPath context */ + int n_ctxt; + int active; /* enables/disables (creates/frees) the cache */ + int n_active; + int value; /* a value with semantics dependant on @options */ + int n_value; + int options; /* options (currently only the value 0 is used) */ + int n_options; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlXPathContextPtr;n_ctxt++) { + for (n_active = 0;n_active < gen_nb_int;n_active++) { + for (n_value = 0;n_value < gen_nb_int;n_value++) { + for (n_options = 0;n_options < gen_nb_int;n_options++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlXPathContextPtr(n_ctxt, 0); + active = gen_int(n_active, 1); + value = gen_int(n_value, 2); + options = gen_int(n_options, 3); + + ret_val = xmlXPathContextSetCache(ctxt, active, value, options); + desret_int(ret_val); + call_tests++; + des_xmlXPathContextPtr(n_ctxt, ctxt, 0); + des_int(n_active, active, 1); + des_int(n_value, value, 2); + des_int(n_options, options, 3); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlXPathContextSetCache", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_active); + printf(" %d", n_value); + printf(" %d", n_options); + printf("\n"); + } + } + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + +static int test_xmlXPathConvertBoolean(void) { int test_ret = 0; @@ -46004,7 +46059,7 @@ static int test_xpath(void) { int test_ret = 0; - if (quiet == 0) printf("Testing xpath : 28 of 36 functions ...\n"); + if (quiet == 0) printf("Testing xpath : 29 of 37 functions ...\n"); test_ret += test_xmlXPathCastBooleanToNumber(); test_ret += test_xmlXPathCastBooleanToString(); test_ret += test_xmlXPathCastNodeSetToBoolean(); @@ -46022,6 +46077,7 @@ test_xpath(void) { test_ret += test_xmlXPathCmpNodes(); test_ret += test_xmlXPathCompile(); test_ret += test_xmlXPathCompiledEval(); + test_ret += test_xmlXPathContextSetCache(); test_ret += test_xmlXPathConvertBoolean(); test_ret += test_xmlXPathConvertNumber(); test_ret += test_xmlXPathConvertString(); @@ -6347,13 +6347,6 @@ xmlSetProp(xmlNodePtr node, const xmlChar *name, const xmlChar *value) { xmlFree(prefix); if (ns != NULL) return(xmlSetNsProp(node, ns, nqname, value)); - /* - * If we get a QName and the prefix has no namespace- - * binding in scope, then this is an error. - * TODO: Previously this falled-back to non-ns handling. - * Should we revert this? - */ - return(NULL); } return(xmlSetNsProp(node, NULL, name, value)); } @@ -1,6 +1,6 @@ /************************************************************************* * - * $Id: triodef.h,v 1.7 2003/04/25 23:12:21 veillard Exp $ + * $Id: triodef.h,v 1.8 2006/05/31 13:35:28 veillard Exp $ * * Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net> * @@ -56,6 +56,8 @@ # define TRIO_PLATFORM_UNIX #elif defined(__NetBSD__) # define TRIO_PLATFORM_UNIX +#elif defined(__Lynx__) +# define TRIO_PLATFORM_UNIX #elif defined(__QNX__) # define TRIO_PLATFORM_UNIX # define TRIO_PLATFORM_QNX @@ -611,7 +611,7 @@ xmlXIncludeAddNode(xmlXIncludeCtxtPtr ctxt, xmlNodePtr cur) { /* * Check the URL against the stack for recursions */ - if (!local) { + if ((!local) && (xml == 1)) { for (i = 0;i < ctxt->urlNr;i++) { if (xmlStrEqual(URL, ctxt->urlTab[i])) { xmlXIncludeErr(ctxt, cur, XML_XINCLUDE_RECURSION, @@ -589,8 +589,11 @@ xmlCleanupOutputCallbacks(void) int xmlCheckFilename (const char *path) { +#ifdef HAVE_STAT + struct stat stat_buffer; +#endif if (path == NULL) - return(0); + return(0); #if defined(WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) { @@ -616,8 +619,6 @@ xmlCheckFilename (const char *path) } #else #ifdef HAVE_STAT - struct stat stat_buffer; - if (stat(path, &stat_buffer) == -1) return 0; diff --git a/xmlschemas.c b/xmlschemas.c index 453a31c..ff89e2c 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -12551,9 +12551,21 @@ xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt, */ for (i = 0; i < substGroup->members->nbItems; i++) { member = (xmlSchemaElementPtr) substGroup->members->items[i]; - tmp = xmlAutomataNewOnceTrans2(pctxt->am, start, NULL, - member->name, member->targetNamespace, - 1, 1, member); + /* + * NOTE: This fixes bug #341150. xmlAutomataNewOnceTrans2() + * was incorrectly used instead of xmlAutomataNewTransition2() + * (seems like a copy&paste bug from the XML_SCHEMA_TYPE_ALL + * section in xmlSchemaBuildAContentModel() ). + * TODO: Check if xmlAutomataNewOnceTrans2() was instead + * intended for the above "counter" section originally. I.e., + * check xs:all with subst-groups. + * + * tmp = xmlAutomataNewOnceTrans2(pctxt->am, start, NULL, + * member->name, member->targetNamespace, + * 1, 1, member); + */ + tmp = xmlAutomataNewTransition2(pctxt->am, start, NULL, + member->name, member->targetNamespace, member); xmlAutomataNewEpsilon(pctxt->am, tmp, end); } } else { @@ -21353,12 +21365,17 @@ xmlSchemaAssembleByLocation(xmlSchemaValidCtxtPtr vctxt, location, NULL, NULL, 0, node, NULL, nsName, &bucket); if (ret != 0) + return(ret); + if (bucket == NULL) { + /* + * Generate a warning that the document could not be located. + */ + xmlSchemaCustomWarning(ACTXT_CAST vctxt, XML_SCHEMAV_MISC, + node, NULL, + "The document at location '%s' could not be acquired", + location, NULL, NULL); return(ret); - if (bucket == NULL) { - PERROR_INT("xmlSchemaAssembleByLocation", - "no schema bucket acquired"); - return(-1); - } + } /* * The first located schema will be handled as if all other * schemas imported by XSI were imported by this first schema. @@ -21473,6 +21490,9 @@ xmlSchemaAssembleByXSI(xmlSchemaValidCtxtPtr vctxt) return (0); cur = iattr->value; do { + /* + * TODO: Move the string parsing mechanism away from here. + */ if (iattr->metaType == XML_SCHEMA_ATTR_INFO_META_XSI_SCHEMA_LOC) { /* * Get the namespace name. @@ -21484,7 +21504,7 @@ xmlSchemaAssembleByXSI(xmlSchemaValidCtxtPtr vctxt) end++; if (end == cur) break; - count++; + count++; /* TODO: Don't use the schema's dict. */ nsname = xmlDictLookup(vctxt->schema->dict, cur, end - cur); cur = end; } @@ -21496,9 +21516,22 @@ xmlSchemaAssembleByXSI(xmlSchemaValidCtxtPtr vctxt) end = cur; while ((*end != 0) && (!(IS_BLANK_CH(*end)))) end++; - if (end == cur) + if (end == cur) { + if (iattr->metaType == + XML_SCHEMA_ATTR_INFO_META_XSI_SCHEMA_LOC) + { + /* + * If using @schemaLocation then tuples are expected. + * I.e. the namespace name *and* the document's URI. + */ + xmlSchemaCustomWarning(ACTXT_CAST vctxt, XML_SCHEMAV_MISC, + iattr->node, NULL, + "The value must consist of tuples: the target namespace " + "name and the document's URI", NULL, NULL, NULL); + } break; - count++; + } + count++; /* TODO: Don't use the schema's dict. */ location = xmlDictLookup(vctxt->schema->dict, cur, end - cur); cur = end; ret = xmlSchemaAssembleByLocation(vctxt, vctxt->schema, @@ -24811,9 +24844,10 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) xmlSchemaItemListPtr attrUseList; xmlSchemaAttributeUsePtr attrUse = NULL; xmlSchemaAttributePtr attrDecl = NULL; - xmlSchemaAttrInfoPtr iattr, tmpiattr; + xmlSchemaAttrInfoPtr iattr, tmpiattr; int i, j, found, nbAttrs, nbUses; int xpathRes = 0, res, wildIDs = 0, fixed; + xmlNodePtr defAttrOwnerElem = NULL; /* * SPEC (cvc-attribute) @@ -25056,6 +25090,15 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) return (0); /* + * Get the owner element; needed for creation of default attributes. + * This fixes bug #341337, reported by David Grohmann. + */ + if (vctxt->options & XML_SCHEMA_VAL_VC_I_CREATE) { + xmlSchemaNodeInfoPtr ielem = vctxt->elemInfos[vctxt->depth]; + if (ielem && ielem->node && ielem->node->doc) + defAttrOwnerElem = ielem->node; + } + /* * Validate values, create default attributes, evaluate IDCs. */ for (i = 0; i < vctxt->nbAttrInfos; i++) { @@ -25096,8 +25139,10 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) if (iattr->state == XML_SCHEMAS_ATTR_DEFAULT) { /* * Default/fixed attributes. + * We need the value only if we need to resolve IDCs or + * will create default attributes. */ - if (xpathRes) { + if ((xpathRes) || (defAttrOwnerElem)) { if (iattr->use->defValue != NULL) { iattr->value = (xmlChar *) iattr->use->defValue; iattr->val = iattr->use->defVal; @@ -25127,8 +25172,8 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) * VAL TODO: Should we use the *normalized* value? This currently * uses the *initial* value. */ - if ((vctxt->options & XML_SCHEMA_VAL_VC_I_CREATE) && - (iattr->node != NULL) && (iattr->node->doc != NULL)) { + + if (defAttrOwnerElem) { xmlChar *normValue; const xmlChar *value; @@ -25142,7 +25187,7 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) value = BAD_CAST normValue; if (iattr->nsName == NULL) { - if (xmlNewProp(iattr->node->parent, + if (xmlNewProp(defAttrOwnerElem, iattr->localName, value) == NULL) { VERROR_INT("xmlSchemaVAttributesComplex", "callling xmlNewProp()"); @@ -25153,8 +25198,8 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) } else { xmlNsPtr ns; - ns = xmlSearchNsByHref(iattr->node->doc, - iattr->node->parent, iattr->nsName); + ns = xmlSearchNsByHref(defAttrOwnerElem->doc, + defAttrOwnerElem, iattr->nsName); if (ns == NULL) { xmlChar prefix[12]; int counter = 0; @@ -25165,8 +25210,8 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) */ do { snprintf((char *) prefix, 12, "p%d", counter++); - ns = xmlSearchNs(iattr->node->doc, - iattr->node->parent, BAD_CAST prefix); + ns = xmlSearchNs(defAttrOwnerElem->doc, + defAttrOwnerElem, BAD_CAST prefix); if (counter > 1000) { VERROR_INT( "xmlSchemaVAttributesComplex", @@ -25186,8 +25231,7 @@ xmlSchemaVAttributesComplex(xmlSchemaValidCtxtPtr vctxt) * If we have QNames: do we need to ensure there's a * prefix defined for the QName? */ - xmlNewNsProp(iattr->node->parent, ns, - iattr->localName, value); + xmlNewNsProp(defAttrOwnerElem, ns, iattr->localName, value); } if (normValue != NULL) xmlFree(normValue); @@ -27496,8 +27540,13 @@ xmlSchemaVDocWalk(xmlSchemaValidCtxtPtr vctxt) (node->type == XML_ENTITY_REF_NODE)) { /* * DOC VAL TODO: What to do with entities? - */ - TODO + */ + VERROR_INT("xmlSchemaVDocWalk", + "there is at least one entity reference in the node-tree " + "currently being validated. Processing of entities with " + "this XML Schema processor is not supported (yet). Please " + "substitute entities before validation."); + goto internal_error; } else { goto leave_node; /* @@ -2,7 +2,7 @@ * xpath.c: XML Path Language implementation * XPath is a language for addressing parts of an XML document, * designed to be used by both XSLT and XPointer - * + *f * Reference: W3C Recommendation 16 November 1999 * http://www.w3.org/TR/1999/REC-xpath-19991116 * Public reference: @@ -75,6 +75,32 @@ * only element-nodes and the document node. */ #define XP_PATTERN_TO_ANY_NODE_ENABLED + +/* +* XP_OPTIMIZED_NON_ELEM_COMPARISON: +* If defined, this will use xmlXPathCmpNodesExt() instead of +* xmlXPathCmpNodes(). The new function is optimized comparison of +* non-element nodes; actually it will speed up comparison only if +* xmlXPathOrderDocElems() was called in order to index the elements of +* a tree in document order; Libxslt does such an indexing, thus it will +* benefit from this optimization. +*/ +#define XP_OPTIMIZED_NON_ELEM_COMPARISON + +/* +* XP_OPTIMIZED_FILTER_FIRST: +* If defined, this will optimize expressions like "key('foo', 'val')[b][1]" +* in a way, that it stop evaluation at the first node. +*/ +#define XP_OPTIMIZED_FILTER_FIRST + +/* +* XP_DEBUG_OBJ_USAGE: +* Internal flag to enable tracking of how much XPath objects have been +* created. +*/ +/* #define XP_DEBUG_OBJ_USAGE */ + /* * TODO: * There are a few spots where some tests are done which depend upon ascii @@ -85,6 +111,16 @@ #if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) /************************************************************************ * * + * Forward declarations * + * * + ************************************************************************/ +static void +xmlXPathFreeValueTree(xmlNodeSetPtr obj); +static void +xmlXPathReleaseObject(xmlXPathContextPtr ctxt, xmlXPathObjectPtr obj); + +/************************************************************************ + * * * Floating point stuff * * * ************************************************************************/ @@ -332,6 +368,10 @@ xmlXPathErr(xmlXPathParserContextPtr ctxt, int error) xmlXPathErrorMessages[error]); return; } + + /* cleanup current last error */ + xmlResetError(&ctxt->context->lastError); + ctxt->context->lastError.domain = XML_FROM_XPATH; ctxt->context->lastError.code = error + XML_XPATH_EXPRESSION_OK - XPATH_EXPRESSION_OK; @@ -369,6 +409,101 @@ xmlXPatherror(xmlXPathParserContextPtr ctxt, const char *file ATTRIBUTE_UNUSED, xmlXPathErr(ctxt, no); } +/************************************************************************ + * * + * Utilities * + * * + ************************************************************************/ + +/** + * xsltPointerList: + * + * Pointer-list for various purposes. + */ +typedef struct _xmlPointerList xmlPointerList; +typedef xmlPointerList *xmlPointerListPtr; +struct _xmlPointerList { + void **items; + int number; + int size; +}; +/* +* TODO: Since such a list-handling is used in xmlschemas.c and libxslt +* and here, we should make the functions public. +*/ +static int +xmlPointerListAddSize(xmlPointerListPtr list, + void *item, + int initialSize) +{ + if (list->items == NULL) { + if (initialSize <= 0) + initialSize = 1; + list->items = (void **) xmlMalloc( + initialSize * sizeof(void *)); + if (list->items == NULL) { + xmlXPathErrMemory(NULL, + "xmlPointerListCreate: allocating item\n"); + return(-1); + } + list->number = 0; + list->size = initialSize; + } else if (list->size <= list->number) { + list->size *= 2; + list->items = (void **) xmlRealloc(list->items, + list->size * sizeof(void *)); + if (list->items == NULL) { + xmlXPathErrMemory(NULL, + "xmlPointerListCreate: re-allocating item\n"); + list->size = 0; + return(-1); + } + } + list->items[list->number++] = item; + return(0); +} + +/** + * xsltPointerListCreate: + * + * Creates an xsltPointerList structure. + * + * Returns a xsltPointerList structure or NULL in case of an error. + */ +static xmlPointerListPtr +xmlPointerListCreate(int initialSize) +{ + xmlPointerListPtr ret; + + ret = xmlMalloc(sizeof(xmlPointerList)); + if (ret == NULL) { + xmlXPathErrMemory(NULL, + "xmlPointerListCreate: allocating item\n"); + return (NULL); + } + memset(ret, 0, sizeof(xmlPointerList)); + if (initialSize > 0) { + xmlPointerListAddSize(ret, NULL, initialSize); + ret->number = 0; + } + return (ret); +} + +/** + * xsltPointerListFree: + * + * Frees the xsltPointerList structure. This does not free + * the content of the list. + */ +static void +xmlPointerListFree(xmlPointerListPtr list) +{ + if (list == NULL) + return; + if (list->items != NULL) + xmlFree(list->items); + xmlFree(list); +} /************************************************************************ * * @@ -391,15 +526,15 @@ typedef enum { XPATH_OP_UNION, XPATH_OP_ROOT, XPATH_OP_NODE, - XPATH_OP_RESET, + XPATH_OP_RESET, /* 10 */ XPATH_OP_COLLECT, - XPATH_OP_VALUE, + XPATH_OP_VALUE, /* 12 */ XPATH_OP_VARIABLE, XPATH_OP_FUNCTION, XPATH_OP_ARG, XPATH_OP_PREDICATE, - XPATH_OP_FILTER, - XPATH_OP_SORT + XPATH_OP_FILTER, /* 17 */ + XPATH_OP_SORT /* 18 */ #ifdef LIBXML_XPTR_ENABLED ,XPATH_OP_RANGETO #endif @@ -418,7 +553,7 @@ typedef enum { AXIS_PARENT, AXIS_PRECEDING, AXIS_PRECEDING_SIBLING, - AXIS_SELF + AXIS_SELF } xmlXPathAxisVal; typedef enum { @@ -434,9 +569,10 @@ typedef enum { NODE_TYPE_NODE = 0, NODE_TYPE_COMMENT = XML_COMMENT_NODE, NODE_TYPE_TEXT = XML_TEXT_NODE, - NODE_TYPE_PI = XML_PI_NODE + NODE_TYPE_PI = XML_PI_NODE } xmlXPathTypeVal; +#define XP_REWRITE_DOS_CHILD_ELEM 1 typedef struct _xmlXPathStepOp xmlXPathStepOp; typedef xmlXPathStepOp *xmlXPathStepOpPtr; @@ -451,6 +587,7 @@ struct _xmlXPathStepOp { void *value5; void *cache; void *cacheURI; + int rewriteType; }; struct _xmlXPathCompExpr { @@ -673,6 +810,58 @@ xmlXPathCompExprAdd(ctxt->comp, (ch1), (ch2), (op), \ /************************************************************************ * * + * XPath object cache structures * + * * + ************************************************************************/ + +/* #define XP_DEFAULT_CACHE_ON */ + +#define XP_HAS_CACHE(c) ((c != NULL) && ((c)->cache != NULL)) + +typedef struct _xmlXPathContextCache xmlXPathContextCache; +typedef xmlXPathContextCache *xmlXPathContextCachePtr; +struct _xmlXPathContextCache { + xmlPointerListPtr nodesetObjs; /* contains xmlXPathObjectPtr */ + xmlPointerListPtr stringObjs; /* contains xmlXPathObjectPtr */ + xmlPointerListPtr booleanObjs; /* contains xmlXPathObjectPtr */ + xmlPointerListPtr numberObjs; /* contains xmlXPathObjectPtr */ + xmlPointerListPtr miscObjs; /* contains xmlXPathObjectPtr */ + int maxNodeset; + int maxString; + int maxBoolean; + int maxNumber; + int maxMisc; +#ifdef XP_DEBUG_OBJ_USAGE + int dbgCachedAll; + int dbgCachedNodeset; + int dbgCachedString; + int dbgCachedBool; + int dbgCachedNumber; + int dbgCachedPoint; + int dbgCachedRange; + int dbgCachedLocset; + int dbgCachedUsers; + int dbgCachedXSLTTree; + int dbgCachedUndefined; + + + int dbgReusedAll; + int dbgReusedNodeset; + int dbgReusedString; + int dbgReusedBool; + int dbgReusedNumber; + int dbgReusedPoint; + int dbgReusedRange; + int dbgReusedLocset; + int dbgReusedUsers; + int dbgReusedXSLTTree; + int dbgReusedUndefined; + +#endif +}; + +/************************************************************************ + * * * Debugging related functions * * * ************************************************************************/ @@ -1118,10 +1307,1096 @@ xmlXPathDebugDumpCompExpr(FILE *output, xmlXPathCompExprPtr comp, i = comp->last; xmlXPathDebugDumpStepOp(output, comp, &comp->steps[i], depth + 1); } + +#ifdef XP_DEBUG_OBJ_USAGE + +/* +* XPath object usage related debugging variables. +*/ +static int xmlXPathDebugObjCounterUndefined = 0; +static int xmlXPathDebugObjCounterNodeset = 0; +static int xmlXPathDebugObjCounterBool = 0; +static int xmlXPathDebugObjCounterNumber = 0; +static int xmlXPathDebugObjCounterString = 0; +static int xmlXPathDebugObjCounterPoint = 0; +static int xmlXPathDebugObjCounterRange = 0; +static int xmlXPathDebugObjCounterLocset = 0; +static int xmlXPathDebugObjCounterUsers = 0; +static int xmlXPathDebugObjCounterXSLTTree = 0; +static int xmlXPathDebugObjCounterAll = 0; + +static int xmlXPathDebugObjTotalUndefined = 0; +static int xmlXPathDebugObjTotalNodeset = 0; +static int xmlXPathDebugObjTotalBool = 0; +static int xmlXPathDebugObjTotalNumber = 0; +static int xmlXPathDebugObjTotalString = 0; +static int xmlXPathDebugObjTotalPoint = 0; +static int xmlXPathDebugObjTotalRange = 0; +static int xmlXPathDebugObjTotalLocset = 0; +static int xmlXPathDebugObjTotalUsers = 0; +static int xmlXPathDebugObjTotalXSLTTree = 0; +static int xmlXPathDebugObjTotalAll = 0; + +static int xmlXPathDebugObjMaxUndefined = 0; +static int xmlXPathDebugObjMaxNodeset = 0; +static int xmlXPathDebugObjMaxBool = 0; +static int xmlXPathDebugObjMaxNumber = 0; +static int xmlXPathDebugObjMaxString = 0; +static int xmlXPathDebugObjMaxPoint = 0; +static int xmlXPathDebugObjMaxRange = 0; +static int xmlXPathDebugObjMaxLocset = 0; +static int xmlXPathDebugObjMaxUsers = 0; +static int xmlXPathDebugObjMaxXSLTTree = 0; +static int xmlXPathDebugObjMaxAll = 0; + +/* REVISIT TODO: Make this static when committing */ +static void +xmlXPathDebugObjUsageReset(xmlXPathContextPtr ctxt) +{ + if (ctxt != NULL) { + if (ctxt->cache != NULL) { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + cache->dbgCachedAll = 0; + cache->dbgCachedNodeset = 0; + cache->dbgCachedString = 0; + cache->dbgCachedBool = 0; + cache->dbgCachedNumber = 0; + cache->dbgCachedPoint = 0; + cache->dbgCachedRange = 0; + cache->dbgCachedLocset = 0; + cache->dbgCachedUsers = 0; + cache->dbgCachedXSLTTree = 0; + cache->dbgCachedUndefined = 0; + + cache->dbgReusedAll = 0; + cache->dbgReusedNodeset = 0; + cache->dbgReusedString = 0; + cache->dbgReusedBool = 0; + cache->dbgReusedNumber = 0; + cache->dbgReusedPoint = 0; + cache->dbgReusedRange = 0; + cache->dbgReusedLocset = 0; + cache->dbgReusedUsers = 0; + cache->dbgReusedXSLTTree = 0; + cache->dbgReusedUndefined = 0; + } + } + + xmlXPathDebugObjCounterUndefined = 0; + xmlXPathDebugObjCounterNodeset = 0; + xmlXPathDebugObjCounterBool = 0; + xmlXPathDebugObjCounterNumber = 0; + xmlXPathDebugObjCounterString = 0; + xmlXPathDebugObjCounterPoint = 0; + xmlXPathDebugObjCounterRange = 0; + xmlXPathDebugObjCounterLocset = 0; + xmlXPathDebugObjCounterUsers = 0; + xmlXPathDebugObjCounterXSLTTree = 0; + xmlXPathDebugObjCounterAll = 0; + + xmlXPathDebugObjTotalUndefined = 0; + xmlXPathDebugObjTotalNodeset = 0; + xmlXPathDebugObjTotalBool = 0; + xmlXPathDebugObjTotalNumber = 0; + xmlXPathDebugObjTotalString = 0; + xmlXPathDebugObjTotalPoint = 0; + xmlXPathDebugObjTotalRange = 0; + xmlXPathDebugObjTotalLocset = 0; + xmlXPathDebugObjTotalUsers = 0; + xmlXPathDebugObjTotalXSLTTree = 0; + xmlXPathDebugObjTotalAll = 0; + + xmlXPathDebugObjMaxUndefined = 0; + xmlXPathDebugObjMaxNodeset = 0; + xmlXPathDebugObjMaxBool = 0; + xmlXPathDebugObjMaxNumber = 0; + xmlXPathDebugObjMaxString = 0; + xmlXPathDebugObjMaxPoint = 0; + xmlXPathDebugObjMaxRange = 0; + xmlXPathDebugObjMaxLocset = 0; + xmlXPathDebugObjMaxUsers = 0; + xmlXPathDebugObjMaxXSLTTree = 0; + xmlXPathDebugObjMaxAll = 0; + +} + +static void +xmlXPathDebugObjUsageRequested(xmlXPathContextPtr ctxt, + xmlXPathObjectType objType) +{ + int isCached = 0; + + if (ctxt != NULL) { + if (ctxt->cache != NULL) { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + isCached = 1; + + cache->dbgReusedAll++; + switch (objType) { + case XPATH_UNDEFINED: + cache->dbgReusedUndefined++; + break; + case XPATH_NODESET: + cache->dbgReusedNodeset++; + break; + case XPATH_BOOLEAN: + cache->dbgReusedBool++; + break; + case XPATH_NUMBER: + cache->dbgReusedNumber++; + break; + case XPATH_STRING: + cache->dbgReusedString++; + break; + case XPATH_POINT: + cache->dbgReusedPoint++; + break; + case XPATH_RANGE: + cache->dbgReusedRange++; + break; + case XPATH_LOCATIONSET: + cache->dbgReusedLocset++; + break; + case XPATH_USERS: + cache->dbgReusedUsers++; + break; + case XPATH_XSLT_TREE: + cache->dbgReusedXSLTTree++; + break; + default: + break; + } + } + } + + switch (objType) { + case XPATH_UNDEFINED: + if (! isCached) + xmlXPathDebugObjTotalUndefined++; + xmlXPathDebugObjCounterUndefined++; + if (xmlXPathDebugObjCounterUndefined > + xmlXPathDebugObjMaxUndefined) + xmlXPathDebugObjMaxUndefined = + xmlXPathDebugObjCounterUndefined; + break; + case XPATH_NODESET: + if (! isCached) + xmlXPathDebugObjTotalNodeset++; + xmlXPathDebugObjCounterNodeset++; + if (xmlXPathDebugObjCounterNodeset > + xmlXPathDebugObjMaxNodeset) + xmlXPathDebugObjMaxNodeset = + xmlXPathDebugObjCounterNodeset; + break; + case XPATH_BOOLEAN: + if (! isCached) + xmlXPathDebugObjTotalBool++; + xmlXPathDebugObjCounterBool++; + if (xmlXPathDebugObjCounterBool > + xmlXPathDebugObjMaxBool) + xmlXPathDebugObjMaxBool = + xmlXPathDebugObjCounterBool; + break; + case XPATH_NUMBER: + if (! isCached) + xmlXPathDebugObjTotalNumber++; + xmlXPathDebugObjCounterNumber++; + if (xmlXPathDebugObjCounterNumber > + xmlXPathDebugObjMaxNumber) + xmlXPathDebugObjMaxNumber = + xmlXPathDebugObjCounterNumber; + break; + case XPATH_STRING: + if (! isCached) + xmlXPathDebugObjTotalString++; + xmlXPathDebugObjCounterString++; + if (xmlXPathDebugObjCounterString > + xmlXPathDebugObjMaxString) + xmlXPathDebugObjMaxString = + xmlXPathDebugObjCounterString; + break; + case XPATH_POINT: + if (! isCached) + xmlXPathDebugObjTotalPoint++; + xmlXPathDebugObjCounterPoint++; + if (xmlXPathDebugObjCounterPoint > + xmlXPathDebugObjMaxPoint) + xmlXPathDebugObjMaxPoint = + xmlXPathDebugObjCounterPoint; + break; + case XPATH_RANGE: + if (! isCached) + xmlXPathDebugObjTotalRange++; + xmlXPathDebugObjCounterRange++; + if (xmlXPathDebugObjCounterRange > + xmlXPathDebugObjMaxRange) + xmlXPathDebugObjMaxRange = + xmlXPathDebugObjCounterRange; + break; + case XPATH_LOCATIONSET: + if (! isCached) + xmlXPathDebugObjTotalLocset++; + xmlXPathDebugObjCounterLocset++; + if (xmlXPathDebugObjCounterLocset > + xmlXPathDebugObjMaxLocset) + xmlXPathDebugObjMaxLocset = + xmlXPathDebugObjCounterLocset; + break; + case XPATH_USERS: + if (! isCached) + xmlXPathDebugObjTotalUsers++; + xmlXPathDebugObjCounterUsers++; + if (xmlXPathDebugObjCounterUsers > + xmlXPathDebugObjMaxUsers) + xmlXPathDebugObjMaxUsers = + xmlXPathDebugObjCounterUsers; + break; + case XPATH_XSLT_TREE: + if (! isCached) + xmlXPathDebugObjTotalXSLTTree++; + xmlXPathDebugObjCounterXSLTTree++; + if (xmlXPathDebugObjCounterXSLTTree > + xmlXPathDebugObjMaxXSLTTree) + xmlXPathDebugObjMaxXSLTTree = + xmlXPathDebugObjCounterXSLTTree; + break; + default: + break; + } + if (! isCached) + xmlXPathDebugObjTotalAll++; + xmlXPathDebugObjCounterAll++; + if (xmlXPathDebugObjCounterAll > + xmlXPathDebugObjMaxAll) + xmlXPathDebugObjMaxAll = + xmlXPathDebugObjCounterAll; +} + +static void +xmlXPathDebugObjUsageReleased(xmlXPathContextPtr ctxt, + xmlXPathObjectType objType) +{ + int isCached = 0; + + if (ctxt != NULL) { + if (ctxt->cache != NULL) { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + isCached = 1; + + cache->dbgCachedAll++; + switch (objType) { + case XPATH_UNDEFINED: + cache->dbgCachedUndefined++; + break; + case XPATH_NODESET: + cache->dbgCachedNodeset++; + break; + case XPATH_BOOLEAN: + cache->dbgCachedBool++; + break; + case XPATH_NUMBER: + cache->dbgCachedNumber++; + break; + case XPATH_STRING: + cache->dbgCachedString++; + break; + case XPATH_POINT: + cache->dbgCachedPoint++; + break; + case XPATH_RANGE: + cache->dbgCachedRange++; + break; + case XPATH_LOCATIONSET: + cache->dbgCachedLocset++; + break; + case XPATH_USERS: + cache->dbgCachedUsers++; + break; + case XPATH_XSLT_TREE: + cache->dbgCachedXSLTTree++; + break; + default: + break; + } + + } + } + switch (objType) { + case XPATH_UNDEFINED: + xmlXPathDebugObjCounterUndefined--; + break; + case XPATH_NODESET: + xmlXPathDebugObjCounterNodeset--; + break; + case XPATH_BOOLEAN: + xmlXPathDebugObjCounterBool--; + break; + case XPATH_NUMBER: + xmlXPathDebugObjCounterNumber--; + break; + case XPATH_STRING: + xmlXPathDebugObjCounterString--; + break; + case XPATH_POINT: + xmlXPathDebugObjCounterPoint--; + break; + case XPATH_RANGE: + xmlXPathDebugObjCounterRange--; + break; + case XPATH_LOCATIONSET: + xmlXPathDebugObjCounterLocset--; + break; + case XPATH_USERS: + xmlXPathDebugObjCounterUsers--; + break; + case XPATH_XSLT_TREE: + xmlXPathDebugObjCounterXSLTTree--; + break; + default: + break; + } + xmlXPathDebugObjCounterAll--; +} + +/* REVISIT TODO: Make this static when committing */ +static void +xmlXPathDebugObjUsageDisplay(xmlXPathContextPtr ctxt) +{ + int reqAll, reqNodeset, reqString, reqBool, reqNumber, + reqXSLTTree, reqUndefined; + int caAll = 0, caNodeset = 0, caString = 0, caBool = 0, + caNumber = 0, caXSLTTree = 0, caUndefined = 0; + int reAll = 0, reNodeset = 0, reString = 0, reBool = 0, + reNumber = 0, reXSLTTree = 0, reUndefined = 0; + int leftObjs = xmlXPathDebugObjCounterAll; + + reqAll = xmlXPathDebugObjTotalAll; + reqNodeset = xmlXPathDebugObjTotalNodeset; + reqString = xmlXPathDebugObjTotalString; + reqBool = xmlXPathDebugObjTotalBool; + reqNumber = xmlXPathDebugObjTotalNumber; + reqXSLTTree = xmlXPathDebugObjTotalXSLTTree; + reqUndefined = xmlXPathDebugObjTotalUndefined; + + printf("# XPath object usage:\n"); + + if (ctxt != NULL) { + if (ctxt->cache != NULL) { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + reAll = cache->dbgReusedAll; + reqAll += reAll; + reNodeset = cache->dbgReusedNodeset; + reqNodeset += reNodeset; + reString = cache->dbgReusedString; + reqString += reString; + reBool = cache->dbgReusedBool; + reqBool += reBool; + reNumber = cache->dbgReusedNumber; + reqNumber += reNumber; + reXSLTTree = cache->dbgReusedXSLTTree; + reqXSLTTree += reXSLTTree; + reUndefined = cache->dbgReusedUndefined; + reqUndefined += reUndefined; + + caAll = cache->dbgCachedAll; + caBool = cache->dbgCachedBool; + caNodeset = cache->dbgCachedNodeset; + caString = cache->dbgCachedString; + caNumber = cache->dbgCachedNumber; + caXSLTTree = cache->dbgCachedXSLTTree; + caUndefined = cache->dbgCachedUndefined; + + if (cache->nodesetObjs) + leftObjs -= cache->nodesetObjs->number; + if (cache->stringObjs) + leftObjs -= cache->stringObjs->number; + if (cache->booleanObjs) + leftObjs -= cache->booleanObjs->number; + if (cache->numberObjs) + leftObjs -= cache->numberObjs->number; + if (cache->miscObjs) + leftObjs -= cache->miscObjs->number; + } + } + + printf("# all\n"); + printf("# total : %d\n", reqAll); + printf("# left : %d\n", leftObjs); + printf("# created: %d\n", xmlXPathDebugObjTotalAll); + printf("# reused : %d\n", reAll); + printf("# max : %d\n", xmlXPathDebugObjMaxAll); + + printf("# node-sets\n"); + printf("# total : %d\n", reqNodeset); + printf("# created: %d\n", xmlXPathDebugObjTotalNodeset); + printf("# reused : %d\n", reNodeset); + printf("# max : %d\n", xmlXPathDebugObjMaxNodeset); + + printf("# strings\n"); + printf("# total : %d\n", reqString); + printf("# created: %d\n", xmlXPathDebugObjTotalString); + printf("# reused : %d\n", reString); + printf("# max : %d\n", xmlXPathDebugObjMaxString); + + printf("# booleans\n"); + printf("# total : %d\n", reqBool); + printf("# created: %d\n", xmlXPathDebugObjTotalBool); + printf("# reused : %d\n", reBool); + printf("# max : %d\n", xmlXPathDebugObjMaxBool); + + printf("# numbers\n"); + printf("# total : %d\n", reqNumber); + printf("# created: %d\n", xmlXPathDebugObjTotalNumber); + printf("# reused : %d\n", reNumber); + printf("# max : %d\n", xmlXPathDebugObjMaxNumber); + + printf("# XSLT result tree fragments\n"); + printf("# total : %d\n", reqXSLTTree); + printf("# created: %d\n", xmlXPathDebugObjTotalXSLTTree); + printf("# reused : %d\n", reXSLTTree); + printf("# max : %d\n", xmlXPathDebugObjMaxXSLTTree); + + printf("# undefined\n"); + printf("# total : %d\n", reqUndefined); + printf("# created: %d\n", xmlXPathDebugObjTotalUndefined); + printf("# reused : %d\n", reUndefined); + printf("# max : %d\n", xmlXPathDebugObjMaxUndefined); + +} + +#endif /* XP_DEBUG_OBJ_USAGE */ + #endif /* LIBXML_DEBUG_ENABLED */ /************************************************************************ * * + * XPath object caching * + * * + ************************************************************************/ + +/** + * xmlXPathNewCache: + * + * Create a new object cache + * + * Returns the xmlXPathCache just allocated. + */ +static xmlXPathContextCachePtr +xmlXPathNewCache(void) +{ + xmlXPathContextCachePtr ret; + + ret = (xmlXPathContextCachePtr) xmlMalloc(sizeof(xmlXPathContextCache)); + if (ret == NULL) { + xmlXPathErrMemory(NULL, "creating object cache\n"); + return(NULL); + } + memset(ret, 0 , (size_t) sizeof(xmlXPathContextCache)); + ret->maxNodeset = 100; + ret->maxString = 100; + ret->maxBoolean = 100; + ret->maxNumber = 100; + ret->maxMisc = 100; + return(ret); +} + +static void +xmlXPathCacheFreeObjectList(xmlPointerListPtr list) +{ + int i; + xmlXPathObjectPtr obj; + + if (list == NULL) + return; + + for (i = 0; i < list->number; i++) { + obj = list->items[i]; + /* + * Note that it is already assured that we don't need to + * look out for namespace nodes in the node-set. + */ + if (obj->nodesetval != NULL) { + if (obj->nodesetval->nodeTab != NULL) + xmlFree(obj->nodesetval->nodeTab); + xmlFree(obj->nodesetval); + } + xmlFree(obj); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjCounterAll--; +#endif + } + xmlPointerListFree(list); +} + +static void +xmlXPathFreeCache(xmlXPathContextCachePtr cache) +{ + if (cache == NULL) + return; + if (cache->nodesetObjs) + xmlXPathCacheFreeObjectList(cache->nodesetObjs); + if (cache->stringObjs) + xmlXPathCacheFreeObjectList(cache->stringObjs); + if (cache->booleanObjs) + xmlXPathCacheFreeObjectList(cache->booleanObjs); + if (cache->numberObjs) + xmlXPathCacheFreeObjectList(cache->numberObjs); + if (cache->miscObjs) + xmlXPathCacheFreeObjectList(cache->miscObjs); + xmlFree(cache); +} + +/** + * xmlXPathContextSetCache: + * + * @ctxt: the XPath context + * @active: enables/disables (creates/frees) the cache + * @value: a value with semantics dependant on @options + * @options: options (currently only the value 0 is used) + * + * Creates/frees an object cache on the XPath context. + * If activates XPath objects (xmlXPathObject) will be cached internally + * to be reused. + * @options: + * 0: This will set the XPath object caching: + * @value: + * This will set the maximum number of XPath objects + * to be cached per slot + * There are 5 slots for: node-set, string, number, boolean, and + * misc objects. Use <0 for the default number (100). + * Other values for @options have currently no effect. + * + * Returns 0 if the setting succeeded, and -1 on API or internal errors. + */ +int +xmlXPathContextSetCache(xmlXPathContextPtr ctxt, + int active, + int value, + int options) +{ + if (ctxt == NULL) + return(-1); + if (active) { + xmlXPathContextCachePtr cache; + + if (ctxt->cache == NULL) { + ctxt->cache = xmlXPathNewCache(); + if (ctxt->cache == NULL) + return(-1); + } + cache = (xmlXPathContextCachePtr) ctxt->cache; + if (options == 0) { + if (value < 0) + value = 100; + cache->maxNodeset = value; + cache->maxString = value; + cache->maxNumber = value; + cache->maxBoolean = value; + cache->maxMisc = value; + } + } else if (ctxt->cache != NULL) { + xmlXPathFreeCache((xmlXPathContextCachePtr) ctxt->cache); + ctxt->cache = NULL; + } + return(0); +} + +/** + * xmlXPathCacheWrapNodeSet: + * @ctxt: the XPath context + * @val: the NodePtr value + * + * This is the cached version of xmlXPathWrapNodeSet(). + * Wrap the Nodeset @val in a new xmlXPathObjectPtr + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheWrapNodeSet(xmlXPathContextPtr ctxt, xmlNodeSetPtr val) +{ + if ((ctxt != NULL) && (ctxt->cache != NULL)) { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + ret->type = XPATH_NODESET; + ret->nodesetval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_NODESET); +#endif + return(ret); + } + } + + return(xmlXPathWrapNodeSet(val)); + +} + +/** + * xmlXPathCacheWrapString: + * @ctxt: the XPath context + * @val: the xmlChar * value + * + * This is the cached version of xmlXPathWrapString(). + * Wraps the @val string into an XPath object. + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheWrapString(xmlXPathContextPtr ctxt, xmlChar *val) +{ + if ((ctxt != NULL) && (ctxt->cache != NULL)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->stringObjs != NULL) && + (cache->stringObjs->number != 0)) + { + + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->stringObjs->items[--cache->stringObjs->number]; + ret->type = XPATH_STRING; + ret->stringval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + /* + * Fallback to misc-cache. + */ + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_STRING; + ret->stringval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } + } + return(xmlXPathWrapString(val)); +} + +/** + * xmlXPathCacheNewNodeSet: + * @ctxt: the XPath context + * @val: the NodePtr value + * + * This is the cached version of xmlXPathNewNodeSet(). + * Acquire an xmlXPathObjectPtr of type NodeSet and initialize + * it with the single Node @val + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheNewNodeSet(xmlXPathContextPtr ctxt, xmlNodePtr val) +{ + if ((ctxt != NULL) && (ctxt->cache)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->nodesetObjs != NULL) && + (cache->nodesetObjs->number != 0)) + { + xmlXPathObjectPtr ret; + /* + * Use the nodset-cache. + */ + ret = (xmlXPathObjectPtr) + cache->nodesetObjs->items[--cache->nodesetObjs->number]; + ret->type = XPATH_NODESET; + ret->boolval = 0; + if (val) { + if ((ret->nodesetval->nodeMax == 0) || + (val->type == XML_NAMESPACE_DECL)) + { + xmlXPathNodeSetAddUnique(ret->nodesetval, val); + } else { + ret->nodesetval->nodeTab[0] = val; + ret->nodesetval->nodeNr = 1; + } + } +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_NODESET); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + /* + * Fallback to misc-cache. + */ + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_NODESET; + ret->boolval = 0; + ret->nodesetval = xmlXPathNodeSetCreate(val); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_NODESET); +#endif + return(ret); + } + } + return(xmlXPathNewNodeSet(val)); +} + +/** + * xmlXPathCacheNewCString: + * @ctxt: the XPath context + * @val: the char * value + * + * This is the cached version of xmlXPathNewCString(). + * Acquire an xmlXPathObjectPtr of type string and of value @val + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheNewCString(xmlXPathContextPtr ctxt, const char *val) +{ + if ((ctxt != NULL) && (ctxt->cache)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->stringObjs != NULL) && + (cache->stringObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->stringObjs->items[--cache->stringObjs->number]; + + ret->type = XPATH_STRING; + ret->stringval = xmlStrdup(BAD_CAST val); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_STRING; + ret->stringval = xmlStrdup(BAD_CAST val); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } + } + return(xmlXPathNewCString(val)); +} + +/** + * xmlXPathCacheNewString: + * @ctxt: the XPath context + * @val: the xmlChar * value + * + * This is the cached version of xmlXPathNewString(). + * Acquire an xmlXPathObjectPtr of type string and of value @val + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheNewString(xmlXPathContextPtr ctxt, const xmlChar *val) +{ + if ((ctxt != NULL) && (ctxt->cache)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->stringObjs != NULL) && + (cache->stringObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->stringObjs->items[--cache->stringObjs->number]; + ret->type = XPATH_STRING; + if (val != NULL) + ret->stringval = xmlStrdup(val); + else + ret->stringval = xmlStrdup((const xmlChar *)""); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_STRING; + if (val != NULL) + ret->stringval = xmlStrdup(val); + else + ret->stringval = xmlStrdup((const xmlChar *)""); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_STRING); +#endif + return(ret); + } + } + return(xmlXPathNewString(val)); +} + +/** + * xmlXPathCacheNewBoolean: + * @ctxt: the XPath context + * @val: the boolean value + * + * This is the cached version of xmlXPathNewBoolean(). + * Acquires an xmlXPathObjectPtr of type boolean and of value @val + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheNewBoolean(xmlXPathContextPtr ctxt, int val) +{ + if ((ctxt != NULL) && (ctxt->cache)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->booleanObjs != NULL) && + (cache->booleanObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->booleanObjs->items[--cache->booleanObjs->number]; + ret->type = XPATH_BOOLEAN; + ret->boolval = (val != 0); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_BOOLEAN); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_BOOLEAN; + ret->boolval = (val != 0); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_BOOLEAN); +#endif + return(ret); + } + } + return(xmlXPathNewBoolean(val)); +} + +/** + * xmlXPathCacheNewFloat: + * @ctxt: the XPath context + * @val: the double value + * + * This is the cached version of xmlXPathNewFloat(). + * Acquires an xmlXPathObjectPtr of type double and of value @val + * + * Returns the created or reused object. + */ +static xmlXPathObjectPtr +xmlXPathCacheNewFloat(xmlXPathContextPtr ctxt, double val) +{ + if ((ctxt != NULL) && (ctxt->cache)) { + xmlXPathContextCachePtr cache = (xmlXPathContextCachePtr) ctxt->cache; + + if ((cache->numberObjs != NULL) && + (cache->numberObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->numberObjs->items[--cache->numberObjs->number]; + ret->type = XPATH_NUMBER; + ret->floatval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_NUMBER); +#endif + return(ret); + } else if ((cache->miscObjs != NULL) && + (cache->miscObjs->number != 0)) + { + xmlXPathObjectPtr ret; + + ret = (xmlXPathObjectPtr) + cache->miscObjs->items[--cache->miscObjs->number]; + + ret->type = XPATH_NUMBER; + ret->floatval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(ctxt, XPATH_NUMBER); +#endif + return(ret); + } + } + return(xmlXPathNewFloat(val)); +} + +/** + * xmlXPathCacheConvertString: + * @ctxt: the XPath context + * @val: an XPath object + * + * This is the cached version of xmlXPathConvertString(). + * Converts an existing object to its string() equivalent + * + * Returns a created or reused object, the old one is freed (cached) + * (or the operation is done directly on @val) + */ + +static xmlXPathObjectPtr +xmlXPathCacheConvertString(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + xmlChar *res = NULL; + + if (val == NULL) + return(xmlXPathCacheNewCString(ctxt, "")); + + switch (val->type) { + case XPATH_UNDEFINED: +#ifdef DEBUG_EXPR + xmlGenericError(xmlGenericErrorContext, "STRING: undefined\n"); +#endif + break; + case XPATH_NODESET: + case XPATH_XSLT_TREE: + res = xmlXPathCastNodeSetToString(val->nodesetval); + break; + case XPATH_STRING: + return(val); + case XPATH_BOOLEAN: + res = xmlXPathCastBooleanToString(val->boolval); + break; + case XPATH_NUMBER: + res = xmlXPathCastNumberToString(val->floatval); + break; + case XPATH_USERS: + case XPATH_POINT: + case XPATH_RANGE: + case XPATH_LOCATIONSET: + TODO; + break; + } + xmlXPathReleaseObject(ctxt, val); + if (res == NULL) + return(xmlXPathCacheNewCString(ctxt, "")); + return(xmlXPathCacheWrapString(ctxt, res)); +} + +/** + * xmlXPathCacheObjectCopy: + * @ctxt: the XPath context + * @val: the original object + * + * This is the cached version of xmlXPathObjectCopy(). + * Acquire a copy of a given object + * + * Returns a created or reused created object. + */ +static xmlXPathObjectPtr +xmlXPathCacheObjectCopy(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) +{ + if (val == NULL) + return(NULL); + + switch (val->type) { + case XPATH_NODESET: + if (XP_HAS_CACHE(ctxt)) + return(xmlXPathCacheWrapNodeSet(ctxt, + xmlXPathNodeSetMerge(NULL, val->nodesetval))); + case XPATH_STRING: + if (XP_HAS_CACHE(ctxt)) + return(xmlXPathCacheNewString(ctxt, val->stringval)); + case XPATH_BOOLEAN: + if (XP_HAS_CACHE(ctxt)) + return(xmlXPathCacheNewBoolean(ctxt, val->boolval)); + case XPATH_NUMBER: + if (XP_HAS_CACHE(ctxt)) + return(xmlXPathCacheNewFloat(ctxt, val->floatval)); + default: + break; + } + return(xmlXPathObjectCopy(val)); +} + +/** + * xmlXPathCacheConvertBoolean: + * @ctxt: the XPath context + * @val: an XPath object + * + * This is the cached version of xmlXPathConvertBoolean(). + * Converts an existing object to its boolean() equivalent + * + * Returns a created or reused object, the old one is freed (or the operation + * is done directly on @val) + */ +static xmlXPathObjectPtr +xmlXPathCacheConvertBoolean(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + xmlXPathObjectPtr ret; + + if (val == NULL) + return(xmlXPathCacheNewBoolean(ctxt, 0)); + if (val->type == XPATH_BOOLEAN) + return(val); + ret = xmlXPathCacheNewBoolean(ctxt, xmlXPathCastToBoolean(val)); + xmlXPathReleaseObject(ctxt, val); + return(ret); +} + +/** + * xmlXPathCacheConvertNumber: + * @ctxt: the XPath context + * @val: an XPath object + * + * This is the cached version of xmlXPathConvertNumber(). + * Converts an existing object to its number() equivalent + * + * Returns a created or reused object, the old one is freed (or the operation + * is done directly on @val) + */ +static xmlXPathObjectPtr +xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + xmlXPathObjectPtr ret; + + if (val == NULL) + return(xmlXPathCacheNewFloat(ctxt, 0.0)); + if (val->type == XPATH_NUMBER) + return(val); + ret = xmlXPathCacheNewFloat(ctxt, xmlXPathCastToNumber(val)); + xmlXPathReleaseObject(ctxt, val); + return(ret); +} + +/************************************************************************ + * * * Parser stacks related functions and macros * * * ************************************************************************/ @@ -1204,7 +2479,7 @@ xmlXPathPopBoolean (xmlXPathParserContextPtr ctxt) { ret = xmlXPathCastToBoolean(obj); else ret = obj->boolval; - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); return(ret); } @@ -1231,7 +2506,7 @@ xmlXPathPopNumber (xmlXPathParserContextPtr ctxt) { ret = xmlXPathCastToNumber(obj); else ret = obj->floatval; - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); return(ret); } @@ -1258,7 +2533,7 @@ xmlXPathPopString (xmlXPathParserContextPtr ctxt) { /* TODO: needs refactoring somewhere else */ if (obj->stringval == ret) obj->stringval = NULL; - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); return(ret); } @@ -1292,7 +2567,8 @@ xmlXPathPopNodeSet (xmlXPathParserContextPtr ctxt) { if (obj->boolval && obj->user != NULL) xmlFreeNodeList((xmlNodePtr) obj->user); #endif - xmlXPathFreeNodeSetList(obj); + obj->nodesetval = NULL; + xmlXPathReleaseObject(ctxt->context, obj); return(ret); } @@ -1320,7 +2596,8 @@ xmlXPathPopExternal (xmlXPathParserContextPtr ctxt) { } obj = valuePop(ctxt); ret = obj->user; - xmlXPathFreeObject(obj); + obj->user = NULL; + xmlXPathReleaseObject(ctxt->context, obj); return(ret); } @@ -1691,6 +2968,297 @@ xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) { return(-1); /* assume there is no sibling list corruption */ } +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON +/** + * xmlXPathCmpNodesExt: + * @node1: the first node + * @node2: the second node + * + * Compare two nodes w.r.t document order. + * This one is optimized for handling of non-element nodes. + * + * Returns -2 in case of error 1 if first point < second point, 0 if + * it's the same node, -1 otherwise + */ +static int +xmlXPathCmpNodesExt(xmlNodePtr node1, xmlNodePtr node2) { + int depth1, depth2; + int misc = 0, precedence1 = 0, precedence2 = 0; + xmlNodePtr miscNode1 = NULL, miscNode2 = NULL; + xmlNodePtr cur, root; + long l1, l2; + + if ((node1 == NULL) || (node2 == NULL)) + return(-2); + + if (node1 == node2) + return(0); + + /* + * a couple of optimizations which will avoid computations in most cases + */ + switch (node1->type) { + case XML_ELEMENT_NODE: + if (node2->type == XML_ELEMENT_NODE) { + if ((0 > (long) node1->content) && /* TODO: Would a != 0 suffice here? */ + (0 > (long) node2->content) && + (node1->doc == node2->doc)) + { + l1 = -((long) node1->content); + l2 = -((long) node2->content); + if (l1 < l2) + return(1); + if (l1 > l2) + return(-1); + } else + goto turtle_comparison; + } + break; + case XML_ATTRIBUTE_NODE: + precedence1 = 1; /* element is owner */ + miscNode1 = node1; + node1 = node1->parent; + misc = 1; + break; + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_COMMENT_NODE: + case XML_PI_NODE: { + miscNode1 = node1; + /* + * Find nearest element node. + */ + if (node1->prev != NULL) { + do { + node1 = node1->prev; + if (node1->type == XML_ELEMENT_NODE) { + precedence1 = 3; /* element in prev-sibl axis */ + break; + } + if (node1->prev == NULL) { + precedence1 = 2; /* element is parent */ + /* + * URGENT TODO: Are there any cases, where the + * parent of such a node is not an element node? + */ + node1 = node1->parent; + break; + } + } while (1); + } else { + precedence1 = 2; /* element is parent */ + node1 = node1->parent; + } + if ((node1 == NULL) || (node1->type != XML_ELEMENT_NODE)) { + /* + * Fallback for whatever case. + */ + node1 = miscNode1; + precedence1 = 0; + } else + misc = 1; + } + break; + case XML_NAMESPACE_DECL: + /* + * TODO: why do we return 1 for namespace nodes? + */ + return(1); + default: + break; + } + switch (node2->type) { + case XML_ELEMENT_NODE: + break; + case XML_ATTRIBUTE_NODE: + precedence2 = 1; /* element is owner */ + miscNode2 = node2; + node2 = node2->parent; + misc = 1; + break; + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_COMMENT_NODE: + case XML_PI_NODE: { + miscNode2 = node2; + if (node2->prev != NULL) { + do { + node2 = node2->prev; + if (node2->type == XML_ELEMENT_NODE) { + precedence2 = 3; /* element in prev-sibl axis */ + break; + } + if (node2->prev == NULL) { + precedence2 = 2; /* element is parent */ + node2 = node2->parent; + break; + } + } while (1); + } else { + precedence2 = 2; /* element is parent */ + node2 = node2->parent; + } + if ((node2 == NULL) || (node2->type != XML_ELEMENT_NODE) || + (0 <= (long) node1->content)) + { + node2 = miscNode2; + precedence2 = 0; + } else + misc = 1; + } + break; + case XML_NAMESPACE_DECL: + return(1); + default: + break; + } + if (misc) { + if (node1 == node2) { + if (precedence1 == precedence2) { + /* + * The ugly case; but normally there aren't many + * adjacent non-element nodes around. + */ + cur = miscNode2->prev; + while (cur != NULL) { + if (cur == miscNode1) + return(1); + if (cur->type == XML_ELEMENT_NODE) + return(-1); + cur = cur->prev; + } + return (-1); + } else { + /* + * Evaluate based on higher precedence wrt to the element. + * TODO: This assumes attributes are sorted before content. + * Is this 100% correct? + */ + if (precedence1 < precedence2) + return(1); + else + return(-1); + } + } + /* + * Special case: One of the helper-elements is contained by the other. + * <foo> + * <node2> + * <node1>Text-1(precedence1 == 2)</node1> + * </node2> + * Text-6(precedence2 == 3) + * </foo> + */ + if ((precedence2 == 3) && (precedence1 > 1)) { + cur = node1->parent; + while (cur) { + if (cur == node2) + return(1); + cur = cur->parent; + } + } + if ((precedence1 == 3) && (precedence2 > 1)) { + cur = node2->parent; + while (cur) { + if (cur == node1) + return(-1); + cur = cur->parent; + } + } + } + + /* + * Speedup using document order if availble. + */ + if ((node1->type == XML_ELEMENT_NODE) && + (node2->type == XML_ELEMENT_NODE) && + (0 > (long) node1->content) && + (0 > (long) node2->content) && + (node1->doc == node2->doc)) { + + l1 = -((long) node1->content); + l2 = -((long) node2->content); + if (l1 < l2) + return(1); + if (l1 > l2) + return(-1); + } + +turtle_comparison: + + if (node1 == node2->prev) + return(1); + if (node1 == node2->next) + return(-1); + /* + * compute depth to root + */ + for (depth2 = 0, cur = node2;cur->parent != NULL;cur = cur->parent) { + if (cur == node1) + return(1); + depth2++; + } + root = cur; + for (depth1 = 0, cur = node1;cur->parent != NULL;cur = cur->parent) { + if (cur == node2) + return(-1); + depth1++; + } + /* + * Distinct document (or distinct entities :-( ) case. + */ + if (root != cur) { + return(-2); + } + /* + * get the nearest common ancestor. + */ + while (depth1 > depth2) { + depth1--; + node1 = node1->parent; + } + while (depth2 > depth1) { + depth2--; + node2 = node2->parent; + } + while (node1->parent != node2->parent) { + node1 = node1->parent; + node2 = node2->parent; + /* should not happen but just in case ... */ + if ((node1 == NULL) || (node2 == NULL)) + return(-2); + } + /* + * Find who's first. + */ + if (node1 == node2->prev) + return(1); + if (node1 == node2->next) + return(-1); + /* + * Speedup using document order if availble. + */ + if ((node1->type == XML_ELEMENT_NODE) && + (node2->type == XML_ELEMENT_NODE) && + (0 > (long) node1->content) && + (0 > (long) node2->content) && + (node1->doc == node2->doc)) { + + l1 = -((long) node1->content); + l2 = -((long) node2->content); + if (l1 < l2) + return(1); + if (l1 > l2) + return(-1); + } + + for (cur = node1->next;cur != NULL;cur = cur->next) + if (cur == node2) + return(1); + return(-1); /* assume there is no sibling list corruption */ +} +#endif /* XP_OPTIMIZED_NON_ELEM_COMPARISON */ + /** * xmlXPathNodeSetSort: * @set: the node set @@ -1711,8 +3279,14 @@ xmlXPathNodeSetSort(xmlNodeSetPtr set) { for (i = incr; i < len; i++) { j = i - incr; while (j >= 0) { +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON + if (xmlXPathCmpNodesExt(set->nodeTab[j], + set->nodeTab[j + incr]) == -1) +#else if (xmlXPathCmpNodes(set->nodeTab[j], - set->nodeTab[j + incr]) == -1) { + set->nodeTab[j + incr]) == -1) +#endif + { tmp = set->nodeTab[j]; set->nodeTab[j] = set->nodeTab[j + incr]; set->nodeTab[j + incr] = tmp; @@ -2044,31 +3618,60 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { xmlNodeSetPtr xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { int i, j, initNr, skip; + xmlNodePtr n1, n2; if (val2 == NULL) return(val1); if (val1 == NULL) { val1 = xmlXPathNodeSetCreate(NULL); +#if 0 + /* + * TODO: The optimization won't work in every case, since + * those nasty namespace nodes need to be added with + * xmlXPathNodeSetDupNs() to the set; thus a pure + * memcpy is not possible. + * If there was a flag on the nodesetval, indicating that + * some temporary nodes are in, that would be helpfull. + */ + /* + * Optimization: Create an equally sized node-set + * and memcpy the content. + */ + val1 = xmlXPathNodeSetCreateSize(val2->nodeNr); + if (val1 == NULL) + return(NULL); + if (val2->nodeNr != 0) { + if (val2->nodeNr == 1) + *(val1->nodeTab) = *(val2->nodeTab); + else { + memcpy(val1->nodeTab, val2->nodeTab, + val2->nodeNr * sizeof(xmlNodePtr)); + } + val1->nodeNr = val2->nodeNr; + } + return(val1); +#endif } /* @@ with_ns to check whether namespace nodes should be looked at @@ */ initNr = val1->nodeNr; for (i = 0;i < val2->nodeNr;i++) { + n2 = val2->nodeTab[i]; /* * check against duplicates */ skip = 0; for (j = 0; j < initNr; j++) { - if (val1->nodeTab[j] == val2->nodeTab[i]) { + n1 = val1->nodeTab[j]; + if (n1 == n2) { skip = 1; break; - } else if ((val1->nodeTab[j]->type == XML_NAMESPACE_DECL) && - (val2->nodeTab[i]->type == XML_NAMESPACE_DECL)) { - xmlNsPtr ns1, ns2; - ns1 = (xmlNsPtr) val1->nodeTab[j]; - ns2 = (xmlNsPtr) val2->nodeTab[i]; - if ((ns1->next == ns2->next) && - (xmlStrEqual(ns1->prefix, ns2->prefix))) { + } else if ((n1->type == XML_NAMESPACE_DECL) && + (n2->type == XML_NAMESPACE_DECL)) { + if ((((xmlNsPtr) n1)->next == ((xmlNsPtr) n2)->next) && + (xmlStrEqual(((xmlNsPtr) n1)->prefix, + ((xmlNsPtr) n2)->prefix))) + { skip = 1; break; } @@ -2102,13 +3705,13 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { } val1->nodeTab = temp; } - if (val2->nodeTab[i]->type == XML_NAMESPACE_DECL) { - xmlNsPtr ns = (xmlNsPtr) val2->nodeTab[i]; + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; val1->nodeTab[val1->nodeNr++] = xmlXPathNodeSetDupNs((xmlNodePtr) ns->next, ns); } else - val1->nodeTab[val1->nodeNr++] = val2->nodeTab[i]; + val1->nodeTab[val1->nodeNr++] = n2; } return(val1); @@ -2253,6 +3856,34 @@ xmlXPathFreeNodeSet(xmlNodeSetPtr obj) { } /** + * xmlXPathNodeSetClear: + * @set: the xmlNodeSetPtr to free + * + * Clears the list from all temporary XPath objects (e.g. namespace nodes + * are feed), but does *not* free the list itself. Sets the length of the + * list to 0. + */ +static void +xmlXPathNodeSetClear(xmlNodeSetPtr set) +{ + int i; + xmlNodePtr node; + + if ((set == NULL) || (set->nodeNr <= 0)) + return; + + for (i = 0; i < set->nodeNr; i++) { + node = set->nodeTab[i]; + if ((node != NULL) && + (node->type == XML_NAMESPACE_DECL)) + { + xmlXPathNodeSetFreeNs((xmlNsPtr) node); + } + } + set->nodeNr = 0; +} + +/** * xmlXPathFreeValueTree: * @obj: the xmlNodeSetPtr to free * @@ -2344,6 +3975,9 @@ xmlXPathNewNodeSet(xmlNodePtr val) { ret->boolval = 0; ret->nodesetval = xmlXPathNodeSetCreate(val); /* @@ with_ns to check whether namespace nodes should be looked at @@ */ +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_NODESET); +#endif return(ret); } @@ -2370,6 +4004,9 @@ xmlXPathNewValueTree(xmlNodePtr val) { ret->boolval = 1; ret->user = (void *) val; ret->nodesetval = xmlXPathNodeSetCreate(val); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_XSLT_TREE); +#endif return(ret); } @@ -2421,6 +4058,9 @@ xmlXPathWrapNodeSet(xmlNodeSetPtr val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_NODESET; ret->nodesetval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_NODESET); +#endif return(ret); } @@ -2434,6 +4074,9 @@ xmlXPathWrapNodeSet(xmlNodeSetPtr val) { void xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj) { if (obj == NULL) return; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageReleased(NULL, obj->type); +#endif xmlFree(obj); } @@ -3070,7 +4713,7 @@ xmlXPathVariableLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, if (name == NULL) return(NULL); - return(xmlXPathObjectCopy((xmlXPathObjectPtr) + return(xmlXPathCacheObjectCopy(ctxt, (xmlXPathObjectPtr) xmlHashLookup2(ctxt->varHash, name, ns_uri))); } @@ -3197,6 +4840,9 @@ xmlXPathNewFloat(double val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_NUMBER; ret->floatval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_NUMBER); +#endif return(ret); } @@ -3220,6 +4866,9 @@ xmlXPathNewBoolean(int val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_BOOLEAN; ret->boolval = (val != 0); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_BOOLEAN); +#endif return(ret); } @@ -3246,6 +4895,9 @@ xmlXPathNewString(const xmlChar *val) { ret->stringval = xmlStrdup(val); else ret->stringval = xmlStrdup((const xmlChar *)""); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_STRING); +#endif return(ret); } @@ -3269,6 +4921,9 @@ xmlXPathWrapString (xmlChar *val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_STRING; ret->stringval = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_STRING); +#endif return(ret); } @@ -3292,6 +4947,9 @@ xmlXPathNewCString(const char *val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_STRING; ret->stringval = xmlStrdup(BAD_CAST val); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_STRING); +#endif return(ret); } @@ -3328,6 +4986,9 @@ xmlXPathWrapExternal (void *val) { memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); ret->type = XPATH_USERS; ret->user = val; +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, XPATH_USERS); +#endif return(ret); } @@ -3352,6 +5013,9 @@ xmlXPathObjectCopy(xmlXPathObjectPtr val) { return(NULL); } memcpy(ret, val , (size_t) sizeof(xmlXPathObject)); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageRequested(NULL, val->type); +#endif switch (val->type) { case XPATH_BOOLEAN: case XPATH_NUMBER: @@ -3436,8 +5100,9 @@ xmlXPathFreeObject(xmlXPathObjectPtr obj) { xmlFreeNodeList((xmlNodePtr) obj->user); } else #endif + obj->type = XPATH_XSLT_TREE; /* TODO: Just for debugging. */ if (obj->nodesetval != NULL) - xmlXPathFreeValueTree(obj->nodesetval); + xmlXPathFreeValueTree(obj->nodesetval); } else { if (obj->nodesetval != NULL) xmlXPathFreeNodeSet(obj->nodesetval); @@ -3451,8 +5116,153 @@ xmlXPathFreeObject(xmlXPathObjectPtr obj) { if (obj->stringval != NULL) xmlFree(obj->stringval); } +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageReleased(NULL, obj->type); +#endif + xmlFree(obj); +} - xmlFree(obj); +/** + * xmlXPathReleaseObject: + * @obj: the xmlXPathObjectPtr to free or to cache + * + * Depending on the state of the cache this frees the given + * XPath object or stores it in the cache. + */ +static void +xmlXPathReleaseObject(xmlXPathContextPtr ctxt, xmlXPathObjectPtr obj) +{ +#define XP_CACHE_ADD(sl, o) if (sl == NULL) { \ + sl = xmlPointerListCreate(10); if (sl == NULL) goto free_obj; } \ + if (xmlPointerListAddSize(sl, obj, 0) == -1) goto free_obj; + +#define XP_CACHE_WANTS(sl, n) ((sl == NULL) || ((sl)->number < n)) + + if (obj == NULL) + return; + if ((ctxt == NULL) || (ctxt->cache == NULL)) { + xmlXPathFreeObject(obj); + } else { + xmlXPathContextCachePtr cache = + (xmlXPathContextCachePtr) ctxt->cache; + + switch (obj->type) { + case XPATH_NODESET: + case XPATH_XSLT_TREE: + if (obj->nodesetval != NULL) { + if (obj->boolval) { + /* + * It looks like the @boolval is used for + * evaluation if this an XSLT Result Tree Fragment. + * TODO: Check if this assumption is correct. + */ + obj->type = XPATH_XSLT_TREE; /* just for debugging */ + xmlXPathFreeValueTree(obj->nodesetval); + obj->nodesetval = NULL; + } else if ((obj->nodesetval->nodeMax <= 40) && + (XP_CACHE_WANTS(cache->nodesetObjs, + cache->maxNodeset))) + { + XP_CACHE_ADD(cache->nodesetObjs, obj); + goto obj_cached; + } else { + xmlXPathFreeNodeSet(obj->nodesetval); + obj->nodesetval = NULL; + } + } + break; + case XPATH_STRING: + if (obj->stringval != NULL) + xmlFree(obj->stringval); + + if (XP_CACHE_WANTS(cache->stringObjs, cache->maxString)) { + XP_CACHE_ADD(cache->stringObjs, obj); + goto obj_cached; + } + break; + case XPATH_BOOLEAN: + if (XP_CACHE_WANTS(cache->booleanObjs, cache->maxBoolean)) { + XP_CACHE_ADD(cache->booleanObjs, obj); + goto obj_cached; + } + break; + case XPATH_NUMBER: + if (XP_CACHE_WANTS(cache->numberObjs, cache->maxNumber)) { + XP_CACHE_ADD(cache->numberObjs, obj); + goto obj_cached; + } + break; +#ifdef LIBXML_XPTR_ENABLED + case XPATH_LOCATIONSET: + if (obj->user != NULL) { + xmlXPtrFreeLocationSet(obj->user); + } + goto free_obj; +#endif + default: + goto free_obj; + } + + /* + * Fallback to adding to the misc-objects slot. + */ + if (XP_CACHE_WANTS(cache->miscObjs, cache->maxMisc)) { + XP_CACHE_ADD(cache->miscObjs, obj); + } else + goto free_obj; + +obj_cached: + +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageReleased(ctxt, obj->type); +#endif + + if (obj->nodesetval != NULL) { + xmlNodeSetPtr tmpset = obj->nodesetval; + + /* + * TODO: Due to those nasty ns-nodes, we need to traverse + * the list and free the ns-nodes. + * URGENT TODO: Check if it's actually slowing things down. + * Maybe we shouldn't try to preserve the list. + */ + if (tmpset->nodeNr > 1) { + int i; + xmlNodePtr node; + + for (i = 0; i < tmpset->nodeNr; i++) { + node = tmpset->nodeTab[i]; + if ((node != NULL) && + (node->type == XML_NAMESPACE_DECL)) + { + xmlXPathNodeSetFreeNs((xmlNsPtr) node); + } + } + } else if (tmpset->nodeNr == 1) { + if ((tmpset->nodeTab[0] != NULL) && + (tmpset->nodeTab[0]->type == XML_NAMESPACE_DECL)) + xmlXPathNodeSetFreeNs((xmlNsPtr) tmpset->nodeTab[0]); + } + tmpset->nodeNr = 0; + memset(obj, 0, sizeof(xmlXPathObject)); + obj->nodesetval = tmpset; + } else + memset(obj, 0, sizeof(xmlXPathObject)); + + return; + +free_obj: + /* + * Cache is full; free the object. + */ + if (obj->nodesetval != NULL) + xmlXPathFreeNodeSet(obj->nodesetval); +#ifdef XP_DEBUG_OBJ_USAGE + xmlXPathDebugObjUsageReleased(NULL, obj->type); +#endif + xmlFree(obj); + } + return; } @@ -3540,7 +5350,8 @@ xmlXPathCastNodeSetToString (xmlNodeSetPtr ns) { if ((ns == NULL) || (ns->nodeNr == 0) || (ns->nodeTab == NULL)) return(xmlStrdup((const xmlChar *) "")); - xmlXPathNodeSetSort(ns); + if (ns->nodeNr > 1) + xmlXPathNodeSetSort(ns); return(xmlXPathCastNodeToString(ns->nodeTab[0])); } @@ -3936,8 +5747,15 @@ xmlXPathNewContext(xmlDocPtr doc) { ret->contextSize = -1; ret->proximityPosition = -1; - xmlXPathRegisterAllFunctions(ret); - +#ifdef XP_DEFAULT_CACHE_ON + if (xmlXPathContextSetCache(ret, 1, -1, 0) == -1) { + xmlXPathFreeContext(ret); + return(NULL); + } +#endif + + xmlXPathRegisterAllFunctions(ret); + return(ret); } @@ -3951,6 +5769,8 @@ void xmlXPathFreeContext(xmlXPathContextPtr ctxt) { if (ctxt == NULL) return; + if (ctxt->cache != NULL) + xmlXPathFreeCache((xmlXPathContextCachePtr) ctxt->cache); xmlXPathRegisteredNsCleanup(ctxt); xmlXPathRegisteredFuncsCleanup(ctxt); xmlXPathRegisteredVariablesCleanup(ctxt); @@ -4256,8 +6076,8 @@ xmlXPathCompareNodeSetFloat(xmlXPathParserContextPtr ctxt, int inf, int strict, if ((f == NULL) || (arg == NULL) || ((arg->type != XPATH_NODESET) && (arg->type != XPATH_XSLT_TREE))) { - xmlXPathFreeObject(arg); - xmlXPathFreeObject(f); + xmlXPathReleaseObject(ctxt->context, arg); + xmlXPathReleaseObject(ctxt->context, f); return(0); } ns = arg->nodesetval; @@ -4266,18 +6086,18 @@ xmlXPathCompareNodeSetFloat(xmlXPathParserContextPtr ctxt, int inf, int strict, str2 = xmlXPathCastNodeToString(ns->nodeTab[i]); if (str2 != NULL) { valuePush(ctxt, - xmlXPathNewString(str2)); + xmlXPathCacheNewString(ctxt->context, str2)); xmlFree(str2); xmlXPathNumberFunction(ctxt, 1); - valuePush(ctxt, xmlXPathObjectCopy(f)); + valuePush(ctxt, xmlXPathCacheObjectCopy(ctxt->context, f)); ret = xmlXPathCompareValues(ctxt, inf, strict); if (ret) break; } } } - xmlXPathFreeObject(arg); - xmlXPathFreeObject(f); + xmlXPathReleaseObject(ctxt->context, arg); + xmlXPathReleaseObject(ctxt->context, f); return(ret); } @@ -4311,8 +6131,8 @@ xmlXPathCompareNodeSetString(xmlXPathParserContextPtr ctxt, int inf, int strict, if ((s == NULL) || (arg == NULL) || ((arg->type != XPATH_NODESET) && (arg->type != XPATH_XSLT_TREE))) { - xmlXPathFreeObject(arg); - xmlXPathFreeObject(s); + xmlXPathReleaseObject(ctxt->context, arg); + xmlXPathReleaseObject(ctxt->context, s); return(0); } ns = arg->nodesetval; @@ -4321,17 +6141,17 @@ xmlXPathCompareNodeSetString(xmlXPathParserContextPtr ctxt, int inf, int strict, str2 = xmlXPathCastNodeToString(ns->nodeTab[i]); if (str2 != NULL) { valuePush(ctxt, - xmlXPathNewString(str2)); + xmlXPathCacheNewString(ctxt->context, str2)); xmlFree(str2); - valuePush(ctxt, xmlXPathObjectCopy(s)); + valuePush(ctxt, xmlXPathCacheObjectCopy(ctxt->context, s)); ret = xmlXPathCompareValues(ctxt, inf, strict); if (ret) break; } } } - xmlXPathFreeObject(arg); - xmlXPathFreeObject(s); + xmlXPathReleaseObject(ctxt->context, arg); + xmlXPathReleaseObject(ctxt->context, s); return(ret); } @@ -4575,12 +6395,12 @@ xmlXPathEqualNodeSetFloat(xmlXPathParserContextPtr ctxt, for (i=0;i<ns->nodeNr;i++) { str2 = xmlXPathCastNodeToString(ns->nodeTab[i]); if (str2 != NULL) { - valuePush(ctxt, xmlXPathNewString(str2)); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, str2)); xmlFree(str2); xmlXPathNumberFunction(ctxt, 1); val = valuePop(ctxt); v = val->floatval; - xmlXPathFreeObject(val); + xmlXPathReleaseObject(ctxt->context, val); if (!xmlXPathIsNaN(v)) { if ((!neq) && (v==f)) { ret = 1; @@ -4899,8 +6719,8 @@ xmlXPathEqualValuesCommon(xmlXPathParserContextPtr ctxt, case XPATH_XSLT_TREE: break; } - xmlXPathFreeObject(arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg1); + xmlXPathReleaseObject(ctxt->context, arg2); return(ret); } @@ -4922,9 +6742,9 @@ xmlXPathEqualValues(xmlXPathParserContextPtr ctxt) { arg1 = valuePop(ctxt); if ((arg1 == NULL) || (arg2 == NULL)) { if (arg1 != NULL) - xmlXPathFreeObject(arg1); + xmlXPathReleaseObject(ctxt->context, arg1); else - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); XP_ERROR0(XPATH_INVALID_OPERAND); } @@ -4981,8 +6801,8 @@ xmlXPathEqualValues(xmlXPathParserContextPtr ctxt) { TODO break; } - xmlXPathFreeObject(arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg1); + xmlXPathReleaseObject(ctxt->context, arg2); return(ret); } @@ -5007,9 +6827,9 @@ xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt) { arg1 = valuePop(ctxt); if ((arg1 == NULL) || (arg2 == NULL)) { if (arg1 != NULL) - xmlXPathFreeObject(arg1); + xmlXPathReleaseObject(ctxt->context, arg1); else - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); XP_ERROR0(XPATH_INVALID_OPERAND); } @@ -5018,7 +6838,7 @@ xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt) { xmlGenericError(xmlGenericErrorContext, "NotEqual: by pointer\n"); #endif - xmlXPathFreeObject(arg1); + xmlXPathReleaseObject(ctxt->context, arg1); return(0); } @@ -5066,8 +6886,8 @@ xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt) { TODO break; } - xmlXPathFreeObject(arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg1); + xmlXPathReleaseObject(ctxt->context, arg2); return(ret); } @@ -5108,9 +6928,9 @@ xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict) { arg1 = valuePop(ctxt); if ((arg1 == NULL) || (arg2 == NULL)) { if (arg1 != NULL) - xmlXPathFreeObject(arg1); + xmlXPathReleaseObject(ctxt->context, arg1); else - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); XP_ERROR0(XPATH_INVALID_OPERAND); } @@ -5152,8 +6972,8 @@ xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict) { arg2 = valuePop(ctxt); } if (arg2->type != XPATH_NUMBER) { - xmlXPathFreeObject(arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg1); + xmlXPathReleaseObject(ctxt->context, arg2); XP_ERROR0(XPATH_INVALID_OPERAND); } /* @@ -5205,8 +7025,8 @@ xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict) { } } } - xmlXPathFreeObject(arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg1); + xmlXPathReleaseObject(ctxt->context, arg2); return(ret); } @@ -5256,8 +7076,7 @@ xmlXPathAddValues(xmlXPathParserContextPtr ctxt) { if (arg == NULL) XP_ERROR(XPATH_INVALID_OPERAND); val = xmlXPathCastToNumber(arg); - xmlXPathFreeObject(arg); - + xmlXPathReleaseObject(ctxt->context, arg); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); ctxt->value->floatval += val; @@ -5280,8 +7099,7 @@ xmlXPathSubValues(xmlXPathParserContextPtr ctxt) { if (arg == NULL) XP_ERROR(XPATH_INVALID_OPERAND); val = xmlXPathCastToNumber(arg); - xmlXPathFreeObject(arg); - + xmlXPathReleaseObject(ctxt->context, arg); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); ctxt->value->floatval -= val; @@ -5304,8 +7122,7 @@ xmlXPathMultValues(xmlXPathParserContextPtr ctxt) { if (arg == NULL) XP_ERROR(XPATH_INVALID_OPERAND); val = xmlXPathCastToNumber(arg); - xmlXPathFreeObject(arg); - + xmlXPathReleaseObject(ctxt->context, arg); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); ctxt->value->floatval *= val; @@ -5328,8 +7145,7 @@ xmlXPathDivValues(xmlXPathParserContextPtr ctxt) { if (arg == NULL) XP_ERROR(XPATH_INVALID_OPERAND); val = xmlXPathCastToNumber(arg); - xmlXPathFreeObject(arg); - + xmlXPathReleaseObject(ctxt->context, arg); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); if (xmlXPathIsNaN(val) || xmlXPathIsNaN(ctxt->value->floatval)) @@ -5370,8 +7186,7 @@ xmlXPathModValues(xmlXPathParserContextPtr ctxt) { if (arg == NULL) XP_ERROR(XPATH_INVALID_OPERAND); arg2 = xmlXPathCastToNumber(arg); - xmlXPathFreeObject(arg); - + xmlXPathReleaseObject(ctxt->context, arg); CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); arg1 = ctxt->value->floatval; @@ -5396,6 +7211,17 @@ xmlXPathModValues(xmlXPathParserContextPtr ctxt) { typedef xmlNodePtr (*xmlXPathTraversalFunction) (xmlXPathParserContextPtr ctxt, xmlNodePtr cur); +/* + * xmlXPathTraversalFunctionExt: + * A traversal function enumerates nodes along an axis. + * Initially it must be called with NULL, and it indicates + * termination on the axis by returning NULL. + * The context node of the traversal is specified via @contextNode. + */ +typedef xmlNodePtr (*xmlXPathTraversalFunctionExt) + (xmlNodePtr cur, xmlNodePtr contextNode); + + /** * xmlXPathNextSelf: * @ctxt: the XPath Parser context @@ -5466,6 +7292,157 @@ xmlXPathNextChild(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { } /** + * xmlXPathNextChildElement: + * @ctxt: the XPath Parser context + * @cur: the current node in the traversal + * + * Traversal function for the "child" direction and nodes of type element. + * The child axis contains the children of the context node in document order. + * + * Returns the next element following that axis + */ +static xmlNodePtr +xmlXPathNextChildElement(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { + if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); + if (cur == NULL) { + cur = ctxt->context->node; + if (cur == NULL) return(NULL); + /* + * Get the first element child. + */ + switch (cur->type) { + case XML_ELEMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ENTITY_REF_NODE: /* URGENT TODO: entify-refs as well? */ + case XML_ENTITY_NODE: + cur = cur->children; + if (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) + return(cur); + do { + cur = cur->next; + } while ((cur != NULL) && + (cur->type != XML_ELEMENT_NODE)); + return(cur); + } + return(NULL); + case XML_DOCUMENT_NODE: + case XML_HTML_DOCUMENT_NODE: +#ifdef LIBXML_DOCB_ENABLED + case XML_DOCB_DOCUMENT_NODE: +#endif + return(xmlDocGetRootElement((xmlDocPtr) cur)); + default: + return(NULL); + } + return(NULL); + } + /* + * Get the next sibling element node. + */ + switch (cur->type) { + case XML_ELEMENT_NODE: + case XML_TEXT_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_XINCLUDE_END: + break; + /* case XML_DTD_NODE: */ /* URGENT TODO: DTD-node as well? */ + default: + return(NULL); + } + if (cur->next != NULL) { + if (cur->next->type == XML_ELEMENT_NODE) + return(cur->next); + cur = cur->next; + do { + cur = cur->next; + } while ((cur != NULL) && (cur->type != XML_ELEMENT_NODE)); + return(cur); + } + return(NULL); +} + +/** + * xmlXPathNextDescendantOrSelfElemParent: + * @ctxt: the XPath Parser context + * @cur: the current node in the traversal + * + * Traversal function for the "descendant-or-self" axis. + * Additionally it returns only nodes which can be parents of + * element nodes. + * + * + * Returns the next element following that axis + */ +static xmlNodePtr +xmlXPathNextDescendantOrSelfElemParent(xmlNodePtr cur, + xmlNodePtr contextNode) +{ + if (cur == NULL) { + if (contextNode == NULL) + return(NULL); + switch (contextNode->type) { + case XML_ELEMENT_NODE: + case XML_XINCLUDE_START: + case XML_DOCUMENT_FRAG_NODE: + case XML_DOCUMENT_NODE: +#ifdef LIBXML_DOCB_ENABLED + case XML_DOCB_DOCUMENT_NODE: +#endif + case XML_HTML_DOCUMENT_NODE: + return(contextNode); + default: + return(NULL); + } + return(NULL); + } else { + xmlNodePtr start = cur; + + while (cur != NULL) { + switch (cur->type) { + case XML_ELEMENT_NODE: + /* TODO: OK to have XInclude here? */ + case XML_XINCLUDE_START: + case XML_DOCUMENT_FRAG_NODE: + if (cur != start) + return(cur); + if (cur->children != NULL) { + cur = cur->children; + continue; + } + break; +#ifdef LIBXML_DOCB_ENABLED + /* Not sure if we need those here. */ + case XML_DOCUMENT_NODE: + case XML_DOCB_DOCUMENT_NODE: +#endif + case XML_HTML_DOCUMENT_NODE: + if (cur != start) + return(cur); + return(xmlDocGetRootElement((xmlDocPtr) cur)); + default: + break; + } + +next_sibling: + if ((cur == NULL) || (cur == contextNode)) + return(NULL); + if (cur->next != NULL) { + cur = cur->next; + } else { + cur = cur->parent; + goto next_sibling; + } + } + } + return(NULL); +} + +/** * xmlXPathNextDescendant: * @ctxt: the XPath Parser context * @cur: the current node in the traversal @@ -6051,9 +8028,11 @@ xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { */ void xmlXPathRoot(xmlXPathParserContextPtr ctxt) { - if ((ctxt == NULL) || (ctxt->context == NULL)) return; + if ((ctxt == NULL) || (ctxt->context == NULL)) + return; ctxt->context->node = (xmlNodePtr) ctxt->context->doc; - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); } /************************************************************************ @@ -6077,7 +8056,9 @@ void xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(0); if (ctxt->context->contextSize >= 0) { - valuePush(ctxt, xmlXPathNewFloat((double) ctxt->context->contextSize)); + valuePush(ctxt, + xmlXPathCacheNewFloat(ctxt->context, + (double) ctxt->context->contextSize)); #ifdef DEBUG_EXPR xmlGenericError(xmlGenericErrorContext, "last() : %d\n", ctxt->context->contextSize); @@ -6103,7 +8084,8 @@ xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(0); if (ctxt->context->proximityPosition >= 0) { valuePush(ctxt, - xmlXPathNewFloat((double) ctxt->context->proximityPosition)); + xmlXPathCacheNewFloat(ctxt->context, + (double) ctxt->context->proximityPosition)); #ifdef DEBUG_EXPR xmlGenericError(xmlGenericErrorContext, "position() : %d\n", ctxt->context->proximityPosition); @@ -6133,13 +8115,14 @@ xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs) { cur = valuePop(ctxt); if ((cur == NULL) || (cur->nodesetval == NULL)) - valuePush(ctxt, xmlXPathNewFloat((double) 0)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, (double) 0)); else if ((cur->type == XPATH_NODESET) || (cur->type == XPATH_XSLT_TREE)) { - valuePush(ctxt, xmlXPathNewFloat((double) cur->nodesetval->nodeNr)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, + (double) cur->nodesetval->nodeNr)); } else { if ((cur->nodesetval->nodeNr != 1) || (cur->nodesetval->nodeTab == NULL)) { - valuePush(ctxt, xmlXPathNewFloat((double) 0)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, (double) 0)); } else { xmlNodePtr tmp; int i = 0; @@ -6152,10 +8135,10 @@ xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs) { i++; } } - valuePush(ctxt, xmlXPathNewFloat((double) i)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, (double) i)); } } - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, cur); } /** @@ -6257,17 +8240,14 @@ xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs) { xmlFree(tokens); } } - - xmlXPathFreeObject(obj); - valuePush(ctxt, xmlXPathWrapNodeSet(ret)); + xmlXPathReleaseObject(ctxt->context, obj); + valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, ret)); return; } - obj = xmlXPathConvertString(obj); - + obj = xmlXPathCacheConvertString(ctxt->context, obj); ret = xmlXPathGetElementsByIds(ctxt->context->doc, obj->stringval); - valuePush(ctxt, xmlXPathWrapNodeSet(ret)); - - xmlXPathFreeObject(obj); + valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, ret)); + xmlXPathReleaseObject(ctxt->context, obj); return; } @@ -6291,7 +8271,8 @@ xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs) { if (ctxt == NULL) return; if (nargs == 0) { - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); nargs = 1; } @@ -6303,7 +8284,7 @@ xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs) { cur = valuePop(ctxt); if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr == 0)) { - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); } else { int i = 0; /* Should be first in document order !!!!! */ switch (cur->nodesetval->nodeTab[i]->type) { @@ -6311,20 +8292,21 @@ xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs) { case XML_ATTRIBUTE_NODE: case XML_PI_NODE: if (cur->nodesetval->nodeTab[i]->name[0] == ' ') - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); else valuePush(ctxt, - xmlXPathNewString(cur->nodesetval->nodeTab[i]->name)); + xmlXPathCacheNewString(ctxt->context, + cur->nodesetval->nodeTab[i]->name)); break; case XML_NAMESPACE_DECL: - valuePush(ctxt, xmlXPathNewString( + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, ((xmlNsPtr)cur->nodesetval->nodeTab[i])->prefix)); break; default: - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); } } - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, cur); } /** @@ -6348,7 +8330,8 @@ xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs) { if (ctxt == NULL) return; if (nargs == 0) { - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); nargs = 1; } CHECK_ARITY(1); @@ -6359,23 +8342,23 @@ xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs) { cur = valuePop(ctxt); if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr == 0)) { - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); } else { int i = 0; /* Should be first in document order !!!!! */ switch (cur->nodesetval->nodeTab[i]->type) { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: if (cur->nodesetval->nodeTab[i]->ns == NULL) - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); else - valuePush(ctxt, xmlXPathNewString( + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, cur->nodesetval->nodeTab[i]->ns->href)); break; default: - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); } } - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, cur); } /** @@ -6406,7 +8389,8 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlXPathObjectPtr cur; if (nargs == 0) { - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); nargs = 1; } @@ -6418,7 +8402,7 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) cur = valuePop(ctxt); if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr == 0)) { - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); } else { int i = 0; /* Should be first in document order !!!!! */ @@ -6426,12 +8410,13 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: if (cur->nodesetval->nodeTab[i]->name[0] == ' ') - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, + xmlXPathCacheNewCString(ctxt->context, "")); else if ((cur->nodesetval->nodeTab[i]->ns == NULL) || (cur->nodesetval->nodeTab[i]->ns->prefix == NULL)) { - valuePush(ctxt, - xmlXPathNewString(cur->nodesetval->nodeTab[i]->name)); - + valuePush(ctxt, + xmlXPathCacheNewString(ctxt->context, + cur->nodesetval->nodeTab[i]->name)); } else { xmlChar *fullname; @@ -6443,16 +8428,17 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) if (fullname == NULL) { XP_ERROR(XPATH_MEMORY_ERROR); } - valuePush(ctxt, xmlXPathWrapString(fullname)); + valuePush(ctxt, xmlXPathCacheWrapString( + ctxt->context, fullname)); } break; default: - valuePush(ctxt, - xmlXPathNewNodeSet(cur->nodesetval->nodeTab[i])); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + cur->nodesetval->nodeTab[i])); xmlXPathLocalNameFunction(ctxt, 1); } } - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, cur); } @@ -6498,17 +8484,16 @@ xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs) { if (ctxt == NULL) return; if (nargs == 0) { - valuePush(ctxt, - xmlXPathWrapString( - xmlXPathCastNodeToString(ctxt->context->node))); + valuePush(ctxt, + xmlXPathCacheWrapString(ctxt->context, + xmlXPathCastNodeToString(ctxt->context->node))); return; } CHECK_ARITY(1); cur = valuePop(ctxt); if (cur == NULL) XP_ERROR(XPATH_INVALID_OPERAND); - cur = xmlXPathConvertString(cur); - valuePush(ctxt, cur); + valuePush(ctxt, xmlXPathCacheConvertString(ctxt->context, cur)); } /** @@ -6531,12 +8516,13 @@ xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs) { if ((ctxt == NULL) || (ctxt->context == NULL)) return; if (ctxt->context->node == NULL) { - valuePush(ctxt, xmlXPathNewFloat(0)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, 0)); } else { xmlChar *content; content = xmlXPathCastNodeToString(ctxt->context->node); - valuePush(ctxt, xmlXPathNewFloat(xmlUTF8Strlen(content))); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, + xmlUTF8Strlen(content))); xmlFree(content); } return; @@ -6545,8 +8531,9 @@ xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs) { CAST_TO_STRING; CHECK_TYPE(XPATH_STRING); cur = valuePop(ctxt); - valuePush(ctxt, xmlXPathNewFloat(xmlUTF8Strlen(cur->stringval))); - xmlXPathFreeObject(cur); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, + xmlUTF8Strlen(cur->stringval))); + xmlXPathReleaseObject(ctxt->context, cur); } /** @@ -6571,7 +8558,7 @@ xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs) { CAST_TO_STRING; cur = valuePop(ctxt); if ((cur == NULL) || (cur->type != XPATH_STRING)) { - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, cur); return; } nargs--; @@ -6580,15 +8567,14 @@ xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs) { CAST_TO_STRING; newobj = valuePop(ctxt); if ((newobj == NULL) || (newobj->type != XPATH_STRING)) { - xmlXPathFreeObject(newobj); - xmlXPathFreeObject(cur); + xmlXPathReleaseObject(ctxt->context, newobj); + xmlXPathReleaseObject(ctxt->context, cur); XP_ERROR(XPATH_INVALID_TYPE); } tmp = xmlStrcat(newobj->stringval, cur->stringval); newobj->stringval = cur->stringval; cur->stringval = tmp; - - xmlXPathFreeObject(newobj); + xmlXPathReleaseObject(ctxt->context, newobj); nargs--; } valuePush(ctxt, cur); @@ -6614,17 +8600,18 @@ xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs) { needle = valuePop(ctxt); CAST_TO_STRING; hay = valuePop(ctxt); + if ((hay == NULL) || (hay->type != XPATH_STRING)) { - xmlXPathFreeObject(hay); - xmlXPathFreeObject(needle); + xmlXPathReleaseObject(ctxt->context, hay); + xmlXPathReleaseObject(ctxt->context, needle); XP_ERROR(XPATH_INVALID_TYPE); } if (xmlStrstr(hay->stringval, needle->stringval)) - valuePush(ctxt, xmlXPathNewBoolean(1)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 1)); else - valuePush(ctxt, xmlXPathNewBoolean(0)); - xmlXPathFreeObject(hay); - xmlXPathFreeObject(needle); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 0)); + xmlXPathReleaseObject(ctxt->context, hay); + xmlXPathReleaseObject(ctxt->context, needle); } /** @@ -6648,18 +8635,19 @@ xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs) { needle = valuePop(ctxt); CAST_TO_STRING; hay = valuePop(ctxt); + if ((hay == NULL) || (hay->type != XPATH_STRING)) { - xmlXPathFreeObject(hay); - xmlXPathFreeObject(needle); + xmlXPathReleaseObject(ctxt->context, hay); + xmlXPathReleaseObject(ctxt->context, needle); XP_ERROR(XPATH_INVALID_TYPE); } n = xmlStrlen(needle->stringval); if (xmlStrncmp(hay->stringval, needle->stringval, n)) - valuePush(ctxt, xmlXPathNewBoolean(0)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 0)); else - valuePush(ctxt, xmlXPathNewBoolean(1)); - xmlXPathFreeObject(hay); - xmlXPathFreeObject(needle); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 1)); + xmlXPathReleaseObject(ctxt->context, hay); + xmlXPathReleaseObject(ctxt->context, needle); } /** @@ -6711,14 +8699,14 @@ xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_TYPE(XPATH_NUMBER); len = valuePop(ctxt); le = len->floatval; - xmlXPathFreeObject(len); + xmlXPathReleaseObject(ctxt->context, len); } CAST_TO_NUMBER; CHECK_TYPE(XPATH_NUMBER); start = valuePop(ctxt); in = start->floatval; - xmlXPathFreeObject(start); + xmlXPathReleaseObject(ctxt->context, start); CAST_TO_STRING; CHECK_TYPE(XPATH_STRING); str = valuePop(ctxt); @@ -6777,15 +8765,13 @@ xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) { else { ret = NULL; } - if (ret == NULL) - valuePush(ctxt, xmlXPathNewCString("")); + valuePush(ctxt, xmlXPathCacheNewCString(ctxt->context, "")); else { - valuePush(ctxt, xmlXPathNewString(ret)); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, ret)); xmlFree(ret); } - - xmlXPathFreeObject(str); + xmlXPathReleaseObject(ctxt->context, str); } /** @@ -6822,12 +8808,12 @@ xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs) { offset = (int)(point - str->stringval); xmlBufferAdd(target, str->stringval, offset); } - valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, + xmlBufferContent(target))); xmlBufferFree(target); } - - xmlXPathFreeObject(str); - xmlXPathFreeObject(find); + xmlXPathReleaseObject(ctxt->context, str); + xmlXPathReleaseObject(ctxt->context, find); } /** @@ -6866,12 +8852,12 @@ xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs) { xmlBufferAdd(target, &str->stringval[offset], xmlStrlen(str->stringval) - offset); } - valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, + xmlBufferContent(target))); xmlBufferFree(target); } - - xmlXPathFreeObject(str); - xmlXPathFreeObject(find); + xmlXPathReleaseObject(ctxt->context, str); + xmlXPathReleaseObject(ctxt->context, find); } /** @@ -6898,9 +8884,9 @@ xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { if (ctxt == NULL) return; if (nargs == 0) { /* Use current context node */ - valuePush(ctxt, - xmlXPathWrapString( - xmlXPathCastNodeToString(ctxt->context->node))); + valuePush(ctxt, + xmlXPathCacheWrapString(ctxt->context, + xmlXPathCastNodeToString(ctxt->context->node))); nargs = 1; } @@ -6931,11 +8917,11 @@ xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs) { } source++; } - - valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, + xmlBufferContent(target))); xmlBufferFree(target); } - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); } /** @@ -7014,11 +9000,12 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { } } } - valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, + xmlBufferContent(target))); xmlBufferFree(target); - xmlXPathFreeObject(str); - xmlXPathFreeObject(from); - xmlXPathFreeObject(to); + xmlXPathReleaseObject(ctxt->context, str); + xmlXPathReleaseObject(ctxt->context, from); + xmlXPathReleaseObject(ctxt->context, to); } /** @@ -7041,7 +9028,7 @@ xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(1); cur = valuePop(ctxt); if (cur == NULL) XP_ERROR(XPATH_INVALID_OPERAND); - cur = xmlXPathConvertBoolean(cur); + cur = xmlXPathCacheConvertBoolean(ctxt->context, cur); valuePush(ctxt, cur); } @@ -7074,7 +9061,7 @@ xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs) { void xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(0); - valuePush(ctxt, xmlXPathNewBoolean(1)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 1)); } /** @@ -7088,7 +9075,7 @@ xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs) { void xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(0); - valuePush(ctxt, xmlXPathNewBoolean(0)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, 0)); } /** @@ -7136,8 +9123,9 @@ xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs) { not_equal: if (theLang != NULL) xmlFree((void *)theLang); - xmlXPathFreeObject(val); - valuePush(ctxt, xmlXPathNewBoolean(ret)); + + xmlXPathReleaseObject(ctxt->context, val); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret)); } /** @@ -7156,12 +9144,12 @@ xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) { if (ctxt == NULL) return; if (nargs == 0) { if (ctxt->context->node == NULL) { - valuePush(ctxt, xmlXPathNewFloat(0.0)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, 0.0)); } else { xmlChar* content = xmlNodeGetContent(ctxt->context->node); res = xmlXPathStringEvalNumber(content); - valuePush(ctxt, xmlXPathNewFloat(res)); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, res)); xmlFree(content); } return; @@ -7169,8 +9157,7 @@ xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) { CHECK_ARITY(1); cur = valuePop(ctxt); - cur = xmlXPathConvertNumber(cur); - valuePush(ctxt, cur); + valuePush(ctxt, xmlXPathCacheConvertNumber(ctxt->context, cur)); } /** @@ -7201,8 +9188,8 @@ xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs) { res += xmlXPathCastNodeToNumber(cur->nodesetval->nodeTab[i]); } } - valuePush(ctxt, xmlXPathNewFloat(res)); - xmlXPathFreeObject(cur); + valuePush(ctxt, xmlXPathCacheNewFloat(ctxt->context, res)); + xmlXPathReleaseObject(ctxt->context, cur); } /* @@ -7331,7 +9318,7 @@ xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs) { * a few forward declarations since we use a recursive call based * implementation. */ -static void xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt); +static void xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt, int sort); static void xmlXPathCompPredicate(xmlXPathParserContextPtr ctxt, int filter); static void xmlXPathCompLocationPath(xmlXPathParserContextPtr ctxt); static void xmlXPathCompRelativeLocationPath(xmlXPathParserContextPtr ctxt); @@ -7810,7 +9797,7 @@ xmlXPathCompNumber(xmlXPathParserContextPtr ctxt) ret *= pow(10.0, (double) exponent); } PUSH_LONG_EXPR(XPATH_OP_VALUE, XPATH_NUMBER, 0, 0, - xmlXPathNewFloat(ret), NULL); + xmlXPathCacheNewFloat(ctxt->context, ret), NULL); } /** @@ -7900,7 +9887,7 @@ xmlXPathCompLiteral(xmlXPathParserContextPtr ctxt) { } if (ret == NULL) return; PUSH_LONG_EXPR(XPATH_OP_VALUE, XPATH_STRING, 0, 0, - xmlXPathNewString(ret), NULL); + xmlXPathCacheNewString(ctxt->context, ret), NULL); xmlFree(ret); } @@ -7988,6 +9975,7 @@ xmlXPathCompFunctionCall(xmlXPathParserContextPtr ctxt) { xmlChar *name; xmlChar *prefix; int nbargs = 0; + int sort = 1; name = xmlXPathParseQName(ctxt, &prefix); if (name == NULL) { @@ -8009,12 +9997,20 @@ xmlXPathCompFunctionCall(xmlXPathParserContextPtr ctxt) { NEXT; SKIP_BLANKS; + /* + * Optimization for count(): we don't need the node-set to be sorted. + */ + if ((prefix == NULL) && (name[0] == 'c') && + xmlStrEqual(name, BAD_CAST "count")) + { + sort = 0; + } ctxt->comp->last = -1; if (CUR != ')') { while (CUR != 0) { int op1 = ctxt->comp->last; ctxt->comp->last = -1; - xmlXPathCompileExpr(ctxt); + xmlXPathCompileExpr(ctxt, sort); CHECK_ERROR; PUSH_BINARY_EXPR(XPATH_OP_ARG, op1, ctxt->comp->last, 0, 0); nbargs++; @@ -8051,7 +10047,7 @@ xmlXPathCompPrimaryExpr(xmlXPathParserContextPtr ctxt) { else if (CUR == '(') { NEXT; SKIP_BLANKS; - xmlXPathCompileExpr(ctxt); + xmlXPathCompileExpr(ctxt, 1); CHECK_ERROR; if (CUR != ')') { XP_ERROR(XPATH_EXPR_ERROR); @@ -8559,7 +10555,7 @@ xmlXPathCompAndExpr(xmlXPathParserContextPtr ctxt) { * Parse and compile an expression */ static void -xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt) { +xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt, int sort) { xmlXPathCompAndExpr(ctxt); CHECK_ERROR; SKIP_BLANKS; @@ -8573,8 +10569,13 @@ xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt) { op1 = ctxt->comp->nbStep; SKIP_BLANKS; } - if (ctxt->comp->steps[ctxt->comp->last].op != XPATH_OP_VALUE) { + if ((sort) && (ctxt->comp->steps[ctxt->comp->last].op != XPATH_OP_VALUE)) { /* more ops could be optimized too */ + /* + * This is the main place to eliminate sorting for + * operations which don't require a sorted node-set. + * E.g. count(). + */ PUSH_UNARY_EXPR(XPATH_OP_SORT, ctxt->comp->last , 0, 0); } } @@ -8601,7 +10602,7 @@ xmlXPathCompPredicate(xmlXPathParserContextPtr ctxt, int filter) { SKIP_BLANKS; ctxt->comp->last = -1; - xmlXPathCompileExpr(ctxt); + xmlXPathCompileExpr(ctxt, 1); CHECK_ERROR; if (CUR != ']') { @@ -8893,7 +10894,7 @@ xmlXPathCompStep(xmlXPathParserContextPtr ctxt) { NEXT; SKIP_BLANKS; - xmlXPathCompileExpr(ctxt); + xmlXPathCompileExpr(ctxt, 1); /* PUSH_BINARY_EXPR(XPATH_OP_RANGETO, op2, ctxt->comp->last, 0, 0); */ CHECK_ERROR; @@ -9119,32 +11120,41 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, const xmlChar *URI = NULL; #ifdef DEBUG_STEP - int n = 0; + int nbMatches = 0; #endif - int i, t = 0; - xmlNodeSetPtr ret, list; + int inputIdx, total = 0, specialNodeInSet = 0; + xmlNodeSetPtr inputList, resultList, list; xmlXPathTraversalFunction next = NULL; + xmlXPathTraversalFunctionExt compoundNext = NULL; void (*addNode) (xmlNodeSetPtr, xmlNodePtr); xmlNodeSetPtr (*mergeNodeSet) (xmlNodeSetPtr, xmlNodeSetPtr); - xmlNodePtr cur = NULL; + xmlNodePtr oldContextNode, contextNode, cur, compoundContextNode; xmlXPathObjectPtr obj; - xmlNodeSetPtr nodelist; - xmlNodePtr tmp; + xmlXPathContextPtr xpctxt = ctxt->context; CHECK_TYPE0(XPATH_NODESET); obj = valuePop(ctxt); - addNode = xmlXPathNodeSetAdd; - mergeNodeSet = xmlXPathNodeSetMerge; + + /* + * Setup wrt namespaces. + */ if (prefix != NULL) { - URI = xmlXPathNsLookup(ctxt->context, prefix); + URI = xmlXPathNsLookup(xpctxt, prefix); if (URI == NULL) { xmlXPathFreeObject(obj); XP_ERROR0(XPATH_UNDEF_PREFIX_ERROR); } } + #ifdef DEBUG_STEP xmlGenericError(xmlGenericErrorContext, "new step : "); #endif + + /* + * Setup wrt the axis. + */ + addNode = xmlXPathNodeSetAdd; + mergeNodeSet = xmlXPathNodeSetMerge; switch (axis) { case AXIS_ANCESTOR: #ifdef DEBUG_STEP @@ -9175,7 +11185,20 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, xmlGenericError(xmlGenericErrorContext, "axis 'child' "); #endif last = NULL; - next = xmlXPathNextChild; + if (op->rewriteType == XP_REWRITE_DOS_CHILD_ELEM) { + /* + * This iterator will give us only nodes which can + * hold element nodes. + */ + compoundNext = xmlXPathNextDescendantOrSelfElemParent; + } + if ((test == NODE_TEST_NAME) && (type == NODE_TYPE_NODE)) { + /* + * Optimization if an element node type is 'element'. + */ + next = xmlXPathNextChildElement; + } else + next = xmlXPathNextChild; mergeNodeSet = xmlXPathNodeSetMergeUnique; break; case AXIS_DESCENDANT: @@ -9250,18 +11273,17 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, break; } if (next == NULL) { - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(xpctxt, obj); return(0); } - nodelist = obj->nodesetval; - if (nodelist == NULL) { - xmlXPathFreeObject(obj); - valuePush(ctxt, xmlXPathWrapNodeSet(NULL)); + inputList = obj->nodesetval; + if ((inputList == NULL) || (inputList->nodeNr <= 0)) { + xmlXPathReleaseObject(xpctxt, obj); + valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, NULL)); return(0); - } - addNode = xmlXPathNodeSetAddUnique; - ret = NULL; + } + #ifdef DEBUG_STEP xmlGenericError(xmlGenericErrorContext, " context contains %d nodes\n", nodelist->nodeNr); @@ -9307,37 +11329,87 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, * principal node type. For example, child::* will * select all element children of the context node */ - tmp = ctxt->context->node; - for (i = 0; i < nodelist->nodeNr; i++) { - ctxt->context->node = nodelist->nodeTab[i]; - - cur = NULL; - list = xmlXPathNodeSetCreate(NULL); + oldContextNode = xpctxt->node; + addNode = xmlXPathNodeSetAddUnique; + resultList = NULL; + list = NULL; + compoundContextNode = NULL; + contextNode = NULL; + inputIdx = 0; + + while ((inputIdx < inputList->nodeNr) || (contextNode != NULL)) { + if (compoundNext != NULL) { + /* + * This is a compound traversal. + */ + if (contextNode == NULL) { + /* + * Set the context for the initial traversal. + */ + compoundContextNode = inputList->nodeTab[inputIdx++]; + contextNode = compoundNext(NULL, compoundContextNode); + } else + contextNode = compoundNext(contextNode, compoundContextNode); + if (contextNode == NULL) + continue; + /* + * Set the context for the main traversal. + */ + xpctxt->node = contextNode; + } else + xpctxt->node = inputList->nodeTab[inputIdx++]; + + if (list == NULL) { + list = xmlXPathNodeSetCreate(NULL); + if (list == NULL) { + total = 0; + goto error; + } + } + cur = NULL; + specialNodeInSet = 0; do { cur = next(ctxt, cur); if (cur == NULL) break; - if ((first != NULL) && (*first == cur)) - break; - if (((t % 256) == 0) && - (first != NULL) && (*first != NULL) && - (xmlXPathCmpNodes(*first, cur) >= 0)) - break; - if ((last != NULL) && (*last == cur)) - break; - if (((t % 256) == 0) && - (last != NULL) && (*last != NULL) && - (xmlXPathCmpNodes(cur, *last) >= 0)) - break; - t++; + + if (first != NULL) { + if (*first == cur) + break; + if ((*first != NULL) && + ((total % 256) == 0) && +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON + (xmlXPathCmpNodesExt(*first, cur) >= 0)) +#else + (xmlXPathCmpNodes(*first, cur) >= 0)) +#endif + { + break; + } + } + if (last != NULL) { + if (*last == cur) + break; + if ((*last != NULL) && + ((total % 256) == 0) && +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON + (xmlXPathCmpNodesExt(cur, *last) >= 0)) +#else + (xmlXPathCmpNodes(cur, *last) >= 0)) +#endif + { + break; + } + } + + total++; #ifdef DEBUG_STEP xmlGenericError(xmlGenericErrorContext, " %s", cur->name); #endif switch (test) { - case NODE_TEST_NONE: - ctxt->context->node = tmp; - xmlXPathFreeObject(obj); - STRANGE return(t); + case NODE_TEST_NONE: + STRANGE + goto error; case NODE_TEST_TYPE: if ((cur->type == type) || ((type == NODE_TYPE_NODE) && @@ -9351,20 +11423,26 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, (cur->type == XML_CDATA_SECTION_NODE) || (cur->type == XML_TEXT_NODE))) || ((type == NODE_TYPE_TEXT) && - (cur->type == XML_CDATA_SECTION_NODE))) { + (cur->type == XML_CDATA_SECTION_NODE))) + { #ifdef DEBUG_STEP - n++; -#endif + nbMatches++; +#endif + if (cur->type == XML_NAMESPACE_DECL) + specialNodeInSet = 1; + /* + * TODO: Don't we need to use xmlXPathNodeSetAddNs() + * for namespace nodes here ? + */ addNode(list, cur); } break; case NODE_TEST_PI: - if (cur->type == XML_PI_NODE) { - if ((name != NULL) && - (!xmlStrEqual(name, cur->name))) - break; + if ((cur->type == XML_PI_NODE) && + ((name == NULL) || xmlStrEqual(name, cur->name))) + { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } @@ -9373,29 +11451,31 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, if (axis == AXIS_ATTRIBUTE) { if (cur->type == XML_ATTRIBUTE_NODE) { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } } else if (axis == AXIS_NAMESPACE) { if (cur->type == XML_NAMESPACE_DECL) { #ifdef DEBUG_STEP - n++; -#endif - xmlXPathNodeSetAddNs(list, ctxt->context->node, - (xmlNsPtr) cur); + nbMatches++; +#endif + specialNodeInSet = 1; + xmlXPathNodeSetAddNs(list, xpctxt->node, + (xmlNsPtr) cur); } } else { if (cur->type == XML_ELEMENT_NODE) { if (prefix == NULL) { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } else if ((cur->ns != NULL) && - (xmlStrEqual(URI, cur->ns->href))) { + (xmlStrEqual(URI, cur->ns->href))) + { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } @@ -9409,20 +11489,21 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, case NODE_TEST_NAME: switch (cur->type) { case XML_ELEMENT_NODE: - if (xmlStrEqual(name, cur->name)) { + if (xmlStrEqual(name, cur->name)) { if (prefix == NULL) { if (cur->ns == NULL) { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } } else { if ((cur->ns != NULL) && (xmlStrEqual(URI, - cur->ns->href))) { + cur->ns->href))) + { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, cur); } @@ -9437,7 +11518,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, if ((attr->ns == NULL) || (attr->ns->prefix == NULL)) { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, (xmlNodePtr) attr); @@ -9446,9 +11527,10 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, if ((attr->ns != NULL) && (xmlStrEqual(URI, attr->ns-> - href))) { + href))) + { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif addNode(list, (xmlNodePtr) attr); @@ -9462,21 +11544,22 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, xmlNsPtr ns = (xmlNsPtr) cur; if ((ns->prefix != NULL) && (name != NULL) - && (xmlStrEqual(ns->prefix, name))) { + && (xmlStrEqual(ns->prefix, name))) + { #ifdef DEBUG_STEP - n++; + nbMatches++; #endif + specialNodeInSet = 1; xmlXPathNodeSetAddNs(list, - ctxt->context->node, (xmlNsPtr) cur); + xpctxt->node, (xmlNsPtr) cur); } } break; default: break; - } - break; - break; - } + } /* switch (cur->type) */ + break; /* case NODE_TEST_NAME: */ + } /* switch (test) */ } while (cur != NULL); /* @@ -9485,48 +11568,84 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, if ((op->ch2 != -1) && (list != NULL) && (list->nodeNr > 0)) { xmlXPathObjectPtr obj2; - valuePush(ctxt, xmlXPathWrapNodeSet(list)); + valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, list)); xmlXPathCompOpEval(ctxt, &ctxt->comp->steps[op->ch2]); CHECK_TYPE0(XPATH_NODESET); obj2 = valuePop(ctxt); list = obj2->nodesetval; obj2->nodesetval = NULL; - xmlXPathFreeObject(obj2); + xmlXPathReleaseObject(xpctxt, obj2); + if (ctxt->error != XPATH_EXPRESSION_OK) { - xmlXPathFreeObject(obj); - xmlXPathFreeNodeSet(list); - return(0); + total = 0; + goto error; } } - if (ret == NULL) { - ret = list; - } else { - ret = mergeNodeSet(ret, list); - xmlXPathFreeNodeSet(list); + if (resultList == NULL) { + resultList = list; + list = NULL; + } else if ((list != NULL) && (list->nodeNr > 0)) { + resultList = mergeNodeSet(resultList, list); + /* + * This is the list containing the current matching nodes. + * Avoid massive creation/freeing and preserve it for the + * next iterations. + */ + /* If a namespace node was put it, then we need a more + * time consuming cleanup. + */ + if (specialNodeInSet) + xmlXPathNodeSetClear(list); + else + list->nodeNr = 0; } } - ctxt->context->node = tmp; + + xpctxt->node = oldContextNode; + /* + * Cleanup the temporary list of current node-test matches. + */ + if ((list != NULL) && (list != resultList)) { + xmlXPathFreeNodeSet(list); + list = NULL; + } + #ifdef DEBUG_STEP xmlGenericError(xmlGenericErrorContext, "\nExamined %d nodes, found %d nodes at that step\n", - t, n); + total, nbMatches); #endif - valuePush(ctxt, xmlXPathWrapNodeSet(ret)); + + valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, resultList)); + if ((obj->boolval) && (obj->user != NULL)) { + /* + * QUESTION TODO: What does this do and why? + */ ctxt->value->boolval = 1; ctxt->value->user = obj->user; obj->user = NULL; obj->boolval = 0; } - xmlXPathFreeObject(obj); - return(t); + xmlXPathReleaseObject(xpctxt, obj); + return(total); + +error: + xpctxt->node = oldContextNode; + xmlXPathReleaseObject(xpctxt, obj); + if ((list != NULL) && (list != resultList)) { + xmlXPathFreeNodeSet(list); + } + if (resultList != NULL) + xmlXPathFreeNodeSet(resultList); + return(total); } /** * xmlXPathNodeCollectAndTestNth: * @ctxt: the XPath Parser context * @op: the XPath precompiled step operation - * @indx: the index to collect + * @reqpos: the requested position wrt to the axis * @first: pointer to the first element in document order * @last: pointer to the last element in document order * @@ -9539,7 +11658,7 @@ xmlXPathNodeCollectAndTest(xmlXPathParserContextPtr ctxt, */ static int xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, - xmlXPathStepOpPtr op, int indx, + xmlXPathStepOpPtr op, int reqpos, xmlNodePtr * first, xmlNodePtr * last) { xmlXPathAxisVal axis = (xmlXPathAxisVal) op->value; @@ -9548,27 +11667,30 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, const xmlChar *prefix = op->value4; const xmlChar *name = op->value5; const xmlChar *URI = NULL; - int n = 0, t = 0; + int pos; /* The current context position */ - int i; - xmlNodeSetPtr list; + int inputIdx, total = 0; + xmlNodeSetPtr inputList, list; xmlXPathTraversalFunction next = NULL; + xmlXPathTraversalFunctionExt compoundNext = NULL; void (*addNode) (xmlNodeSetPtr, xmlNodePtr); - xmlNodePtr cur = NULL; + xmlNodePtr oldContextNode, contextNode, cur, compoundContextNode; xmlXPathObjectPtr obj; - xmlNodeSetPtr nodelist; - xmlNodePtr tmp; + xmlXPathContextPtr xpctxt = ctxt->context; + CHECK_TYPE0(XPATH_NODESET); obj = valuePop(ctxt); addNode = xmlXPathNodeSetAdd; + if (prefix != NULL) { - URI = xmlXPathNsLookup(ctxt->context, prefix); + URI = xmlXPathNsLookup(xpctxt, prefix); if (URI == NULL) { xmlXPathFreeObject(obj); XP_ERROR0(XPATH_UNDEF_PREFIX_ERROR); } } + #ifdef DEBUG_STEP_NTH xmlGenericError(xmlGenericErrorContext, "new step : "); if (first != NULL) { @@ -9615,7 +11737,20 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, xmlGenericError(xmlGenericErrorContext, "axis 'child' "); #endif last = NULL; - next = xmlXPathNextChild; + if (op->rewriteType == XP_REWRITE_DOS_CHILD_ELEM) { + /* + * This iterator will give us only nodes which can + * hold element nodes. + */ + compoundNext = xmlXPathNextDescendantOrSelfElemParent; + } + if ((test == NODE_TEST_NAME) && (type == NODE_TYPE_NODE)) { + /* + * Optimization if an element node type is 'element'. + */ + next = xmlXPathNextChildElement; + } else + next = xmlXPathNextChild; break; case AXIS_DESCENDANT: #ifdef DEBUG_STEP_NTH @@ -9687,17 +11822,17 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, break; } if (next == NULL) { - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(xpctxt, obj); return(0); } - nodelist = obj->nodesetval; - if (nodelist == NULL) { - xmlXPathFreeObject(obj); - valuePush(ctxt, xmlXPathWrapNodeSet(NULL)); + inputList = obj->nodesetval; + if ((inputList == NULL) || (inputList->nodeNr <= 0)) { + xmlXPathReleaseObject(xpctxt, obj); + valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, NULL)); return(0); } - addNode = xmlXPathNodeSetAddUnique; + #ifdef DEBUG_STEP_NTH xmlGenericError(xmlGenericErrorContext, " context contains %d nodes\n", nodelist->nodeNr); @@ -9743,34 +11878,78 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, * principal node type. For example, child::* will * select all element children of the context node */ - tmp = ctxt->context->node; + oldContextNode = xpctxt->node; + addNode = xmlXPathNodeSetAddUnique; + list = NULL; + compoundContextNode = NULL; + contextNode = NULL; + inputIdx = 0; list = xmlXPathNodeSetCreate(NULL); - for (i = 0; i < nodelist->nodeNr; i++) { - ctxt->context->node = nodelist->nodeTab[i]; + + while ((inputIdx < inputList->nodeNr) || (contextNode != NULL)) { + if (compoundNext != NULL) { + /* + * This is a compound traversal. + */ + if (contextNode == NULL) { + /* + * Set the context for the initial traversal. + */ + compoundContextNode = inputList->nodeTab[inputIdx++]; + contextNode = compoundNext(NULL, compoundContextNode); + } else + contextNode = compoundNext(contextNode, compoundContextNode); + if (contextNode == NULL) + continue; + /* + * Set the context for the main traversal. + */ + xpctxt->node = contextNode; + } else + xpctxt->node = inputList->nodeTab[inputIdx++]; cur = NULL; - n = 0; + pos = 0; do { cur = next(ctxt, cur); if (cur == NULL) break; - if ((first != NULL) && (*first == cur)) - break; - if (((t % 256) == 0) && - (first != NULL) && (*first != NULL) && - (xmlXPathCmpNodes(*first, cur) >= 0)) - break; - if ((last != NULL) && (*last == cur)) - break; - if (((t % 256) == 0) && - (last != NULL) && (*last != NULL) && - (xmlXPathCmpNodes(cur, *last) >= 0)) - break; - t++; + + if (first != NULL) { + if (*first == cur) + break; + if ((*first != NULL) && + ((total % 256) == 0) && +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON + (xmlXPathCmpNodesExt(*first, cur) >= 0)) +#else + (xmlXPathCmpNodes(*first, cur) >= 0)) +#endif + { + break; + } + } + if (last != NULL) { + if (*last == cur) + break; + if ((*last != NULL) && + ((total % 256) == 0) && +#ifdef XP_OPTIMIZED_NON_ELEM_COMPARISON + (xmlXPathCmpNodesExt(cur, *last) >= 0)) +#else + (xmlXPathCmpNodes(cur, *last) >= 0)) +#endif + { + break; + } + } + + total++; switch (test) { case NODE_TEST_NONE: - ctxt->context->node = tmp; - STRANGE return(0); + total = 0; + STRANGE + goto error; case NODE_TEST_TYPE: if ((cur->type == type) || ((type == NODE_TYPE_NODE) && @@ -9783,8 +11962,8 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, (cur->type == XML_TEXT_NODE))) || ((type == NODE_TYPE_TEXT) && (cur->type == XML_CDATA_SECTION_NODE))) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } break; @@ -9793,35 +11972,35 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, if ((name != NULL) && (!xmlStrEqual(name, cur->name))) break; - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } break; case NODE_TEST_ALL: if (axis == AXIS_ATTRIBUTE) { if (cur->type == XML_ATTRIBUTE_NODE) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } } else if (axis == AXIS_NAMESPACE) { if (cur->type == XML_NAMESPACE_DECL) { - n++; - if (n == indx) - xmlXPathNodeSetAddNs(list, ctxt->context->node, + pos++; + if (pos == reqpos) + xmlXPathNodeSetAddNs(list, xpctxt->node, (xmlNsPtr) cur); } } else { if (cur->type == XML_ELEMENT_NODE) { if (prefix == NULL) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } else if ((cur->ns != NULL) && (xmlStrEqual(URI, cur->ns->href))) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } } @@ -9837,16 +12016,17 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, if (xmlStrEqual(name, cur->name)) { if (prefix == NULL) { if (cur->ns == NULL) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) addNode(list, cur); } } else { if ((cur->ns != NULL) && (xmlStrEqual(URI, - cur->ns->href))) { - n++; - if (n == indx) + cur->ns->href))) + { + pos++; + if (pos == reqpos) addNode(list, cur); } } @@ -9858,18 +12038,19 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, if (xmlStrEqual(name, attr->name)) { if (prefix == NULL) { if ((attr->ns == NULL) || - (attr->ns->prefix == NULL)) { - n++; - if (n == indx) + (attr->ns->prefix == NULL)) + { + pos++; + if (pos == reqpos) addNode(list, cur); } } else { if ((attr->ns != NULL) && (xmlStrEqual(URI, - attr->ns-> - href))) { - n++; - if (n == indx) + attr->ns->href))) + { + pos++; + if (pos == reqpos) addNode(list, cur); } } @@ -9882,10 +12063,10 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, if ((ns->prefix != NULL) && (name != NULL) && (xmlStrEqual(ns->prefix, name))) { - n++; - if (n == indx) + pos++; + if (pos == reqpos) xmlXPathNodeSetAddNs(list, - ctxt->context->node, (xmlNsPtr) cur); + xpctxt->node, (xmlNsPtr) cur); } } break; @@ -9893,27 +12074,40 @@ xmlXPathNodeCollectAndTestNth(xmlXPathParserContextPtr ctxt, break; } break; - break; } - } while (n < indx); + } while (pos < reqpos); } - ctxt->context->node = tmp; + xpctxt->node = oldContextNode; + #ifdef DEBUG_STEP_NTH xmlGenericError(xmlGenericErrorContext, "\nExamined %d nodes, found %d nodes at that step\n", - t, list->nodeNr); + total, list->nodeNr); #endif - valuePush(ctxt, xmlXPathWrapNodeSet(list)); + + valuePush(ctxt, xmlXPathCacheWrapNodeSet(xpctxt, list)); + if ((obj->boolval) && (obj->user != NULL)) { ctxt->value->boolval = 1; ctxt->value->user = obj->user; obj->user = NULL; obj->boolval = 0; } - xmlXPathFreeObject(obj); - return(t); + xmlXPathReleaseObject(xpctxt, obj); + return(total); + +error: + xpctxt->node = oldContextNode; + xmlXPathReleaseObject(xpctxt, obj); + if (list != NULL) + xmlXPathFreeNodeSet(list); + return(total); } +static int +xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt, + xmlXPathStepOpPtr op, xmlNodePtr * first); + /** * xmlXPathCompOpEvalFirst: * @ctxt: the XPath parser context with the compiled expression @@ -9950,7 +12144,15 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, /* * limit tree traversing to first node in the result */ - xmlXPathNodeSetSort(ctxt->value->nodesetval); + /* + * OPTIMIZE TODO: This implicitely sorts + * the result, even if not needed. E.g. if the argument + * of the count() function, no sorting is needed. + * OPTIMIZE TODO: How do we know if the node-list wasn't + * aready sorted? + */ + if (ctxt->value->nodesetval->nodeNr > 1) + xmlXPathNodeSetSort(ctxt->value->nodesetval); *first = ctxt->value->nodesetval->nodeTab[0]; } cur = @@ -9966,7 +12168,7 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, arg1->nodesetval = xmlXPathNodeSetMerge(arg1->nodesetval, arg2->nodesetval); valuePush(ctxt, arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); /* optimizer */ if (total > cur) xmlXPathCompSwap(op); @@ -9981,7 +12183,8 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, if (op->ch2 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); CHECK_ERROR0; - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); return (total); case XPATH_OP_RESET: if (op->ch1 != -1) @@ -10026,7 +12229,8 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, } case XPATH_OP_VALUE: valuePush(ctxt, - xmlXPathObjectCopy((xmlXPathObjectPtr) op->value4)); + xmlXPathCacheObjectCopy(ctxt->context, + (xmlXPathObjectPtr) op->value4)); return (0); case XPATH_OP_SORT: if (op->ch1 != -1) @@ -10036,9 +12240,15 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, CHECK_ERROR0; if ((ctxt->value != NULL) && (ctxt->value->type == XPATH_NODESET) - && (ctxt->value->nodesetval != NULL)) + && (ctxt->value->nodesetval != NULL) + && (ctxt->value->nodesetval->nodeNr > 1)) xmlXPathNodeSetSort(ctxt->value->nodesetval); return (total); +#ifdef XP_OPTIMIZED_FILTER_FIRST + case XPATH_OP_FILTER: + total =+ xmlXPathCompOpEvalFilterFirst(ctxt, op, first); + return (total); +#endif default: return (xmlXPathCompOpEval(ctxt, op)); } @@ -10087,7 +12297,8 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, /* * limit tree traversing to first node in the result */ - xmlXPathNodeSetSort(ctxt->value->nodesetval); + if (ctxt->value->nodesetval->nodeNr > 1) + xmlXPathNodeSetSort(ctxt->value->nodesetval); *last = ctxt->value->nodesetval->nodeTab[ctxt->value-> nodesetval->nodeNr - @@ -10103,7 +12314,7 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, if ((ctxt->value != NULL) && (ctxt->value->type == XPATH_NODESET) && (ctxt->value->nodesetval != NULL) - && (ctxt->value->nodesetval->nodeNr >= 1)) { + && (ctxt->value->nodesetval->nodeNr >= 1)) { /* TODO: NOP ? */ } CHECK_TYPE0(XPATH_NODESET); arg2 = valuePop(ctxt); @@ -10114,7 +12325,7 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, arg1->nodesetval = xmlXPathNodeSetMerge(arg1->nodesetval, arg2->nodesetval); valuePush(ctxt, arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); /* optimizer */ if (total > cur) xmlXPathCompSwap(op); @@ -10129,7 +12340,8 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, if (op->ch2 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); CHECK_ERROR0; - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); return (total); case XPATH_OP_RESET: if (op->ch1 != -1) @@ -10176,7 +12388,8 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, } case XPATH_OP_VALUE: valuePush(ctxt, - xmlXPathObjectCopy((xmlXPathObjectPtr) op->value4)); + xmlXPathCacheObjectCopy(ctxt->context, + (xmlXPathObjectPtr) op->value4)); return (0); case XPATH_OP_SORT: if (op->ch1 != -1) @@ -10186,7 +12399,8 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, CHECK_ERROR0; if ((ctxt->value != NULL) && (ctxt->value->type == XPATH_NODESET) - && (ctxt->value->nodesetval != NULL)) + && (ctxt->value->nodesetval != NULL) + && (ctxt->value->nodesetval->nodeNr > 1)) xmlXPathNodeSetSort(ctxt->value->nodesetval); return (total); default: @@ -10194,6 +12408,299 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op, } } +#ifdef XP_OPTIMIZED_FILTER_FIRST +static int +xmlXPathCompOpEvalFilterFirst(xmlXPathParserContextPtr ctxt, + xmlXPathStepOpPtr op, xmlNodePtr * first) +{ + int total = 0; + xmlXPathCompExprPtr comp; + xmlXPathObjectPtr res; + xmlXPathObjectPtr obj; + xmlNodeSetPtr oldset; + xmlNodePtr oldnode; + xmlDocPtr oldDoc; + int i; + + CHECK_ERROR0; + comp = ctxt->comp; + /* + * Optimization for ()[last()] selection i.e. the last elem + */ + if ((op->ch1 != -1) && (op->ch2 != -1) && + (comp->steps[op->ch1].op == XPATH_OP_SORT) && + (comp->steps[op->ch2].op == XPATH_OP_SORT)) { + int f = comp->steps[op->ch2].ch1; + + if ((f != -1) && + (comp->steps[f].op == XPATH_OP_FUNCTION) && + (comp->steps[f].value5 == NULL) && + (comp->steps[f].value == 0) && + (comp->steps[f].value4 != NULL) && + (xmlStrEqual + (comp->steps[f].value4, BAD_CAST "last"))) { + xmlNodePtr last = NULL; + + total += + xmlXPathCompOpEvalLast(ctxt, + &comp->steps[op->ch1], + &last); + CHECK_ERROR0; + /* + * The nodeset should be in document order, + * Keep only the last value + */ + if ((ctxt->value != NULL) && + (ctxt->value->type == XPATH_NODESET) && + (ctxt->value->nodesetval != NULL) && + (ctxt->value->nodesetval->nodeTab != NULL) && + (ctxt->value->nodesetval->nodeNr > 1)) { + ctxt->value->nodesetval->nodeTab[0] = + ctxt->value->nodesetval->nodeTab[ctxt-> + value-> + nodesetval-> + nodeNr - + 1]; + ctxt->value->nodesetval->nodeNr = 1; + *first = *(ctxt->value->nodesetval->nodeTab); + } + return (total); + } + } + + if (op->ch1 != -1) + total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); + CHECK_ERROR0; + if (op->ch2 == -1) + return (total); + if (ctxt->value == NULL) + return (total); + +#ifdef LIBXML_XPTR_ENABLED + oldnode = ctxt->context->node; + /* + * Hum are we filtering the result of an XPointer expression + */ + if (ctxt->value->type == XPATH_LOCATIONSET) { + xmlXPathObjectPtr tmp = NULL; + xmlLocationSetPtr newlocset = NULL; + xmlLocationSetPtr oldlocset; + + /* + * Extract the old locset, and then evaluate the result of the + * expression for all the element in the locset. use it to grow + * up a new locset. + */ + CHECK_TYPE0(XPATH_LOCATIONSET); + obj = valuePop(ctxt); + oldlocset = obj->user; + ctxt->context->node = NULL; + + if ((oldlocset == NULL) || (oldlocset->locNr == 0)) { + ctxt->context->contextSize = 0; + ctxt->context->proximityPosition = 0; + if (op->ch2 != -1) + total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); + res = valuePop(ctxt); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } + valuePush(ctxt, obj); + CHECK_ERROR0; + return (total); + } + newlocset = xmlXPtrLocationSetCreate(NULL); + + for (i = 0; i < oldlocset->locNr; i++) { + /* + * Run the evaluation with a node list made of a + * single item in the nodelocset. + */ + ctxt->context->node = oldlocset->locTab[i]->user; + ctxt->context->contextSize = oldlocset->locNr; + ctxt->context->proximityPosition = i + 1; + if (tmp == NULL) { + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); + } else { + xmlXPathNodeSetAddUnique(tmp->nodesetval, + ctxt->context->node); + } + valuePush(ctxt, tmp); + if (op->ch2 != -1) + total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); + if (ctxt->error != XPATH_EXPRESSION_OK) { + xmlXPathFreeObject(obj); + return(0); + } + /* + * The result of the evaluation need to be tested to + * decided whether the filter succeeded or not + */ + res = valuePop(ctxt); + if (xmlXPathEvaluatePredicateResult(ctxt, res)) { + xmlXPtrLocationSetAdd(newlocset, + xmlXPathCacheObjectCopy(ctxt->context, + oldlocset->locTab[i])); + } + /* + * Cleanup + */ + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } + if (ctxt->value == tmp) { + valuePop(ctxt); + xmlXPathNodeSetClear(tmp->nodesetval); + /* + * REVISIT TODO: Don't create a temporary nodeset + * for everly iteration. + */ + /* OLD: xmlXPathFreeObject(res); */ + } else + tmp = NULL; + ctxt->context->node = NULL; + /* + * Only put the first node in the result, then leave. + */ + if (newlocset->locNr > 0) { + *first = (xmlNodePtr) oldlocset->locTab[i]->user; + break; + } + } + if (tmp != NULL) { + xmlXPathReleaseObject(ctxt->context, tmp); + } + /* + * The result is used as the new evaluation locset. + */ + xmlXPathReleaseObject(ctxt->context, obj); + ctxt->context->node = NULL; + ctxt->context->contextSize = -1; + ctxt->context->proximityPosition = -1; + valuePush(ctxt, xmlXPtrWrapLocationSet(newlocset)); + ctxt->context->node = oldnode; + return (total); + } +#endif /* LIBXML_XPTR_ENABLED */ + + /* + * Extract the old set, and then evaluate the result of the + * expression for all the element in the set. use it to grow + * up a new set. + */ + CHECK_TYPE0(XPATH_NODESET); + obj = valuePop(ctxt); + oldset = obj->nodesetval; + + oldnode = ctxt->context->node; + oldDoc = ctxt->context->doc; + ctxt->context->node = NULL; + + if ((oldset == NULL) || (oldset->nodeNr == 0)) { + ctxt->context->contextSize = 0; + ctxt->context->proximityPosition = 0; + /* QUESTION TODO: Why was this code commented out? + if (op->ch2 != -1) + total += + xmlXPathCompOpEval(ctxt, + &comp->steps[op->ch2]); + CHECK_ERROR0; + res = valuePop(ctxt); + if (res != NULL) + xmlXPathFreeObject(res); + */ + valuePush(ctxt, obj); + ctxt->context->node = oldnode; + CHECK_ERROR0; + } else { + xmlNodeSetPtr newset; + xmlXPathObjectPtr tmp = NULL; + /* + * Initialize the new set. + * Also set the xpath document in case things like + * key() evaluation are attempted on the predicate + */ + newset = xmlXPathNodeSetCreate(NULL); + + for (i = 0; i < oldset->nodeNr; i++) { + /* + * Run the evaluation with a node list made of + * a single item in the nodeset. + */ + ctxt->context->node = oldset->nodeTab[i]; + if ((oldset->nodeTab[i]->type != XML_NAMESPACE_DECL) && + (oldset->nodeTab[i]->doc != NULL)) + ctxt->context->doc = oldset->nodeTab[i]->doc; + if (tmp == NULL) { + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); + } else { + xmlXPathNodeSetAddUnique(tmp->nodesetval, + ctxt->context->node); + } + valuePush(ctxt, tmp); + ctxt->context->contextSize = oldset->nodeNr; + ctxt->context->proximityPosition = i + 1; + if (op->ch2 != -1) + total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); + if (ctxt->error != XPATH_EXPRESSION_OK) { + xmlXPathFreeNodeSet(newset); + xmlXPathFreeObject(obj); + return(0); + } + /* + * The result of the evaluation needs to be tested to + * decide whether the filter succeeded or not + */ + res = valuePop(ctxt); + if (xmlXPathEvaluatePredicateResult(ctxt, res)) { + xmlXPathNodeSetAdd(newset, oldset->nodeTab[i]); + } + /* + * Cleanup + */ + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } + if (ctxt->value == tmp) { + valuePop(ctxt); + /* + * Don't free the temporary nodeset + * in order to avoid massive recreation inside this + * loop. + */ + xmlXPathNodeSetClear(tmp->nodesetval); + } else + tmp = NULL; + ctxt->context->node = NULL; + /* + * Only put the first node in the result, then leave. + */ + if (newset->nodeNr > 0) { + *first = *(newset->nodeTab); + break; + } + } + if (tmp != NULL) { + xmlXPathReleaseObject(ctxt->context, tmp); + } + /* + * The result is used as the new evaluation set. + */ + xmlXPathReleaseObject(ctxt->context, obj); + ctxt->context->node = NULL; + ctxt->context->contextSize = -1; + ctxt->context->proximityPosition = -1; + /* may want to move this past the '}' later */ + ctxt->context->doc = oldDoc; + valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt->context, newset)); + } + ctxt->context->node = oldnode; + return(total); +} +#endif /* XP_OPTIMIZED_FILTER_FIRST */ + /** * xmlXPathCompOpEval: * @ctxt: the XPath parser context with the compiled expression @@ -10243,7 +12750,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) arg1 = valuePop(ctxt); arg1->boolval &= arg2->boolval; valuePush(ctxt, arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); return (total); case XPATH_OP_OR: bakd = ctxt->context->doc; @@ -10269,7 +12776,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) arg1 = valuePop(ctxt); arg1->boolval |= arg2->boolval; valuePush(ctxt, arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); return (total); case XPATH_OP_EQUAL: bakd = ctxt->context->doc; @@ -10288,7 +12795,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) equal = xmlXPathEqualValues(ctxt); else equal = xmlXPathNotEqualValues(ctxt); - valuePush(ctxt, xmlXPathNewBoolean(equal)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, equal)); return (total); case XPATH_OP_CMP: bakd = ctxt->context->doc; @@ -10304,7 +12811,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); CHECK_ERROR0; ret = xmlXPathCompareValues(ctxt, op->value, op->value2); - valuePush(ctxt, xmlXPathNewBoolean(ret)); + valuePush(ctxt, xmlXPathCacheNewBoolean(ctxt->context, ret)); return (total); case XPATH_OP_PLUS: bakd = ctxt->context->doc; @@ -10371,10 +12878,16 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) CHECK_TYPE0(XPATH_NODESET); arg1 = valuePop(ctxt); - arg1->nodesetval = xmlXPathNodeSetMerge(arg1->nodesetval, - arg2->nodesetval); + if ((arg1->nodesetval == NULL) || + ((arg2->nodesetval != NULL) && + (arg2->nodesetval->nodeNr != 0))) + { + arg1->nodesetval = xmlXPathNodeSetMerge(arg1->nodesetval, + arg2->nodesetval); + } + valuePush(ctxt, arg1); - xmlXPathFreeObject(arg2); + xmlXPathReleaseObject(ctxt->context, arg2); return (total); case XPATH_OP_ROOT: xmlXPathRoot(ctxt); @@ -10386,7 +12899,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) if (op->ch2 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); CHECK_ERROR0; - valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node)); + valuePush(ctxt, xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node)); return (total); case XPATH_OP_RESET: if (op->ch1 != -1) @@ -10403,18 +12917,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); CHECK_ERROR0; - - /* - * Optimization for [n] selection where n is a number - */ - if ((op->ch2 != -1) && + + if ((op->ch2 != -1) && (comp->steps[op->ch2].op == XPATH_OP_PREDICATE) && (comp->steps[op->ch2].ch1 == -1) && (comp->steps[op->ch2].ch2 != -1) && (comp->steps[comp->steps[op->ch2].ch2].op == - XPATH_OP_VALUE)) { + XPATH_OP_VALUE)) + { xmlXPathObjectPtr val; - + /* + * Optimization for [n] selection where n is a number + */ val = comp->steps[comp->steps[op->ch2].ch2].value4; if ((val != NULL) && (val->type == XPATH_NUMBER)) { int indx = (int) val->floatval; @@ -10433,7 +12947,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) } case XPATH_OP_VALUE: valuePush(ctxt, - xmlXPathObjectCopy((xmlXPathObjectPtr) op->value4)); + xmlXPathCacheObjectCopy(ctxt->context, + (xmlXPathObjectPtr) op->value4)); return (total); case XPATH_OP_VARIABLE:{ xmlXPathObjectPtr val; @@ -10560,8 +13075,22 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) * Optimization for ()[1] selection i.e. the first elem */ if ((op->ch1 != -1) && (op->ch2 != -1) && - (comp->steps[op->ch1].op == XPATH_OP_SORT) && - (comp->steps[op->ch2].op == XPATH_OP_VALUE)) { +#ifdef XP_OPTIMIZED_FILTER_FIRST + /* + * FILTER TODO: Can we assume that the inner processing + * will result in an ordered list if we have an + * XPATH_OP_FILTER? + * What about an additional field or flag on + * xmlXPathObject like @sorted ? This way we wouln'd need + * to assume anything, so it would be more robust and + * easier to optimize. + */ + ((comp->steps[op->ch1].op == XPATH_OP_SORT) || /* 18 */ + (comp->steps[op->ch1].op == XPATH_OP_FILTER)) && /* 17 */ +#else + (comp->steps[op->ch1].op == XPATH_OP_SORT) && +#endif + (comp->steps[op->ch2].op == XPATH_OP_VALUE)) { /* 12 */ xmlXPathObjectPtr val; val = comp->steps[op->ch2].value4; @@ -10628,7 +13157,17 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) return (total); } } - + /* + * Process inner predicates first. + * Example "index[parent::book][1]": + * ... + * PREDICATE <-- we are here "[1]" + * PREDICATE <-- process "[parent::book]" first + * SORT + * COLLECT 'parent' 'name' 'node' book + * NODE + * ELEM Object is a number : 1 + */ if (op->ch1 != -1) total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); @@ -10666,8 +13205,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); res = valuePop(ctxt); - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } valuePush(ctxt, obj); CHECK_ERROR0; return (total); @@ -10682,9 +13222,10 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) ctxt->context->node = oldlocset->locTab[i]->user; ctxt->context->contextSize = oldlocset->locNr; ctxt->context->proximityPosition = i + 1; - tmp = xmlXPathNewNodeSet(ctxt->context->node); + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); valuePush(ctxt, tmp); - + if (op->ch2 != -1) total += xmlXPathCompOpEval(ctxt, @@ -10708,11 +13249,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * Cleanup */ - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } if (ctxt->value == tmp) { res = valuePop(ctxt); - xmlXPathFreeObject(res); + xmlXPathReleaseObject(ctxt->context, res); } ctxt->context->node = NULL; @@ -10721,7 +13263,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * The result is used as the new evaluation locset. */ - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); ctxt->context->node = NULL; ctxt->context->contextSize = -1; ctxt->context->proximityPosition = -1; @@ -10761,13 +13303,39 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) ctxt->context->node = oldnode; CHECK_ERROR0; } else { + tmp = NULL; /* * Initialize the new set. * Also set the xpath document in case things like * key() evaluation are attempted on the predicate */ newset = xmlXPathNodeSetCreate(NULL); - + /* + * SPEC XPath 1.0: + * "For each node in the node-set to be filtered, the + * PredicateExpr is evaluated with that node as the + * context node, with the number of nodes in the + * node-set as the context size, and with the proximity + * position of the node in the node-set with respect to + * the axis as the context position;" + * @oldset is the node-set" to be filtered. + * + * SPEC XPath 1.0: + * "only predicates change the context position and + * context size (see [2.4 Predicates])." + * Example: + * node-set context pos + * nA 1 + * nB 2 + * nC 3 + * After applying predicate [position() > 1] : + * node-set context pos + * nB 1 + * nC 2 + * + * removed the first node in the node-set, then + * the context position of the + */ for (i = 0; i < oldset->nodeNr; i++) { /* * Run the evaluation with a node list made of @@ -10777,11 +13345,21 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) if ((oldset->nodeTab[i]->type != XML_NAMESPACE_DECL) && (oldset->nodeTab[i]->doc != NULL)) ctxt->context->doc = oldset->nodeTab[i]->doc; - tmp = xmlXPathNewNodeSet(ctxt->context->node); + if (tmp == NULL) { + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); + } else { + xmlXPathNodeSetAddUnique(tmp->nodesetval, + ctxt->context->node); + } valuePush(ctxt, tmp); ctxt->context->contextSize = oldset->nodeNr; ctxt->context->proximityPosition = i + 1; - + /* + * Evaluate the predicate against the context node. + * Can/should we optimize position() predicates + * here (e.g. "[1]")? + */ if (op->ch2 != -1) total += xmlXPathCompOpEval(ctxt, @@ -10796,6 +13374,10 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) * The result of the evaluation needs to be tested to * decide whether the filter succeeded or not */ + /* + * OPTIMIZE TODO: Can we use + * xmlXPathNodeSetAdd*Unique()* instead? + */ res = valuePop(ctxt); if (xmlXPathEvaluatePredicateResult(ctxt, res)) { xmlXPathNodeSetAdd(newset, oldset->nodeTab[i]); @@ -10804,26 +13386,34 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * Cleanup */ - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } if (ctxt->value == tmp) { - res = valuePop(ctxt); - xmlXPathFreeObject(res); - } - + valuePop(ctxt); + xmlXPathNodeSetClear(tmp->nodesetval); + /* + * Don't free the temporary nodeset + * in order to avoid massive recreation inside this + * loop. + */ + } else + tmp = NULL; ctxt->context->node = NULL; } - + if (tmp != NULL) + xmlXPathReleaseObject(ctxt->context, tmp); /* * The result is used as the new evaluation set. */ - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); ctxt->context->node = NULL; ctxt->context->contextSize = -1; ctxt->context->proximityPosition = -1; /* may want to move this past the '}' later */ ctxt->context->doc = oldDoc; - valuePush(ctxt, xmlXPathWrapNodeSet(newset)); + valuePush(ctxt, + xmlXPathCacheWrapNodeSet(ctxt->context, newset)); } ctxt->context->node = oldnode; return (total); @@ -10834,8 +13424,11 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) CHECK_ERROR0; if ((ctxt->value != NULL) && (ctxt->value->type == XPATH_NODESET) && - (ctxt->value->nodesetval != NULL)) + (ctxt->value->nodesetval != NULL) && + (ctxt->value->nodesetval->nodeNr > 1)) + { xmlXPathNodeSetSort(ctxt->value->nodesetval); + } return (total); #ifdef LIBXML_XPTR_ENABLED case XPATH_OP_RANGETO:{ @@ -10869,8 +13462,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) ctxt->context->proximityPosition = 0; total += xmlXPathCompOpEval(ctxt,&comp->steps[op->ch2]); res = valuePop(ctxt); - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } valuePush(ctxt, obj); CHECK_ERROR0; return (total); @@ -10885,7 +13479,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) ctxt->context->node = oldlocset->locTab[i]->user; ctxt->context->contextSize = oldlocset->locNr; ctxt->context->proximityPosition = i + 1; - tmp = xmlXPathNewNodeSet(ctxt->context->node); + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); valuePush(ctxt, tmp); if (op->ch2 != -1) @@ -10922,11 +13517,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * Cleanup */ - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } if (ctxt->value == tmp) { res = valuePop(ctxt); - xmlXPathFreeObject(res); + xmlXPathReleaseObject(ctxt->context, res); } ctxt->context->node = NULL; @@ -10946,7 +13542,11 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) * in the nodeset. */ ctxt->context->node = oldset->nodeTab[i]; - tmp = xmlXPathNewNodeSet(ctxt->context->node); + /* + * OPTIMIZE TODO: Avoid recreation for every iteration. + */ + tmp = xmlXPathCacheNewNodeSet(ctxt->context, + ctxt->context->node); valuePush(ctxt, tmp); if (op->ch2 != -1) @@ -10969,11 +13569,12 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * Cleanup */ - if (res != NULL) - xmlXPathFreeObject(res); + if (res != NULL) { + xmlXPathReleaseObject(ctxt->context, res); + } if (ctxt->value == tmp) { res = valuePop(ctxt); - xmlXPathFreeObject(res); + xmlXPathReleaseObject(ctxt->context, res); } ctxt->context->node = NULL; @@ -10984,7 +13585,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) /* * The result is used as the new evaluation set. */ - xmlXPathFreeObject(obj); + xmlXPathReleaseObject(ctxt->context, obj); ctxt->context->node = NULL; ctxt->context->contextSize = -1; ctxt->context->proximityPosition = -1; @@ -11036,7 +13637,7 @@ xmlXPathRunStreamEval(xmlXPathContextPtr ctxt, xmlPatternPtr comp) { printf("stream eval: depth %d from root %d\n", max_depth, from_root); #endif - retval = xmlXPathNewNodeSet(NULL); + retval = xmlXPathCacheNewNodeSet(ctxt, NULL); if (retval == NULL) return(NULL); @@ -11378,12 +13979,18 @@ xmlXPathTryStreamCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { const xmlChar *tmp; /* - * We don't try to handle :: constructs, just the simplied form at - * this point + * We don't try to handle expressions using the verbose axis + * specifiers ("::"), just the simplied form at this point. + * Additionally, if there is no list of namespaces available and + * there's a ":" in the expression, indicating a prefixed QName, + * then we won't try to compile either. xmlPatterncompile() needs + * to have a list of namespaces at compilation time in order to + * compile prefixed name tests. */ tmp = xmlStrchr(str, ':'); - if ((tmp != NULL) && (tmp[1] == ':')) - return(NULL); + if ((tmp != NULL) && + ((ctxt == NULL) || (ctxt->nsNr == 0) || (tmp[1] == ':'))) + return(NULL); if (ctxt != NULL) { dict = ctxt->dict; @@ -11405,6 +14012,9 @@ xmlXPathTryStreamCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH, &namespaces[0]); + if (namespaces != NULL) { + xmlFree((xmlChar **)namespaces); + } if ((stream != NULL) && (xmlPatternStreamable(stream) == 1)) { comp = xmlXPathNewCompExpr(); if (comp == NULL) { @@ -11423,6 +14033,59 @@ xmlXPathTryStreamCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { } #endif /* XPATH_STREAMING */ +static int +xmlXPathCanRewriteDosExpression(xmlChar *expr) +{ + if (expr == NULL) + return(0); + do { + if ((*expr == '/') && (*(++expr) == '/')) + return(1); + } while (*expr++); + return(0); +} +static void +xmlXPathRewriteDOSExpression(xmlXPathCompExprPtr comp, xmlXPathStepOpPtr op) +{ + /* + * Try to rewrite "descendant-or-self::node()/foo" to an optimized + * internal representation. + */ + if (op->ch1 != -1) { + if ((op->op == XPATH_OP_COLLECT /* 11 */) && + ((xmlXPathAxisVal) op->value == AXIS_CHILD /* 4 */) && + ((xmlXPathTestVal) op->value2 == NODE_TEST_NAME /* 5 */) && + ((xmlXPathTypeVal) op->value3 == NODE_TYPE_NODE /* 0 */)) + { + /* + * This is an "foo" + */ + xmlXPathStepOpPtr prevop = &comp->steps[op->ch1]; + + if ((prevop->op == XPATH_OP_COLLECT /* 11 */) && + (prevop->ch1 != -1) && + ((xmlXPathAxisVal) prevop->value == + AXIS_DESCENDANT_OR_SELF) && + (prevop->ch2 == -1) && + ((xmlXPathTestVal) prevop->value2 == NODE_TEST_TYPE) && + ((xmlXPathTypeVal) prevop->value3 == NODE_TYPE_NODE) && + (comp->steps[prevop->ch1].op == XPATH_OP_ROOT)) + { + /* + * This is a "descendant-or-self::node()" without predicates. + * Eliminate it. + */ + op->ch1 = prevop->ch1; + op->rewriteType = XP_REWRITE_DOS_CHILD_ELEM; + } + } + if (op->ch1 != -1) + xmlXPathRewriteDOSExpression(comp, &comp->steps[op->ch1]); + } + if (op->ch2 != -1) + xmlXPathRewriteDOSExpression(comp, &comp->steps[op->ch2]); +} + /** * xmlXPathCtxtCompile: * @ctxt: an XPath context @@ -11447,7 +14110,7 @@ xmlXPathCtxtCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { xmlXPathInit(); pctxt = xmlXPathNewParserContext(str, ctxt); - xmlXPathCompileExpr(pctxt); + xmlXPathCompileExpr(pctxt, 1); if( pctxt->error != XPATH_EXPRESSION_OK ) { @@ -11474,7 +14137,12 @@ xmlXPathCtxtCompile(xmlXPathContextPtr ctxt, const xmlChar *str) { #ifdef DEBUG_EVAL_COUNTS comp->string = xmlStrdup(str); comp->nb = 0; -#endif +#endif + if ((comp->nbStep > 2) && + (xmlXPathCanRewriteDosExpression(comp->expr) == 1)) + { + xmlXPathRewriteDOSExpression(comp, &comp->steps[comp->last]); + }
} return(comp); } @@ -11547,8 +14215,8 @@ xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) { tmp = valuePop(ctxt); if (tmp != NULL) { if (tmp != init) - stack++; - xmlXPathFreeObject(tmp); + stack++; + xmlXPathReleaseObject(ctx, tmp); } } while (tmp != NULL); if ((stack != 0) && (res != NULL)) { @@ -11559,9 +14227,7 @@ xmlXPathCompiledEval(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctx) { if (ctxt->error != XPATH_EXPRESSION_OK) { xmlXPathFreeObject(res); res = NULL; - } - - + } ctxt->comp = NULL; xmlXPathFreeParserContext(ctxt); #ifndef LIBXML_THREAD_ENABLED @@ -11596,10 +14262,17 @@ xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) { } else #endif { - xmlXPathCompileExpr(ctxt); + xmlXPathCompileExpr(ctxt, 1); + if ((ctxt->comp != NULL) &&
+ (ctxt->comp->nbStep > 2) && + (xmlXPathCanRewriteDosExpression(ctxt->comp->expr) == 1)) + { + xmlXPathRewriteDOSExpression(ctxt->comp, + &ctxt->comp->steps[comp->last]); + } } CHECK_ERROR; - xmlXPathRunEval(ctxt); + xmlXPathRunEval(ctxt); } /** @@ -11644,8 +14317,8 @@ xmlXPathEval(const xmlChar *str, xmlXPathContextPtr ctx) { tmp = valuePop(ctxt); if (tmp != NULL) { if (tmp != init) - stack++; - xmlXPathFreeObject(tmp); + stack++; + xmlXPathReleaseObject(ctx, tmp); } } while (tmp != NULL); if ((stack != 0) && (res != NULL)) { @@ -11694,7 +14367,7 @@ xmlXPathEvalExpression(const xmlChar *str, xmlXPathContextPtr ctxt) { do { tmp = valuePop(pctxt); if (tmp != NULL) { - xmlXPathFreeObject(tmp); + xmlXPathReleaseObject(ctxt, tmp); stack++; } } while (tmp != NULL); @@ -11815,9 +14488,10 @@ xmlXPathEscapeUriFunction(xmlXPathParserContextPtr ctxt, int nargs) { } } } - valuePush(ctxt, xmlXPathNewString(xmlBufferContent(target))); + valuePush(ctxt, xmlXPathCacheNewString(ctxt->context, + xmlBufferContent(target))); xmlBufferFree(target); - xmlXPathFreeObject(str); + xmlXPathReleaseObject(ctxt->context, str); } /** diff --git a/xstc/Makefile.in b/xstc/Makefile.in index 39265cd..2c5e095 100644 --- a/xstc/Makefile.in +++ b/xstc/Makefile.in @@ -87,6 +87,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ @@ -214,15 +215,9 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -239,23 +234,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ |