From 2f706d3970846303e0fcd206ef9703e9bf7523b7 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Fri, 23 Oct 2020 20:10:27 +0900 Subject: [PATCH] Imported Upstream version 2.36.0 --- ChangeLog | 27 ++ MSVC_Net2005/libxml++/libxml++.rc | 8 +- MSVC_Net2008/libxml++/libxml++.rc | 8 +- MSVC_Net2010/libxml++/libxml++.rc | 8 +- NEWS | 10 + aclocal.m4 | 18 +- configure | 375 +++++++++++---------- configure.ac | 4 +- docs/manual/html/ch01s02.html | 2 +- docs/manual/html/ch01s03.html | 2 +- docs/manual/html/ch02s02.html | 174 +++++----- docs/manual/html/ch02s03.html | 4 +- docs/manual/html/chapter-introduction.html | 4 +- docs/manual/html/chapter-parsers.html | 6 +- docs/manual/html/index.html | 4 +- docs/manual/libxml++.xml | 166 ++++----- docs/reference/html/annotated.html | 104 +++--- docs/reference/html/bc_s.png | Bin 676 -> 680 bytes docs/reference/html/classGValue.html | 59 ---- docs/reference/html/classes.html | 36 +- docs/reference/html/classsigc_1_1trackable.html | 66 ---- .../classsigc_1_1trackable__inherit__graph.png | Bin 187220 -> 0 bytes docs/reference/html/classstd_1_1exception.html | 10 +- .../html/classstd_1_1exception__inherit__graph.png | Bin 8673 -> 7904 bytes .../html/classxmlpp_1_1Attribute-members.html | 8 +- docs/reference/html/classxmlpp_1_1Attribute.html | 142 +++----- ...classxmlpp_1_1AttributeDeclaration-members.html | 8 +- .../html/classxmlpp_1_1AttributeDeclaration.html | 143 +++----- ...sxmlpp_1_1AttributeDeclaration__coll__graph.png | Bin 6901 -> 7516 bytes ...lpp_1_1AttributeDeclaration__inherit__graph.png | Bin 6901 -> 7516 bytes .../html/classxmlpp_1_1AttributeNode-members.html | 8 +- .../html/classxmlpp_1_1AttributeNode.html | 124 ++----- .../classxmlpp_1_1AttributeNode__coll__graph.png | Bin 6340 -> 7011 bytes ...classxmlpp_1_1AttributeNode__inherit__graph.png | Bin 6340 -> 7011 bytes .../html/classxmlpp_1_1Attribute__coll__graph.png | Bin 4550 -> 5014 bytes .../classxmlpp_1_1Attribute__inherit__graph.png | Bin 9386 -> 10146 bytes .../html/classxmlpp_1_1CdataNode-members.html | 8 +- docs/reference/html/classxmlpp_1_1CdataNode.html | 116 ++----- .../html/classxmlpp_1_1CdataNode__coll__graph.png | Bin 6580 -> 7035 bytes .../classxmlpp_1_1CdataNode__inherit__graph.png | Bin 6580 -> 7035 bytes .../html/classxmlpp_1_1CommentNode-members.html | 8 +- docs/reference/html/classxmlpp_1_1CommentNode.html | 116 ++----- .../classxmlpp_1_1CommentNode__coll__graph.png | Bin 6535 -> 7008 bytes .../classxmlpp_1_1CommentNode__inherit__graph.png | Bin 6535 -> 7008 bytes .../html/classxmlpp_1_1ContentNode-members.html | 8 +- docs/reference/html/classxmlpp_1_1ContentNode.html | 120 +++---- .../classxmlpp_1_1ContentNode__coll__graph.png | Bin 4813 -> 5208 bytes .../classxmlpp_1_1ContentNode__inherit__graph.png | Bin 17872 -> 18432 bytes .../html/classxmlpp_1_1Document-members.html | 8 +- docs/reference/html/classxmlpp_1_1Document.html | 142 ++++---- .../html/classxmlpp_1_1Document__coll__graph.png | Bin 3287 -> 3572 bytes .../classxmlpp_1_1Document__inherit__graph.png | Bin 3287 -> 3572 bytes .../html/classxmlpp_1_1DomParser-members.html | 8 +- docs/reference/html/classxmlpp_1_1DomParser.html | 88 ++--- .../html/classxmlpp_1_1DomParser__coll__graph.png | Bin 17123 -> 13376 bytes .../classxmlpp_1_1DomParser__inherit__graph.png | Bin 4956 -> 5338 bytes docs/reference/html/classxmlpp_1_1Dtd-members.html | 8 +- docs/reference/html/classxmlpp_1_1Dtd.html | 35 +- .../html/classxmlpp_1_1DtdValidator-members.html | 8 +- .../reference/html/classxmlpp_1_1DtdValidator.html | 88 ++--- .../classxmlpp_1_1DtdValidator__coll__graph.png | Bin 15917 -> 12658 bytes .../classxmlpp_1_1DtdValidator__inherit__graph.png | Bin 5041 -> 5440 bytes .../html/classxmlpp_1_1Element-members.html | 8 +- docs/reference/html/classxmlpp_1_1Element.html | 229 +++++-------- .../html/classxmlpp_1_1Element__coll__graph.png | Bin 4374 -> 4747 bytes .../html/classxmlpp_1_1Element__inherit__graph.png | Bin 4374 -> 4747 bytes .../classxmlpp_1_1EntityDeclaration-members.html | 8 +- .../html/classxmlpp_1_1EntityDeclaration.html | 138 +++----- ...lassxmlpp_1_1EntityDeclaration__coll__graph.png | Bin 6915 -> 7382 bytes ...sxmlpp_1_1EntityDeclaration__inherit__graph.png | Bin 6915 -> 7382 bytes .../classxmlpp_1_1EntityReference-members.html | 8 +- .../html/classxmlpp_1_1EntityReference.html | 119 +++---- .../classxmlpp_1_1EntityReference__coll__graph.png | Bin 4970 -> 5311 bytes ...assxmlpp_1_1EntityReference__inherit__graph.png | Bin 4970 -> 5311 bytes ...sxmlpp_1_1IStreamParserInputBuffer-members.html | 8 +- .../classxmlpp_1_1IStreamParserInputBuffer.html | 26 +- ...pp_1_1IStreamParserInputBuffer__coll__graph.png | Bin 5944 -> 6564 bytes ...1_1IStreamParserInputBuffer__inherit__graph.png | Bin 5944 -> 6564 bytes .../html/classxmlpp_1_1KeepBlanks-members.html | 8 +- docs/reference/html/classxmlpp_1_1KeepBlanks.html | 21 +- .../reference/html/classxmlpp_1_1Node-members.html | 8 +- docs/reference/html/classxmlpp_1_1Node.html | 193 +++++------ .../html/classxmlpp_1_1Node__coll__graph.png | Bin 3107 -> 3369 bytes .../html/classxmlpp_1_1Node__inherit__graph.png | Bin 38279 -> 39804 bytes .../html/classxmlpp_1_1NonCopyable-members.html | 8 +- docs/reference/html/classxmlpp_1_1NonCopyable.html | 18 +- .../classxmlpp_1_1NonCopyable__inherit__graph.png | Bin 75032 -> 76227 bytes .../classxmlpp_1_1OStreamOutputBuffer-members.html | 8 +- .../html/classxmlpp_1_1OStreamOutputBuffer.html | 36 +- ...ssxmlpp_1_1OStreamOutputBuffer__coll__graph.png | Bin 5575 -> 6095 bytes ...mlpp_1_1OStreamOutputBuffer__inherit__graph.png | Bin 5575 -> 6095 bytes .../html/classxmlpp_1_1OutputBuffer-members.html | 8 +- .../reference/html/classxmlpp_1_1OutputBuffer.html | 36 +- .../classxmlpp_1_1OutputBuffer__coll__graph.png | Bin 3311 -> 3670 bytes .../classxmlpp_1_1OutputBuffer__inherit__graph.png | Bin 5510 -> 6025 bytes .../html/classxmlpp_1_1Parser-members.html | 8 +- docs/reference/html/classxmlpp_1_1Parser.html | 95 ++---- .../classxmlpp_1_1ParserInputBuffer-members.html | 8 +- .../html/classxmlpp_1_1ParserInputBuffer.html | 30 +- ...lassxmlpp_1_1ParserInputBuffer__coll__graph.png | Bin 3604 -> 3940 bytes ...sxmlpp_1_1ParserInputBuffer__inherit__graph.png | Bin 6007 -> 6540 bytes .../html/classxmlpp_1_1Parser__coll__graph.png | Bin 11357 -> 8470 bytes .../html/classxmlpp_1_1Parser__inherit__graph.png | Bin 7167 -> 7730 bytes ...xmlpp_1_1ProcessingInstructionNode-members.html | 8 +- .../classxmlpp_1_1ProcessingInstructionNode.html | 114 ++----- ...p_1_1ProcessingInstructionNode__coll__graph.png | Bin 7308 -> 7967 bytes ..._1ProcessingInstructionNode__inherit__graph.png | Bin 7308 -> 7967 bytes .../html/classxmlpp_1_1SaxParser-members.html | 8 +- docs/reference/html/classxmlpp_1_1SaxParser.html | 157 +++------ .../html/classxmlpp_1_1SaxParser__coll__graph.png | Bin 13370 -> 10496 bytes .../classxmlpp_1_1SaxParser__inherit__graph.png | Bin 4906 -> 5359 bytes .../html/classxmlpp_1_1Schema-members.html | 8 +- docs/reference/html/classxmlpp_1_1Schema.html | 48 +-- .../classxmlpp_1_1SchemaValidator-members.html | 8 +- .../html/classxmlpp_1_1SchemaValidator.html | 85 ++--- .../classxmlpp_1_1SchemaValidator__coll__graph.png | Bin 18116 -> 14132 bytes ...assxmlpp_1_1SchemaValidator__inherit__graph.png | Bin 5525 -> 5901 bytes .../html/classxmlpp_1_1Schema__coll__graph.png | Bin 3322 -> 3641 bytes .../html/classxmlpp_1_1Schema__inherit__graph.png | Bin 3322 -> 3641 bytes .../html/classxmlpp_1_1TextNode-members.html | 8 +- docs/reference/html/classxmlpp_1_1TextNode.html | 116 ++----- .../html/classxmlpp_1_1TextNode__coll__graph.png | Bin 6296 -> 6763 bytes .../classxmlpp_1_1TextNode__inherit__graph.png | Bin 6296 -> 6763 bytes .../html/classxmlpp_1_1TextReader-members.html | 8 +- docs/reference/html/classxmlpp_1_1TextReader.html | 169 ++++------ .../html/classxmlpp_1_1TextReader__coll__graph.png | Bin 3295 -> 3590 bytes .../classxmlpp_1_1TextReader__inherit__graph.png | Bin 3295 -> 3590 bytes .../html/classxmlpp_1_1Validator-members.html | 8 +- docs/reference/html/classxmlpp_1_1Validator.html | 61 ++-- .../html/classxmlpp_1_1Validator__coll__graph.png | Bin 11447 -> 8562 bytes .../classxmlpp_1_1Validator__inherit__graph.png | Bin 7761 -> 8442 bytes .../html/classxmlpp_1_1XIncludeEnd-members.html | 8 +- docs/reference/html/classxmlpp_1_1XIncludeEnd.html | 107 ++---- .../classxmlpp_1_1XIncludeEnd__coll__graph.png | Bin 4782 -> 5181 bytes .../classxmlpp_1_1XIncludeEnd__inherit__graph.png | Bin 4782 -> 5181 bytes .../html/classxmlpp_1_1XIncludeStart-members.html | 8 +- .../html/classxmlpp_1_1XIncludeStart.html | 107 ++---- .../classxmlpp_1_1XIncludeStart__coll__graph.png | Bin 5146 -> 5620 bytes ...classxmlpp_1_1XIncludeStart__inherit__graph.png | Bin 5146 -> 5620 bytes .../html/classxmlpp_1_1exception-members.html | 8 +- docs/reference/html/classxmlpp_1_1exception.html | 29 +- .../html/classxmlpp_1_1exception__coll__graph.png | Bin 2777 -> 3119 bytes .../classxmlpp_1_1exception__inherit__graph.png | Bin 8868 -> 8243 bytes .../classxmlpp_1_1internal__error-members.html | 8 +- .../html/classxmlpp_1_1internal__error.html | 31 +- .../classxmlpp_1_1internal__error__coll__graph.png | Bin 4354 -> 4740 bytes ...assxmlpp_1_1internal__error__inherit__graph.png | Bin 4354 -> 4740 bytes .../html/classxmlpp_1_1parse__error-members.html | 8 +- .../reference/html/classxmlpp_1_1parse__error.html | 33 +- .../classxmlpp_1_1parse__error__coll__graph.png | Bin 4380 -> 4125 bytes .../classxmlpp_1_1parse__error__inherit__graph.png | Bin 6230 -> 6753 bytes .../classxmlpp_1_1validity__error-members.html | 8 +- .../html/classxmlpp_1_1validity__error.html | 37 +- .../classxmlpp_1_1validity__error__coll__graph.png | Bin 6236 -> 6682 bytes ...assxmlpp_1_1validity__error__inherit__graph.png | Bin 6236 -> 6682 bytes .../html/dir_8637afc38b758fdb535647a385c49b5e.html | 23 +- .../html/dir_a5a40681709ed751decc24cd7289c9c5.html | 16 +- .../html/dir_bc161955dc3a3d2485839eba21420d01.html | 16 +- .../html/dir_e3818dbe052c35541aa8102ff72444f2.html | 15 +- .../html/dir_fceced95d8215eeebebd9df6aa39e1a5.html | 16 +- docs/reference/html/doxygen.css | 29 +- docs/reference/html/functions.html | 8 +- docs/reference/html/functions_0x63.html | 8 +- docs/reference/html/functions_0x64.html | 8 +- docs/reference/html/functions_0x65.html | 8 +- docs/reference/html/functions_0x66.html | 8 +- docs/reference/html/functions_0x67.html | 8 +- docs/reference/html/functions_0x68.html | 8 +- docs/reference/html/functions_0x69.html | 8 +- docs/reference/html/functions_0x6b.html | 8 +- docs/reference/html/functions_0x6c.html | 8 +- docs/reference/html/functions_0x6d.html | 8 +- docs/reference/html/functions_0x6e.html | 8 +- docs/reference/html/functions_0x6f.html | 8 +- docs/reference/html/functions_0x70.html | 8 +- docs/reference/html/functions_0x72.html | 8 +- docs/reference/html/functions_0x73.html | 8 +- docs/reference/html/functions_0x74.html | 8 +- docs/reference/html/functions_0x76.html | 13 +- docs/reference/html/functions_0x77.html | 8 +- docs/reference/html/functions_0x78.html | 8 +- docs/reference/html/functions_0x7e.html | 8 +- docs/reference/html/functions_enum.html | 8 +- docs/reference/html/functions_eval.html | 8 +- docs/reference/html/functions_func.html | 8 +- docs/reference/html/functions_func_0x63.html | 8 +- docs/reference/html/functions_func_0x64.html | 8 +- docs/reference/html/functions_func_0x65.html | 8 +- docs/reference/html/functions_func_0x66.html | 8 +- docs/reference/html/functions_func_0x67.html | 8 +- docs/reference/html/functions_func_0x68.html | 8 +- docs/reference/html/functions_func_0x69.html | 8 +- docs/reference/html/functions_func_0x6b.html | 8 +- docs/reference/html/functions_func_0x6c.html | 8 +- docs/reference/html/functions_func_0x6d.html | 8 +- docs/reference/html/functions_func_0x6e.html | 8 +- docs/reference/html/functions_func_0x6f.html | 8 +- docs/reference/html/functions_func_0x70.html | 8 +- docs/reference/html/functions_func_0x72.html | 8 +- docs/reference/html/functions_func_0x73.html | 8 +- docs/reference/html/functions_func_0x74.html | 8 +- docs/reference/html/functions_func_0x76.html | 8 +- docs/reference/html/functions_func_0x77.html | 8 +- docs/reference/html/functions_func_0x78.html | 8 +- docs/reference/html/functions_func_0x7e.html | 8 +- docs/reference/html/functions_type.html | 8 +- docs/reference/html/functions_vars.html | 8 +- docs/reference/html/graph_legend.html | 8 +- docs/reference/html/graph_legend.png | Bin 17874 -> 17812 bytes docs/reference/html/hierarchy.html | 84 +++-- docs/reference/html/index.html | 8 +- docs/reference/html/inherit_graph_0.png | Bin 6573 -> 6844 bytes docs/reference/html/inherit_graph_1.png | Bin 937 -> 972 bytes docs/reference/html/inherit_graph_2.png | Bin 967 -> 1596 bytes docs/reference/html/inherit_graph_3.png | Bin 983 -> 76109 bytes docs/reference/html/inherit_graph_4.png | Bin 1478 -> 1936 bytes docs/reference/html/inherit_graph_5.png | Bin 74916 -> 2377 bytes docs/reference/html/inherit_graph_6.png | Bin 1713 -> 0 bytes docs/reference/html/inherit_graph_7.png | Bin 2135 -> 0 bytes docs/reference/html/inherits.html | 38 +-- docs/reference/html/jquery.js | 8 - docs/reference/html/namespacemembers.html | 8 +- docs/reference/html/namespacemembers_enum.html | 8 +- docs/reference/html/namespacemembers_eval.html | 8 +- docs/reference/html/namespacemembers_func.html | 8 +- docs/reference/html/namespacemembers_type.html | 8 +- docs/reference/html/namespaces.html | 31 +- docs/reference/html/namespacestd_1_1locale.html | 61 ---- docs/reference/html/namespacestd_1_1tr2.html | 69 ---- docs/reference/html/namespacexmlpp.html | 69 +--- docs/reference/html/nav_g.png | Bin 95 -> 94 bytes docs/reference/html/pages.html | 8 +- docs/reference/html/since_2_20.html | 10 +- docs/reference/html/since_2_24.html | 16 +- docs/reference/html/since_2_36.html | 30 +- ...uctxmlpp_1_1SaxParser_1_1Attribute-members.html | 8 +- .../structxmlpp_1_1SaxParser_1_1Attribute.html | 42 +-- ...p_1_1SaxParser_1_1AttributeHasName-members.html | 8 +- ...ructxmlpp_1_1SaxParser_1_1AttributeHasName.html | 40 +-- ...1SaxParser_1_1AttributeHasName__coll__graph.png | Bin 4327 -> 0 bytes ...mlpp_1_1SaxParser_1_1Attribute__coll__graph.png | Bin 4230 -> 0 bytes docs/reference/html/tab_b.png | Bin 170 -> 167 bytes docs/reference/html/tab_h.png | Bin 177 -> 192 bytes docs/reference/libxml++-2.6.devhelp2 | 22 -- docs/reference/libxml++-2.6.tag | 124 +------ libxml++/nodes/element.cc | 11 +- libxml++/nodes/element.h | 2 +- libxml++/parsers/parser.cc | 18 +- macros/config.sub | 11 +- macros/libtool.m4 | 33 +- macros/ltmain.sh | 32 +- 251 files changed, 2203 insertions(+), 3632 deletions(-) delete mode 100644 docs/reference/html/classGValue.html delete mode 100644 docs/reference/html/classsigc_1_1trackable.html delete mode 100644 docs/reference/html/classsigc_1_1trackable__inherit__graph.png delete mode 100644 docs/reference/html/inherit_graph_6.png delete mode 100644 docs/reference/html/inherit_graph_7.png delete mode 100644 docs/reference/html/jquery.js delete mode 100644 docs/reference/html/namespacestd_1_1locale.html delete mode 100644 docs/reference/html/namespacestd_1_1tr2.html delete mode 100644 docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png delete mode 100644 docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png diff --git a/ChangeLog b/ChangeLog index 5a8754b..0b836fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2.36.0: + +2012-10-25 Kjell Ahlstedt + + Element::set_namespace_declaration(): No error to set the same URI twice. + + * libxml++/nodes/element.[h|cc]: Don't throw an exception from + set_namespace_declaration(), if a namespace prefix is assigned the same URI + twice. Bug #635846, comment 27. + +2012-10-10 Kjell Ahlstedt + + Require libxml-2.0 >= 2.7.3. + + * configure.ac: Require libxml-2.0 >= 2.7.3. + Don't know if it's really necessary, but 2.7.2 from 2008-10-03 is the oldest + release available at ftp://xmlsoft.org/libxml2, and 2.7.2 contains a bug that + makes examples/import_node segfault. + +2012-10-10 Kjell Ahlstedt + + Parser::initialize_context(): Call xmlCtxtUseOptions(). + + * libxml++/parsers/parser.cc: initialize_context(): Call xmlCtxtUseOptions() + instead of setting context_->validate and replaceEntities. + xmlCtxtUseOptions() does that and more. + 2.35.4: 2012-08-28 Kjell Ahlstedt diff --git a/MSVC_Net2005/libxml++/libxml++.rc b/MSVC_Net2005/libxml++/libxml++.rc index 7114ca8..dc547a7 100644 --- a/MSVC_Net2005/libxml++/libxml++.rc +++ b/MSVC_Net2005/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,4,1 - PRODUCTVERSION 2,35,4,1 + FILEVERSION 2,36,0,1 + PRODUCTVERSION 2,36,0,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.4" + VALUE "FileVersion", "2.36.0" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.4" + VALUE "ProductVersion", "2.36.0" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2008/libxml++/libxml++.rc b/MSVC_Net2008/libxml++/libxml++.rc index 7114ca8..dc547a7 100644 --- a/MSVC_Net2008/libxml++/libxml++.rc +++ b/MSVC_Net2008/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,4,1 - PRODUCTVERSION 2,35,4,1 + FILEVERSION 2,36,0,1 + PRODUCTVERSION 2,36,0,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.4" + VALUE "FileVersion", "2.36.0" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.4" + VALUE "ProductVersion", "2.36.0" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2010/libxml++/libxml++.rc b/MSVC_Net2010/libxml++/libxml++.rc index c0f53fd..1691757 100644 --- a/MSVC_Net2010/libxml++/libxml++.rc +++ b/MSVC_Net2010/libxml++/libxml++.rc @@ -33,8 +33,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,35,4,1 - PRODUCTVERSION 2,35,4,1 + FILEVERSION 2,36,0,1 + PRODUCTVERSION 2,36,0,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BEGIN VALUE "CompanyName", "The libxml++ development team (see AUTHORS)" VALUE "FileDescription", "The official C++ wrapper for libxml2" - VALUE "FileVersion", "2.35.4" + VALUE "FileVersion", "2.36.0" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.4" + VALUE "ProductVersion", "2.36.0" END END BLOCK "VarFileInfo" diff --git a/NEWS b/NEWS index 819e86c..25bc0f5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +2.36.0 (unstable): + +* Element::set_namespace_declaration(): + It is not an error to set the same URI twice. + (Kjell Ahlstedt) Bug #635846, comment 27. +* Require libxml-2.0 >= 2.7.3. + (Kjell Ahlstedt) +* Parser::initialize_context(): Call xmlCtxtUseOptions(). + (Kjell Ahlstedt) + 2.35.4 (unstable): * Document: diff --git a/aclocal.m4 b/aclocal.m4 index ab29422..5e30d0c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -1094,7 +1094,8 @@ AC_SUBST([am__untar]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -1140,7 +1141,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -1188,9 +1190,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -1203,7 +1205,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -1214,7 +1216,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/configure b/configure index fb70828..fd1e288 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libxml++ 2.35.4. +# Generated by GNU Autoconf 2.69 for libxml++ 2.36.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # 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 sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -571,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libxml++' PACKAGE_TARNAME='libxml++' -PACKAGE_VERSION='2.35.4' -PACKAGE_STRING='libxml++ 2.35.4' +PACKAGE_VERSION='2.36.0' +PACKAGE_STRING='libxml++ 2.36.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B' PACKAGE_URL='http://libxmlplusplus.sourceforge.net/' @@ -1265,8 +1285,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1352,7 +1370,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxml++ 2.35.4 to adapt to many kinds of systems. +\`configure' configures libxml++ 2.36.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1440,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxml++ 2.35.4:";; + short | recursive ) echo "Configuration of libxml++ 2.36.0:";; esac cat <<\_ACEOF @@ -1553,10 +1571,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxml++ configure 2.35.4 -generated by GNU Autoconf 2.68 +libxml++ configure 2.36.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1670,7 +1688,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1930,7 +1948,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2043,8 +2061,8 @@ 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 libxml++ $as_me 2.35.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by libxml++ $as_me 2.36.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2466,7 +2484,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 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_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. @@ -2635,7 +2653,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2675,7 +2693,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2726,7 +2744,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2779,7 +2797,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2865,7 +2883,7 @@ fi # Define the identity of the package. PACKAGE='libxml++' - VERSION='2.35.4' + VERSION='2.36.0' # Some tools Automake needs. @@ -2987,7 +3005,7 @@ fi LIBXMLXX_MODULE_NAME='libxml++-2.6' -LIBXMLXX_VERSION='2.35.4' +LIBXMLXX_VERSION='2.36.0' LIBXMLXX_API_VERSION='2.6' @@ -2996,15 +3014,15 @@ LIBXMLXX_MAJOR_VERSION=2 $as_echo "#define LIBXMLXX_MAJOR_VERSION 2" >>confdefs.h -LIBXMLXX_MINOR_VERSION=35 +LIBXMLXX_MINOR_VERSION=36 -$as_echo "#define LIBXMLXX_MINOR_VERSION 35" >>confdefs.h +$as_echo "#define LIBXMLXX_MINOR_VERSION 36" >>confdefs.h -LIBXMLXX_MICRO_VERSION=4 +LIBXMLXX_MICRO_VERSION=0 -$as_echo "#define LIBXMLXX_MICRO_VERSION 4" >>confdefs.h +$as_echo "#define LIBXMLXX_MICRO_VERSION 0" >>confdefs.h @@ -3053,7 +3071,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3097,7 +3115,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3911,7 +3929,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3951,7 +3969,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4004,7 +4022,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4045,7 +4063,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_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 @@ -4103,7 +4121,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4147,7 +4165,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4343,8 +4361,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4579,7 +4596,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4655,7 +4672,7 @@ do 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_test_x "$ac_path_GREP"; } || continue + as_fn_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 @@ -4721,7 +4738,7 @@ do 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_test_x "$ac_path_EGREP"; } || continue + as_fn_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 @@ -4788,7 +4805,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5044,7 +5061,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5088,7 +5105,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5512,7 +5529,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5552,7 +5569,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5721,7 +5738,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5855,7 +5872,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5895,7 +5912,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5996,7 +6013,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6040,7 +6057,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6165,7 +6182,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6205,7 +6222,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6264,7 +6281,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6304,7 +6321,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6953,7 +6970,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6993,7 +7010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7073,7 +7090,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7113,7 +7130,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7165,7 +7182,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7205,7 +7222,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7257,7 +7274,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7297,7 +7314,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7349,7 +7366,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7389,7 +7406,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7441,7 +7458,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7481,7 +7498,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7998,7 +8015,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8038,7 +8055,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8090,7 +8107,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8130,7 +8147,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8182,7 +8199,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8222,7 +8239,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9426,6 +9443,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9647,7 +9667,7 @@ _LT_EOF fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9824,6 +9844,7 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10277,7 +10298,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11290,14 +11311,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11309,6 +11326,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14144,7 +14173,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -14515,6 +14544,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -15125,14 +15157,10 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15144,6 +15172,18 @@ fi dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15472,7 +15512,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -LIBXMLXX_MODULES='libxml-2.0 >= 2.6.1 glibmm-2.4 >= 2.32.0' +LIBXMLXX_MODULES='libxml-2.0 >= 2.7.3 glibmm-2.4 >= 2.32.0' + @@ -15500,7 +15541,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15543,7 +15584,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15608,6 +15649,7 @@ if test -n "$LIBXMLXX_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXMLXX_CFLAGS=`$PKG_CONFIG --cflags "$LIBXMLXX_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15624,6 +15666,7 @@ if test -n "$LIBXMLXX_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXMLXX_LIBS=`$PKG_CONFIG --libs "$LIBXMLXX_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15643,9 +15686,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXMLXX_MODULES" 2>&1` + LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXMLXX_MODULES" 2>&1` else - LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXMLXX_MODULES" 2>&1` + LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXMLXX_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBXMLXX_PKG_ERRORS" >&5 @@ -15660,7 +15703,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBXMLXX_CFLAGS and LIBXMLXX_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -15676,7 +15718,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBXMLXX_CFLAGS=$pkg_cv_LIBXMLXX_CFLAGS LIBXMLXX_LIBS=$pkg_cv_LIBXMLXX_LIBS @@ -15727,7 +15768,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15769,7 +15810,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15810,7 +15851,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15851,7 +15892,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16099,7 +16140,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16143,7 +16184,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DB2LATEX="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16633,16 +16674,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... 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'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16702,28 +16743,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # 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'" @@ -16744,8 +16773,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxml++ $as_me 2.35.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by libxml++ $as_me 2.36.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16811,11 +16840,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxml++ config.status 2.35.4 -configured by $0, generated by GNU Autoconf 2.68, +libxml++ config.status 2.36.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16906,7 +16935,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac index 3aab085..10f866c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libxml++], [2.35.4], +AC_INIT([libxml++], [2.36.0], [https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B], [libxml++], [http://libxmlplusplus.sourceforge.net/]) AC_PREREQ([2.59]) @@ -28,7 +28,7 @@ AC_PROG_CXX LT_PREREQ([2.2.6]) LT_INIT([dlopen win32-dll disable-static]) -AC_SUBST([LIBXMLXX_MODULES], ['libxml-2.0 >= 2.6.1 glibmm-2.4 >= 2.32.0']) +AC_SUBST([LIBXMLXX_MODULES], ['libxml-2.0 >= 2.7.3 glibmm-2.4 >= 2.32.0']) PKG_CHECK_MODULES([LIBXMLXX], [$LIBXMLXX_MODULES]) AC_LANG([C++]) diff --git a/docs/manual/html/ch01s02.html b/docs/manual/html/ch01s02.html index 32178aa..4eb2d21 100644 --- a/docs/manual/html/ch01s02.html +++ b/docs/manual/html/ch01s02.html @@ -24,7 +24,7 @@

-UTF-8 and Glib::ustring

+UTF-8 and Glib::ustring

The libxml++ API takes, and gives, strings in the UTF-8 Unicode encoding, which can support all known languages and locales. This choice was made because, of the encodings that have this capability, UTF-8 is the most commonly accepted choice. UTF-8 is a multi-byte encoding, meaning that some characters use more than 1 byte. But for compatibility, old-fashioned 7-bit ASCII strings are unchanged when encoded as UTF-8, and UTF-8 strings do not contain null bytes which would cause old code to misjudge the number of bytes. For these reasons, you can store a UTF-8 string in a std::string object. However, the std::string API will operate on that string in terms of bytes, instead of characters.

Because Standard C++ has no string class that can fully handle UTF-8, libxml++ uses the Glib::ustring class from the glibmm library. Glib::ustring has almost exactly the same API as std::string, but methods such as length() and operator[] deal with whole UTF-8 characters rather than raw bytes.

There are implicit conversions between std::string and Glib::ustring, so you can use std::string wherever you see a Glib::ustring in the API, if you really don't care about any locale other than English. However, that is unlikely in today's connected world.

diff --git a/docs/manual/html/ch01s03.html b/docs/manual/html/ch01s03.html index 0e65524..94cb719 100644 --- a/docs/manual/html/ch01s03.html +++ b/docs/manual/html/ch01s03.html @@ -24,7 +24,7 @@

-Compilation and Linking

+Compilation and Linking

To use libxml++ in your application, you must tell the compiler where to find the include headers and where to find the libxml++ library. libxml++ provides a pkg-config .pc file to make this easy. For instance, the following command will provide the necessary compiler options: pkg-config libxml++-2.6 --cflags --libs

diff --git a/docs/manual/html/ch02s02.html b/docs/manual/html/ch02s02.html index b9498ca..284b5b4 100644 --- a/docs/manual/html/ch02s02.html +++ b/docs/manual/html/ch02s02.html @@ -24,13 +24,13 @@

-SAX Parser

+SAX Parser

The SAX parser presents each node of the XML document in sequence. So when you process one node, you must have already stored information about any relevant previous nodes, and you have no information at that time about subsequent nodes. The SAX parser uses less memory than the DOM parser and it is a suitable abstraction for documents that can be processed sequentially rather than as a whole.

By using the parse_chunk() method instead of parse(), you can even parse parts of the XML document before you have received the whole document.

As shown in the example, you should derive your own class from SaxParser and override some of the virtual methods. These "handler" methods will be called while the document is parsed.

-Example

+Example

This example shows how the handler methods are called during parsing.

Source Code

File: myparser.h @@ -66,6 +66,91 @@ protected:

+

File: main.cc +

+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <fstream>
+#include <iostream>
+#include <stdlib.h>
+#include <cstring> // std::memset()
+
+#include "myparser.h"
+
+int
+main(int argc, char* argv[])
+{
+  // Set the global C and C++ locale to the user-configured locale,
+  // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
+  std::locale::global(std::locale(""));
+
+  std::string filepath;
+  if(argc > 1 )
+    filepath = argv[1]; //Allow the user to specify a different XML file to parse.
+  else
+    filepath = "example.xml";
+    
+  // Parse the entire document in one go:
+  int return_code = EXIT_SUCCESS;
+  try
+  {
+    MySaxParser parser;
+    parser.set_substitute_entities(true);
+    parser.parse_file(filepath);
+  }
+  catch(const xmlpp::exception& ex)
+  {
+    std::cerr << "libxml++ exception: " << ex.what() << std::endl;
+    return_code = EXIT_FAILURE;
+  }
+
+  // Incremental parsing, sometimes useful for network connections:
+  try
+  {
+    std::cout << std::endl << "Incremental SAX Parser:" << std::endl;
+    
+    std::ifstream is(filepath.c_str());
+    if (!is)
+      throw xmlpp::exception("Could not open file " + filepath);
+
+    char buffer[64];
+    const size_t buffer_size = sizeof(buffer) / sizeof(char);
+
+    //Parse the file:
+    MySaxParser parser;
+    parser.set_substitute_entities(true);
+    do
+    {
+      std::memset(buffer, 0, buffer_size);
+      is.read(buffer, buffer_size-1);
+      if(is.gcount())
+      {
+        // We use Glib::ustring::ustring(InputIterator begin, InputIterator end)
+        // instead of Glib::ustring::ustring( const char*, size_type ) because it
+        // expects the length of the string in characters, not in bytes.
+        Glib::ustring input(buffer, buffer+is.gcount());
+        parser.parse_chunk(input);
+      }
+    }
+    while(is);
+
+    parser.finish_chunk_parsing();
+  }
+  catch(const xmlpp::exception& ex)
+  {
+    std::cerr << "Incremental parsing, libxml++ exception: " << ex.what() << std::endl;
+    return_code = EXIT_FAILURE;
+  }
+
+  return return_code;
+}
+
+
+

+

File: myparser.cc 

@@ -189,91 +274,6 @@ void MySaxParser::on_fatal_error(const Glib::ustring& text)

-

File: main.cc -

-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <fstream>
-#include <iostream>
-#include <stdlib.h>
-#include <cstring> // std::memset()
-
-#include "myparser.h"
-
-int
-main(int argc, char* argv[])
-{
-  // Set the global C and C++ locale to the user-configured locale,
-  // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
-  std::locale::global(std::locale(""));
-
-  std::string filepath;
-  if(argc > 1 )
-    filepath = argv[1]; //Allow the user to specify a different XML file to parse.
-  else
-    filepath = "example.xml";
-    
-  // Parse the entire document in one go:
-  int return_code = EXIT_SUCCESS;
-  try
-  {
-    MySaxParser parser;
-    parser.set_substitute_entities(true);
-    parser.parse_file(filepath);
-  }
-  catch(const xmlpp::exception& ex)
-  {
-    std::cerr << "libxml++ exception: " << ex.what() << std::endl;
-    return_code = EXIT_FAILURE;
-  }
-
-  // Incremental parsing, sometimes useful for network connections:
-  try
-  {
-    std::cout << std::endl << "Incremental SAX Parser:" << std::endl;
-    
-    std::ifstream is(filepath.c_str());
-    if (!is)
-      throw xmlpp::exception("Could not open file " + filepath);
-
-    char buffer[64];
-    const size_t buffer_size = sizeof(buffer) / sizeof(char);
-
-    //Parse the file:
-    MySaxParser parser;
-    parser.set_substitute_entities(true);
-    do
-    {
-      std::memset(buffer, 0, buffer_size);
-      is.read(buffer, buffer_size-1);
-      if(is.gcount())
-      {
-        // We use Glib::ustring::ustring(InputIterator begin, InputIterator end)
-        // instead of Glib::ustring::ustring( const char*, size_type ) because it
-        // expects the length of the string in characters, not in bytes.
-        Glib::ustring input(buffer, buffer+is.gcount());
-        parser.parse_chunk(input);
-      }
-    }
-    while(is);
-
-    parser.finish_chunk_parsing();
-  }
-  catch(const xmlpp::exception& ex)
-  {
-    std::cerr << "Incremental parsing, libxml++ exception: " << ex.what() << std::endl;
-    return_code = EXIT_FAILURE;
-  }
-
-  return return_code;
-}
-
-
-

-

diff --git a/docs/manual/html/ch02s03.html b/docs/manual/html/ch02s03.html index 3ff5fa5..242fb63 100644 --- a/docs/manual/html/ch02s03.html +++ b/docs/manual/html/ch02s03.html @@ -22,12 +22,12 @@

-TextReader Parser

+TextReader Parser

Like the SAX parser, the TextReader parser is suitable for sequential parsing, but instead of implementing handlers for specific parts of the document, it allows you to detect the current node type, process the node accordingly, and skip forward in the document as much as necessary. Unlike the DOM parser, you may not move backwards in the XML document. And unlike the SAX parser, you must not waste time processing nodes that do not interest you.

All methods are on the single parser instance, but their result depends on the current context. For instance, use read() to move to the next node, and move_to_element() to navigate to child nodes. These methods will return false when no more nodes are available. Then use methods such as get_name() and get_value() to examine the elements and their attributes.

-Example

+Example

This example examines each node in turn, then moves to the next node.

Source Code

File: main.cc diff --git a/docs/manual/html/chapter-introduction.html b/docs/manual/html/chapter-introduction.html index d1c9702..3b9bb5b 100644 --- a/docs/manual/html/chapter-introduction.html +++ b/docs/manual/html/chapter-introduction.html @@ -28,7 +28,7 @@

Table of Contents

@@ -42,7 +42,7 @@

But libxml++ was created mainly to fill the need for an API-stable and ABI-stable C++ XML parser which could be used as a shared library dependency by C++ applications that are distributed widely in binary form. That means that installed applications will not break when new versions of libxml++ are installed on a user's computer. Gradual improvement of the libxml++ API is still possible via non-breaking API additions, and new independent versions of the ABI that can be installed in parallel with older versions. These are the general techniques and principles followed by the GNOME project, of which libxml++ is a part.

-Installation

+Installation

libxml++ is packaged by major Linux and *BSD distributions and can be installed from source on Linux and Windows, using any modern compiler, such as g++, SUN Forte, or MSVC++.

For instance, to install libxml++ and its documentation on debian, use apt-get or synaptic like so:

diff --git a/docs/manual/html/chapter-parsers.html b/docs/manual/html/chapter-parsers.html index e44ee1f..d9ee9b7 100644 --- a/docs/manual/html/chapter-parsers.html +++ b/docs/manual/html/chapter-parsers.html @@ -28,7 +28,7 @@

Table of Contents

@@ -38,7 +38,7 @@

Remember that white space is usually significant in XML documents, so the parsers might provide unexpected text nodes that contain only spaces and new lines. The parser does not know whether you care about these text nodes, but your application may choose to ignore them.

-DOM Parser

+DOM Parser

The DOM parser parses the whole document at once and stores the structure in memory, available via Parser::get_document(). With methods such as Document::get_root_node() and Node::get_children(), you may then navigate into the heirarchy of XML nodes without restriction, jumping forwards or backwards in the document based on the information that you encounter. Therefore the DOM parser uses a relatively large amount of memory.

You should use C++ RTTI (via dynamic_cast<>) to identify the specific node type and to perform actions which are not possible with all node types. For instance, only Elements have attributes. Here is the inheritance hierarchy of node types:

@@ -82,7 +82,7 @@

There are also several methods which can create new child Nodes. By using these, and one of the Document::write_*() methods, you can use libxml++ to build a new XML document.

-Example

+Example

This example looks in the document for expected elements and then examines them. All these examples are included in the libxml++ source distribution.

Source Code

File: main.cc diff --git a/docs/manual/html/index.html b/docs/manual/html/index.html index 6bb9e0a..9167085 100644 --- a/docs/manual/html/index.html +++ b/docs/manual/html/index.html @@ -43,14 +43,14 @@