From 513beed1e44540360407bf981550661cde3966a2 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Fri, 23 Oct 2020 20:10:17 +0900 Subject: [PATCH] Imported Upstream version 2.35.3 --- ChangeLog | 59 + MSVC_Net2005/libxml++/libxml++.rc | 8 +- MSVC_Net2005/libxml++/libxml++config.h | 2 +- MSVC_Net2008/libxml++/libxml++.rc | 8 +- MSVC_Net2008/libxml++/libxml++config.h | 2 +- MSVC_Net2010/libxml++/libxml++.rc | 8 +- MSVC_Net2010/libxml++/libxml++config.h | 2 +- Makefile.am | 110 +- Makefile.in | 846 +--- NEWS | 13 + aclocal.m4 | 399 +- config.h.in | 3 + configure | 4447 ++++++++------------ configure.ac | 14 +- docs/manual/html/ch01s02.html | 2 +- docs/manual/html/ch01s03.html | 2 +- docs/manual/html/ch02s02.html | 12 +- docs/manual/html/ch02s03.html | 9 +- docs/manual/html/chapter-introduction.html | 4 +- docs/manual/html/chapter-parsers.html | 15 +- docs/manual/html/index.html | 4 +- docs/manual/libxml++.xml | 22 +- docs/reference/html/annotated.html | 14 +- docs/reference/html/classes.html | 61 +- docs/reference/html/classsigc_1_1trackable.html | 15 +- .../classsigc_1_1trackable__inherit__graph.png | Bin 184244 -> 184565 bytes docs/reference/html/classstd_1_1exception.html | 15 +- .../html/classstd_1_1exception__inherit__graph.png | Bin 9018 -> 8488 bytes .../html/classxmlpp_1_1Attribute-members.html | 21 +- docs/reference/html/classxmlpp_1_1Attribute.html | 31 +- ...classxmlpp_1_1AttributeDeclaration-members.html | 21 +- .../html/classxmlpp_1_1AttributeDeclaration.html | 27 +- ...sxmlpp_1_1AttributeDeclaration__coll__graph.png | Bin 7465 -> 7503 bytes ...lpp_1_1AttributeDeclaration__inherit__graph.png | Bin 7465 -> 7503 bytes .../html/classxmlpp_1_1AttributeNode-members.html | 21 +- .../html/classxmlpp_1_1AttributeNode.html | 21 +- .../classxmlpp_1_1AttributeNode__coll__graph.png | Bin 6927 -> 6940 bytes ...classxmlpp_1_1AttributeNode__inherit__graph.png | Bin 6927 -> 6940 bytes .../html/classxmlpp_1_1Attribute__coll__graph.png | Bin 4975 -> 4995 bytes .../classxmlpp_1_1Attribute__inherit__graph.png | Bin 10056 -> 9758 bytes .../html/classxmlpp_1_1CdataNode-members.html | 21 +- docs/reference/html/classxmlpp_1_1CdataNode.html | 21 +- .../html/classxmlpp_1_1CdataNode__coll__graph.png | Bin 7110 -> 7133 bytes .../classxmlpp_1_1CdataNode__inherit__graph.png | Bin 7110 -> 7133 bytes .../html/classxmlpp_1_1CommentNode-members.html | 21 +- docs/reference/html/classxmlpp_1_1CommentNode.html | 21 +- .../classxmlpp_1_1CommentNode__coll__graph.png | Bin 7043 -> 7046 bytes .../classxmlpp_1_1CommentNode__inherit__graph.png | Bin 7043 -> 7046 bytes .../html/classxmlpp_1_1ContentNode-members.html | 21 +- docs/reference/html/classxmlpp_1_1ContentNode.html | 29 +- .../classxmlpp_1_1ContentNode__coll__graph.png | Bin 5204 -> 5227 bytes .../classxmlpp_1_1ContentNode__inherit__graph.png | Bin 18842 -> 18850 bytes .../html/classxmlpp_1_1Document-members.html | 13 +- docs/reference/html/classxmlpp_1_1Document.html | 89 +- .../classxmlpp_1_1Document_1_1Init-members.html | 80 + .../html/classxmlpp_1_1Document_1_1Init.html | 123 + .../html/classxmlpp_1_1Document__coll__graph.png | Bin 3522 -> 3598 bytes .../classxmlpp_1_1Document__inherit__graph.png | Bin 3522 -> 3598 bytes .../html/classxmlpp_1_1DomParser-members.html | 13 +- docs/reference/html/classxmlpp_1_1DomParser.html | 59 +- .../html/classxmlpp_1_1DomParser__coll__graph.png | Bin 18218 -> 18419 bytes .../classxmlpp_1_1DomParser__inherit__graph.png | Bin 5251 -> 5321 bytes docs/reference/html/classxmlpp_1_1Dtd-members.html | 13 +- docs/reference/html/classxmlpp_1_1Dtd.html | 27 +- .../html/classxmlpp_1_1DtdValidator-members.html | 13 +- .../reference/html/classxmlpp_1_1DtdValidator.html | 41 +- .../classxmlpp_1_1DtdValidator__coll__graph.png | Bin 16696 -> 17045 bytes .../classxmlpp_1_1DtdValidator__inherit__graph.png | Bin 5320 -> 5454 bytes .../html/classxmlpp_1_1Element-members.html | 21 +- docs/reference/html/classxmlpp_1_1Element.html | 87 +- .../html/classxmlpp_1_1Element__coll__graph.png | Bin 4701 -> 4713 bytes .../html/classxmlpp_1_1Element__inherit__graph.png | Bin 4701 -> 4713 bytes .../classxmlpp_1_1EntityDeclaration-members.html | 21 +- .../html/classxmlpp_1_1EntityDeclaration.html | 29 +- ...lassxmlpp_1_1EntityDeclaration__coll__graph.png | Bin 7382 -> 7425 bytes ...sxmlpp_1_1EntityDeclaration__inherit__graph.png | Bin 7382 -> 7425 bytes .../classxmlpp_1_1EntityReference-members.html | 21 +- .../html/classxmlpp_1_1EntityReference.html | 25 +- .../classxmlpp_1_1EntityReference__coll__graph.png | Bin 5233 -> 5261 bytes ...assxmlpp_1_1EntityReference__inherit__graph.png | Bin 5233 -> 5261 bytes ...sxmlpp_1_1IStreamParserInputBuffer-members.html | 13 +- .../classxmlpp_1_1IStreamParserInputBuffer.html | 23 +- ...pp_1_1IStreamParserInputBuffer__coll__graph.png | Bin 6241 -> 6346 bytes ...1_1IStreamParserInputBuffer__inherit__graph.png | Bin 6241 -> 6346 bytes .../html/classxmlpp_1_1KeepBlanks-members.html | 13 +- docs/reference/html/classxmlpp_1_1KeepBlanks.html | 17 +- .../reference/html/classxmlpp_1_1Node-members.html | 21 +- docs/reference/html/classxmlpp_1_1Node.html | 450 +- .../html/classxmlpp_1_1Node__coll__graph.png | Bin 3347 -> 3380 bytes .../html/classxmlpp_1_1Node__inherit__graph.png | Bin 32915 -> 31130 bytes .../html/classxmlpp_1_1NonCopyable-members.html | 13 +- docs/reference/html/classxmlpp_1_1NonCopyable.html | 19 +- .../classxmlpp_1_1NonCopyable__inherit__graph.png | Bin 68353 -> 68998 bytes .../classxmlpp_1_1OStreamOutputBuffer-members.html | 13 +- .../html/classxmlpp_1_1OStreamOutputBuffer.html | 23 +- ...ssxmlpp_1_1OStreamOutputBuffer__coll__graph.png | Bin 5947 -> 6062 bytes ...mlpp_1_1OStreamOutputBuffer__inherit__graph.png | Bin 5947 -> 6062 bytes .../html/classxmlpp_1_1OutputBuffer-members.html | 13 +- .../reference/html/classxmlpp_1_1OutputBuffer.html | 27 +- .../classxmlpp_1_1OutputBuffer__coll__graph.png | Bin 3611 -> 3645 bytes .../classxmlpp_1_1OutputBuffer__inherit__graph.png | Bin 5880 -> 5937 bytes .../html/classxmlpp_1_1Parser-members.html | 13 +- docs/reference/html/classxmlpp_1_1Parser.html | 85 +- .../classxmlpp_1_1ParserInputBuffer-members.html | 13 +- .../html/classxmlpp_1_1ParserInputBuffer.html | 25 +- ...lassxmlpp_1_1ParserInputBuffer__coll__graph.png | Bin 3823 -> 3921 bytes ...sxmlpp_1_1ParserInputBuffer__inherit__graph.png | Bin 6208 -> 6297 bytes .../html/classxmlpp_1_1Parser__coll__graph.png | Bin 12172 -> 12368 bytes .../html/classxmlpp_1_1Parser__inherit__graph.png | Bin 7592 -> 7656 bytes ...xmlpp_1_1ProcessingInstructionNode-members.html | 21 +- .../classxmlpp_1_1ProcessingInstructionNode.html | 21 +- ...p_1_1ProcessingInstructionNode__coll__graph.png | Bin 7967 -> 7923 bytes ..._1ProcessingInstructionNode__inherit__graph.png | Bin 7967 -> 7923 bytes .../html/classxmlpp_1_1SaxParser-members.html | 13 +- docs/reference/html/classxmlpp_1_1SaxParser.html | 91 +- .../html/classxmlpp_1_1SaxParser__coll__graph.png | Bin 14305 -> 14495 bytes .../classxmlpp_1_1SaxParser__inherit__graph.png | Bin 5270 -> 5330 bytes .../html/classxmlpp_1_1Schema-members.html | 13 +- docs/reference/html/classxmlpp_1_1Schema.html | 45 +- .../classxmlpp_1_1SchemaValidator-members.html | 13 +- .../html/classxmlpp_1_1SchemaValidator.html | 49 +- .../classxmlpp_1_1SchemaValidator__coll__graph.png | Bin 18933 -> 19393 bytes ...assxmlpp_1_1SchemaValidator__inherit__graph.png | Bin 5899 -> 5964 bytes .../html/classxmlpp_1_1Schema__coll__graph.png | Bin 3558 -> 3622 bytes .../html/classxmlpp_1_1Schema__inherit__graph.png | Bin 3558 -> 3622 bytes .../html/classxmlpp_1_1TextNode-members.html | 21 +- docs/reference/html/classxmlpp_1_1TextNode.html | 21 +- .../html/classxmlpp_1_1TextNode__coll__graph.png | Bin 6764 -> 6769 bytes .../classxmlpp_1_1TextNode__inherit__graph.png | Bin 6764 -> 6769 bytes .../html/classxmlpp_1_1TextReader-members.html | 13 +- docs/reference/html/classxmlpp_1_1TextReader.html | 113 +- .../html/classxmlpp_1_1TextReader__coll__graph.png | Bin 3499 -> 3574 bytes .../classxmlpp_1_1TextReader__inherit__graph.png | Bin 3499 -> 3574 bytes .../html/classxmlpp_1_1Validator-members.html | 13 +- docs/reference/html/classxmlpp_1_1Validator.html | 39 +- .../html/classxmlpp_1_1Validator__coll__graph.png | Bin 12261 -> 12496 bytes .../classxmlpp_1_1Validator__inherit__graph.png | Bin 8208 -> 8306 bytes .../html/classxmlpp_1_1exception-members.html | 13 +- docs/reference/html/classxmlpp_1_1exception.html | 27 +- .../html/classxmlpp_1_1exception__coll__graph.png | Bin 3099 -> 3042 bytes .../classxmlpp_1_1exception__inherit__graph.png | Bin 9314 -> 8806 bytes .../classxmlpp_1_1internal__error-members.html | 13 +- .../html/classxmlpp_1_1internal__error.html | 25 +- .../classxmlpp_1_1internal__error__coll__graph.png | Bin 4727 -> 4679 bytes ...assxmlpp_1_1internal__error__inherit__graph.png | Bin 4727 -> 4679 bytes .../html/classxmlpp_1_1parse__error-members.html | 13 +- .../reference/html/classxmlpp_1_1parse__error.html | 25 +- .../classxmlpp_1_1parse__error__coll__graph.png | Bin 4773 -> 4719 bytes .../classxmlpp_1_1parse__error__inherit__graph.png | Bin 6745 -> 6686 bytes .../classxmlpp_1_1validity__error-members.html | 13 +- .../html/classxmlpp_1_1validity__error.html | 25 +- .../classxmlpp_1_1validity__error__coll__graph.png | Bin 6762 -> 6708 bytes ...assxmlpp_1_1validity__error__inherit__graph.png | Bin 6762 -> 6708 bytes docs/reference/html/doxygen.css | 13 +- docs/reference/html/functions.html | 11 +- docs/reference/html/functions_0x63.html | 11 +- docs/reference/html/functions_0x64.html | 11 +- docs/reference/html/functions_0x65.html | 24 +- docs/reference/html/functions_0x66.html | 13 +- docs/reference/html/functions_0x67.html | 11 +- docs/reference/html/functions_0x68.html | 11 +- docs/reference/html/functions_0x69.html | 14 +- docs/reference/html/functions_0x6b.html | 11 +- docs/reference/html/functions_0x6c.html | 11 +- docs/reference/html/functions_0x6d.html | 11 +- docs/reference/html/functions_0x6e.html | 11 +- docs/reference/html/functions_0x6f.html | 11 +- docs/reference/html/functions_0x70.html | 11 +- docs/reference/html/functions_0x72.html | 11 +- docs/reference/html/functions_0x73.html | 11 +- docs/reference/html/functions_0x74.html | 11 +- docs/reference/html/functions_0x76.html | 11 +- docs/reference/html/functions_0x77.html | 11 +- docs/reference/html/functions_0x78.html | 11 +- docs/reference/html/functions_0x7e.html | 14 +- docs/reference/html/functions_enum.html | 11 +- docs/reference/html/functions_eval.html | 11 +- docs/reference/html/functions_func.html | 11 +- docs/reference/html/functions_func_0x63.html | 11 +- docs/reference/html/functions_func_0x64.html | 11 +- docs/reference/html/functions_func_0x65.html | 20 +- docs/reference/html/functions_func_0x66.html | 13 +- docs/reference/html/functions_func_0x67.html | 11 +- docs/reference/html/functions_func_0x68.html | 11 +- docs/reference/html/functions_func_0x69.html | 18 +- docs/reference/html/functions_func_0x6b.html | 11 +- docs/reference/html/functions_func_0x6c.html | 11 +- docs/reference/html/functions_func_0x6d.html | 11 +- docs/reference/html/functions_func_0x6e.html | 11 +- docs/reference/html/functions_func_0x6f.html | 11 +- docs/reference/html/functions_func_0x70.html | 11 +- docs/reference/html/functions_func_0x72.html | 11 +- docs/reference/html/functions_func_0x73.html | 11 +- docs/reference/html/functions_func_0x74.html | 11 +- docs/reference/html/functions_func_0x76.html | 11 +- docs/reference/html/functions_func_0x77.html | 11 +- docs/reference/html/functions_func_0x7e.html | 14 +- docs/reference/html/functions_type.html | 11 +- docs/reference/html/functions_vars.html | 11 +- docs/reference/html/graph_legend.html | 15 +- docs/reference/html/graph_legend.png | Bin 17086 -> 15159 bytes docs/reference/html/hierarchy.html | 14 +- docs/reference/html/index.html | 13 +- docs/reference/html/inherit_graph_0.png | Bin 6894 -> 6879 bytes docs/reference/html/inherit_graph_1.png | Bin 1045 -> 1016 bytes docs/reference/html/inherit_graph_2.png | Bin 982 -> 1441 bytes docs/reference/html/inherit_graph_3.png | Bin 1581 -> 994 bytes docs/reference/html/inherit_graph_4.png | Bin 68230 -> 1590 bytes docs/reference/html/inherit_graph_5.png | Bin 1939 -> 68910 bytes docs/reference/html/inherit_graph_6.png | Bin 2197 -> 1974 bytes docs/reference/html/inherit_graph_7.png | Bin 0 -> 2193 bytes docs/reference/html/inherits.html | 41 +- docs/reference/html/namespacemembers.html | 29 +- docs/reference/html/namespacemembers_enum.html | 14 +- docs/reference/html/namespacemembers_eval.html | 26 +- docs/reference/html/namespacemembers_func.html | 11 +- docs/reference/html/namespacemembers_type.html | 11 +- docs/reference/html/namespaces.html | 13 +- docs/reference/html/namespacexmlpp.html | 65 +- docs/reference/html/pages.html | 13 +- docs/reference/html/since_2_20.html | 13 +- docs/reference/html/since_2_24.html | 13 +- docs/reference/html/since_2_36.html | 29 +- ...uctxmlpp_1_1SaxParser_1_1Attribute-members.html | 13 +- .../structxmlpp_1_1SaxParser_1_1Attribute.html | 17 +- ...p_1_1SaxParser_1_1AttributeHasName-members.html | 13 +- ...ructxmlpp_1_1SaxParser_1_1AttributeHasName.html | 17 +- ...1SaxParser_1_1AttributeHasName__coll__graph.png | Bin 4513 -> 4555 bytes ...mlpp_1_1SaxParser_1_1Attribute__coll__graph.png | Bin 4548 -> 4639 bytes docs/reference/libxml++-2.6.devhelp2 | 21 +- docs/reference/libxml++-2.6.tag | 117 +- examples/Makefile.am | 140 + examples/Makefile.in | 1153 +++++ examples/dom_build/main.cc | 6 +- examples/dom_parse_entities/main.cc | 8 +- examples/dom_parser/main.cc | 9 +- examples/dom_parser_raw/example_invalid.xml | 16 + examples/dom_parser_raw/main.cc | 7 +- examples/dom_read_write/main.cc | 8 +- examples/dom_xpath/example.xml | 7 +- examples/dom_xpath/main.cc | 104 +- examples/dtdvalidation/main.cc | 15 +- examples/import_node/example1.xml | 4 +- examples/import_node/example2.xml | 2 +- examples/import_node/main.cc | 36 +- examples/sax_exception/main.cc | 12 +- examples/sax_parser/main.cc | 8 +- examples/sax_parser_build_dom/main.cc | 6 +- examples/sax_parser_entities/main.cc | 6 +- examples/schemavalidation/main.cc | 49 +- examples/textreader/main.cc | 5 +- libxml++/nodes/node.cc | 149 +- libxml++/nodes/node.h | 118 +- macros/config.guess | 16 +- macros/config.sub | 19 +- macros/libtool.m4 | 2268 ++++------ macros/ltmain.sh | 4051 ++++++------------ macros/ltoptions.m4 | 32 +- macros/ltversion.m4 | 12 +- macros/lt~obsolete.m4 | 12 +- 260 files changed, 8573 insertions(+), 9241 deletions(-) create mode 100644 docs/reference/html/classxmlpp_1_1Document_1_1Init-members.html create mode 100644 docs/reference/html/classxmlpp_1_1Document_1_1Init.html create mode 100644 docs/reference/html/inherit_graph_7.png create mode 100644 examples/Makefile.am create mode 100644 examples/Makefile.in create mode 100644 examples/dom_parser_raw/example_invalid.xml mode change 100644 => 100755 macros/ltmain.sh diff --git a/ChangeLog b/ChangeLog index 10e5294..f3a0d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,62 @@ +2.35.3: + +2012-06-19 Kjell Ahlstedt + + Add examples/Makefile.am. Let 'make check' run the examples. + + * examples/Makefile.am: New file. Let 'make check' both compile and run the + example programs. + * Makefile.am: Call examples/Makefile. Move all 'examples' stuff to + examples/Makefile.am. + * configure.ac: Remove --enable-examples. Generate examples/Makefile. + * .gitignore: Ignore make-check-sh. Bug #678390. + +2012-06-19 Kjell Ahlstedt + + Example programs: Fix return codes and print errors on std::cerr. + + * examples/*/main.cc: Return EXIT_FAILURE in case of failure. Print error + messages on std::cerr. The example programs can then be run by 'make check'. + Bug #678390. + +2012-04-20 Kjell Ahlstedt + + Node: Add functions eval_to_[boolean|number|string](). + + * examples/dom_xpath/example.xml: Add an element with numeric value. + * examples/dom_xpath/main.cc: Add calls to the new functions. + * libxml++/nodes/node.[h|cc]: + Add the functions eval_to_[boolean|number|string](). Bug #316244. + +2012-04-19 Kjell Ahlstedt + + Node: Make the previous fix thread-safe. + + * libxml++/nodes/node.cc: Delete the C++ wrapper of a deleted attribute node + without using xmlDeregisterNodeDefault. Bug #672992 comments 9-12. + +2012-04-19 Kjell Ahlstedt + + Node: Fix memory problems in import_node(). + + * libxml++/nodes/node.[h|cc]: Return added_node instead of imported_node, + which libxml2 may delete. Delete the C++ wrapper of a deleted attribute node. + * examples/import_node/example[1|2].xml: + * examples/import_node/main.cc: Import attributes and a text node which is + merged with an existing text node. Bug #672992. + +2012-04-12 Kjell Ahlstedt + + Define LIBXMLCPP_EXCEPTIONS_ENABLED unconditionally. + + * configure.ac: Add AC_DEFINE([LIBXMLCPP_EXCEPTIONS_ENABLED],[1],... + +2012-03-30 Murray Cumming + + Node: Check for a null pointer, to fix a scan-build warning. + + * libxml++/nodes/node.cc: This seems unlikely. + 2.35.2: 2012-03-21 Murray Cumming diff --git a/MSVC_Net2005/libxml++/libxml++.rc b/MSVC_Net2005/libxml++/libxml++.rc index 3fc22f0..05f536e 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,2,1 - PRODUCTVERSION 2,35,2,1 + FILEVERSION 2,35,3,1 + PRODUCTVERSION 2,35,3,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.2" + VALUE "FileVersion", "2.35.3" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.2" + VALUE "ProductVersion", "2.35.3" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2005/libxml++/libxml++config.h b/MSVC_Net2005/libxml++/libxml++config.h index 2cd4768..71b9996 100644 --- a/MSVC_Net2005/libxml++/libxml++config.h +++ b/MSVC_Net2005/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ +#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/MSVC_Net2008/libxml++/libxml++.rc b/MSVC_Net2008/libxml++/libxml++.rc index 3fc22f0..05f536e 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,2,1 - PRODUCTVERSION 2,35,2,1 + FILEVERSION 2,35,3,1 + PRODUCTVERSION 2,35,3,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.2" + VALUE "FileVersion", "2.35.3" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.2" + VALUE "ProductVersion", "2.35.3" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2008/libxml++/libxml++config.h b/MSVC_Net2008/libxml++/libxml++config.h index 2cd4768..71b9996 100644 --- a/MSVC_Net2008/libxml++/libxml++config.h +++ b/MSVC_Net2008/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ +#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/MSVC_Net2010/libxml++/libxml++.rc b/MSVC_Net2010/libxml++/libxml++.rc index 121aa1e..274e79d 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,2,1 - PRODUCTVERSION 2,35,2,1 + FILEVERSION 2,35,3,1 + PRODUCTVERSION 2,35,3,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.2" + VALUE "FileVersion", "2.35.3" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" VALUE "OriginalFilename", "libxml++-2.6" VALUE "ProductName", "libxml++" - VALUE "ProductVersion", "2.35.2" + VALUE "ProductVersion", "2.35.3" END END BLOCK "VarFileInfo" diff --git a/MSVC_Net2010/libxml++/libxml++config.h b/MSVC_Net2010/libxml++/libxml++config.h index 2cd4768..71b9996 100644 --- a/MSVC_Net2010/libxml++/libxml++config.h +++ b/MSVC_Net2010/libxml++/libxml++config.h @@ -7,7 +7,7 @@ #ifdef GLIBMM_CONFIGURE /* compiler feature tests that are used during compile time and run-time by libxml++ only. */ -/* #undef LIBXMLCPP_EXCEPTIONS_ENABLED */ +#define LIBXMLCPP_EXCEPTIONS_ENABLED 1 #endif /* GLIBMM_CONFIGURE */ #ifdef GLIBMM_MSC diff --git a/Makefile.am b/Makefile.am index 394f735..17e63e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = . examples + ACLOCAL_AMFLAGS = -I macros ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal @@ -13,23 +15,6 @@ libxml___libxml___@LIBXMLXX_API_VERSION@_la_LDFLAGS = \ libxml___libxml___@LIBXMLXX_API_VERSION@_la_LIBADD = $(LIBXMLXX_LIBS) libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES = $(cc_sources) $(h_sources_public) -if ENABLE_EXAMPLES -noinst_PROGRAMS = examples/dom_build/dom_build \ - examples/dom_parse_entities/dom_parse_entities \ - examples/dom_parser/dom_parser \ - examples/dom_parser_raw/dom_parser_raw \ - examples/dom_read_write/dom_read_write \ - examples/dom_xpath/dom_xpath \ - examples/dtdvalidation/dtdvalidation \ - examples/import_node/import_node \ - examples/sax_exception/sax_exception \ - examples/sax_parser/sax_parser \ - examples/sax_parser_build_dom/sax_parser_build_dom \ - examples/sax_parser_entities/sax_parser_entities \ - examples/schemavalidation/schemavalidation \ - examples/textreader/textreader -endif - AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) DEFS = @DEFS@ -DLIBXMLPP_BUILD @@ -121,73 +106,6 @@ library_nodes_include_HEADERS = $(h_nodes_sources_public) library_parsers_include_HEADERS = $(h_parsers_sources_public) library_validators_include_HEADERS = $(h_validators_sources_public) -if ENABLE_EXAMPLES - -examples_dom_build_dom_build_SOURCES = examples/dom_build/main.cc -examples_dom_parse_entities_dom_parse_entities_SOURCES = \ - examples/dom_parse_entities/main.cc -examples_dom_parser_dom_parser_SOURCES = examples/dom_parser/main.cc -examples_dom_parser_raw_dom_parser_raw_SOURCES = examples/dom_parser_raw/main.cc -examples_dom_read_write_dom_read_write_SOURCES = examples/dom_read_write/main.cc -examples_dom_xpath_dom_xpath_SOURCES = examples/dom_xpath/main.cc -examples_dtdvalidation_dtdvalidation_SOURCES = examples/dtdvalidation/main.cc -examples_import_node_import_node_SOURCES = examples/import_node/main.cc -examples_sax_exception_sax_exception_SOURCES = examples/sax_exception/main.cc \ - examples/sax_exception/myparser.cc \ - examples/sax_exception/myparser.h -examples_sax_parser_sax_parser_SOURCES = examples/sax_parser/main.cc \ - examples/sax_parser/myparser.cc \ - examples/sax_parser/myparser.h -examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES = \ - examples/sax_parser_build_dom/main.cc \ - examples/sax_parser_build_dom/svgparser.cc \ - examples/sax_parser_build_dom/svgparser.h \ - examples/sax_parser_build_dom/svgdocument.cc \ - examples/sax_parser_build_dom/svgdocument.h \ - examples/sax_parser_build_dom/svgelement.cc \ - examples/sax_parser_build_dom/svgelement.h \ - examples/sax_parser_build_dom/svgpath.h \ - examples/sax_parser_build_dom/svggroup.h -examples_sax_parser_entities_sax_parser_entities_SOURCES = \ - examples/sax_parser_entities/main.cc \ - examples/sax_parser_entities/myparser.cc \ - examples/sax_parser_entities/myparser.h -examples_schemavalidation_schemavalidation_SOURCES = \ - examples/schemavalidation/main.cc -examples_textreader_textreader_SOURCES = examples/textreader/main.cc - -examples_ldadd = libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) - -examples_dom_build_dom_build_LDADD = \ - $(examples_ldadd) -examples_dom_parse_entities_dom_parse_entities_LDADD = \ - $(examples_ldadd) -examples_dom_parser_dom_parser_LDADD = \ - $(examples_ldadd) -examples_dom_parser_raw_dom_parser_raw_LDADD = \ - $(examples_ldadd) -examples_dom_read_write_dom_read_write_LDADD = \ - $(examples_ldadd) -examples_dom_xpath_dom_xpath_LDADD = \ - $(examples_ldadd) -examples_dtdvalidation_dtdvalidation_LDADD = \ - $(examples_ldadd) -examples_import_node_import_node_LDADD = \ - $(examples_ldadd) -examples_sax_exception_sax_exception_LDADD = \ - $(examples_ldadd) -examples_sax_parser_sax_parser_LDADD = \ - $(examples_ldadd) -examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \ - $(examples_ldadd) -examples_sax_parser_entities_sax_parser_entities_LDADD = \ - $(examples_ldadd) -examples_schemavalidation_schemavalidation_LDADD = \ - $(examples_ldadd) -examples_textreader_textreader_LDADD = \ - $(examples_ldadd) -endif # ENABLE_EXAMPLES - docs/manual/libxml++.xml: docs/manual/libxml++_without_code.xml docs/manual/insert_example_code.pl $(AM_V_GEN)$(PERL) -- docs/manual/insert_example_code.pl examples $< >$@ @@ -231,30 +149,6 @@ dist_noinst_DATA += libxml++config.h.in \ $(manual_html_files) \ docs/manual/libxml++.xml \ docs/manual/libxml++_without_code.xml \ - examples/README \ - examples/dom_parser/example.xml \ - examples/dom_parser/example_with_namespace.xml \ - examples/dom_parser/example_invalid.xml \ - examples/dom_parser/example.dtd \ - examples/dom_parser_raw/example.xml \ - examples/dom_parser_raw/example.dtd \ - examples/dom_parse_entities/example.xml \ - examples/dom_parse_entities/example.dtd \ - examples/dom_read_write/README \ - examples/dom_read_write/example.xml \ - examples/dom_read_write/example.dtd \ - examples/dom_xpath/example.xml \ - examples/dtdvalidation/example.dtd \ - examples/import_node/example1.xml \ - examples/import_node/example2.xml \ - examples/sax_parser/example.xml \ - examples/sax_parser_entities/example.xml \ - examples/sax_exception/example.xml \ - examples/sax_parser_build_dom/README \ - examples/sax_parser_build_dom/example.xml \ - examples/schemavalidation/example.xml \ - examples/schemavalidation/example.xsd \ - examples/textreader/example.xml \ MSVC_Net2005/blank.cpp \ MSVC_Net2005/libxml++.sln \ MSVC_Net2005/README \ diff --git a/Makefile.in b/Makefile.in index 327e0c6..b7674b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,6 @@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -38,21 +37,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_EXAMPLES_TRUE@noinst_PROGRAMS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_build/dom_build$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parse_entities/dom_parse_entities$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parser/dom_parser$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parser_raw/dom_parser_raw$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_read_write/dom_read_write$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_xpath/dom_xpath$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/dtdvalidation/dtdvalidation$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/import_node/import_node$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_exception/sax_exception$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser/sax_parser$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_entities/sax_parser_entities$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/schemavalidation/schemavalidation$(EXEEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/textreader/textreader$(EXEEXT) DIST_COMMON = README $(am__configure_deps) \ $(am__dist_noinst_DATA_DIST) $(am__dist_reference_DATA_DIST) \ $(dist_noinst_SCRIPTS) $(library_exceptions_include_HEADERS) \ @@ -166,134 +150,6 @@ libxml___libxml___@LIBXMLXX_API_VERSION@_la_LINK = $(LIBTOOL) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_LDFLAGS) \ $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) -am__examples_dom_build_dom_build_SOURCES_DIST = \ - examples/dom_build/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_build_dom_build_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_build/main.$(OBJEXT) -examples_dom_build_dom_build_OBJECTS = \ - $(am_examples_dom_build_dom_build_OBJECTS) -@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_1) -@ENABLE_EXAMPLES_TRUE@examples_dom_build_dom_build_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dom_parse_entities_dom_parse_entities_SOURCES_DIST = \ - examples/dom_parse_entities/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_parse_entities_dom_parse_entities_OBJECTS = examples/dom_parse_entities/main.$(OBJEXT) -examples_dom_parse_entities_dom_parse_entities_OBJECTS = \ - $(am_examples_dom_parse_entities_dom_parse_entities_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dom_parser_dom_parser_SOURCES_DIST = \ - examples/dom_parser/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_parser_dom_parser_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parser/main.$(OBJEXT) -examples_dom_parser_dom_parser_OBJECTS = \ - $(am_examples_dom_parser_dom_parser_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_dom_parser_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dom_parser_raw_dom_parser_raw_SOURCES_DIST = \ - examples/dom_parser_raw/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_parser_raw_dom_parser_raw_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parser_raw/main.$(OBJEXT) -examples_dom_parser_raw_dom_parser_raw_OBJECTS = \ - $(am_examples_dom_parser_raw_dom_parser_raw_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dom_read_write_dom_read_write_SOURCES_DIST = \ - examples/dom_read_write/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_read_write_dom_read_write_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_read_write/main.$(OBJEXT) -examples_dom_read_write_dom_read_write_OBJECTS = \ - $(am_examples_dom_read_write_dom_read_write_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dom_read_write_dom_read_write_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dom_xpath_dom_xpath_SOURCES_DIST = \ - examples/dom_xpath/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dom_xpath_dom_xpath_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_xpath/main.$(OBJEXT) -examples_dom_xpath_dom_xpath_OBJECTS = \ - $(am_examples_dom_xpath_dom_xpath_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dom_xpath_dom_xpath_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_dtdvalidation_dtdvalidation_SOURCES_DIST = \ - examples/dtdvalidation/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_dtdvalidation_dtdvalidation_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/dtdvalidation/main.$(OBJEXT) -examples_dtdvalidation_dtdvalidation_OBJECTS = \ - $(am_examples_dtdvalidation_dtdvalidation_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_dtdvalidation_dtdvalidation_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_import_node_import_node_SOURCES_DIST = \ - examples/import_node/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_import_node_import_node_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/import_node/main.$(OBJEXT) -examples_import_node_import_node_OBJECTS = \ - $(am_examples_import_node_import_node_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_import_node_import_node_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_sax_exception_sax_exception_SOURCES_DIST = \ - examples/sax_exception/main.cc \ - examples/sax_exception/myparser.cc \ - examples/sax_exception/myparser.h -@ENABLE_EXAMPLES_TRUE@am_examples_sax_exception_sax_exception_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_exception/main.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_exception/myparser.$(OBJEXT) -examples_sax_exception_sax_exception_OBJECTS = \ - $(am_examples_sax_exception_sax_exception_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_sax_exception_sax_exception_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_sax_parser_sax_parser_SOURCES_DIST = \ - examples/sax_parser/main.cc examples/sax_parser/myparser.cc \ - examples/sax_parser/myparser.h -@ENABLE_EXAMPLES_TRUE@am_examples_sax_parser_sax_parser_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser/main.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser/myparser.$(OBJEXT) -examples_sax_parser_sax_parser_OBJECTS = \ - $(am_examples_sax_parser_sax_parser_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_sax_parser_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES_DIST = \ - examples/sax_parser_build_dom/main.cc \ - examples/sax_parser_build_dom/svgparser.cc \ - examples/sax_parser_build_dom/svgparser.h \ - examples/sax_parser_build_dom/svgdocument.cc \ - examples/sax_parser_build_dom/svgdocument.h \ - examples/sax_parser_build_dom/svgelement.cc \ - examples/sax_parser_build_dom/svgelement.h \ - examples/sax_parser_build_dom/svgpath.h \ - examples/sax_parser_build_dom/svggroup.h -@ENABLE_EXAMPLES_TRUE@am_examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS = examples/sax_parser_build_dom/main.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgparser.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgdocument.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgelement.$(OBJEXT) -examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS = $(am_examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_sax_parser_entities_sax_parser_entities_SOURCES_DIST = \ - examples/sax_parser_entities/main.cc \ - examples/sax_parser_entities/myparser.cc \ - examples/sax_parser_entities/myparser.h -@ENABLE_EXAMPLES_TRUE@am_examples_sax_parser_entities_sax_parser_entities_OBJECTS = examples/sax_parser_entities/main.$(OBJEXT) \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_entities/myparser.$(OBJEXT) -examples_sax_parser_entities_sax_parser_entities_OBJECTS = $(am_examples_sax_parser_entities_sax_parser_entities_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_schemavalidation_schemavalidation_SOURCES_DIST = \ - examples/schemavalidation/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_schemavalidation_schemavalidation_OBJECTS = examples/schemavalidation/main.$(OBJEXT) -examples_schemavalidation_schemavalidation_OBJECTS = \ - $(am_examples_schemavalidation_schemavalidation_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_schemavalidation_schemavalidation_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) -am__examples_textreader_textreader_SOURCES_DIST = \ - examples/textreader/main.cc -@ENABLE_EXAMPLES_TRUE@am_examples_textreader_textreader_OBJECTS = \ -@ENABLE_EXAMPLES_TRUE@ examples/textreader/main.$(OBJEXT) -examples_textreader_textreader_OBJECTS = \ - $(am_examples_textreader_textreader_OBJECTS) -@ENABLE_EXAMPLES_TRUE@examples_textreader_textreader_DEPENDENCIES = \ -@ENABLE_EXAMPLES_TRUE@ $(am__DEPENDENCIES_2) SCRIPTS = $(dist_noinst_SCRIPTS) DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/macros/depcomp @@ -337,64 +193,20 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES) \ - $(examples_dom_build_dom_build_SOURCES) \ - $(examples_dom_parse_entities_dom_parse_entities_SOURCES) \ - $(examples_dom_parser_dom_parser_SOURCES) \ - $(examples_dom_parser_raw_dom_parser_raw_SOURCES) \ - $(examples_dom_read_write_dom_read_write_SOURCES) \ - $(examples_dom_xpath_dom_xpath_SOURCES) \ - $(examples_dtdvalidation_dtdvalidation_SOURCES) \ - $(examples_import_node_import_node_SOURCES) \ - $(examples_sax_exception_sax_exception_SOURCES) \ - $(examples_sax_parser_sax_parser_SOURCES) \ - $(examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES) \ - $(examples_sax_parser_entities_sax_parser_entities_SOURCES) \ - $(examples_schemavalidation_schemavalidation_SOURCES) \ - $(examples_textreader_textreader_SOURCES) -DIST_SOURCES = $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES) \ - $(am__examples_dom_build_dom_build_SOURCES_DIST) \ - $(am__examples_dom_parse_entities_dom_parse_entities_SOURCES_DIST) \ - $(am__examples_dom_parser_dom_parser_SOURCES_DIST) \ - $(am__examples_dom_parser_raw_dom_parser_raw_SOURCES_DIST) \ - $(am__examples_dom_read_write_dom_read_write_SOURCES_DIST) \ - $(am__examples_dom_xpath_dom_xpath_SOURCES_DIST) \ - $(am__examples_dtdvalidation_dtdvalidation_SOURCES_DIST) \ - $(am__examples_import_node_import_node_SOURCES_DIST) \ - $(am__examples_sax_exception_sax_exception_SOURCES_DIST) \ - $(am__examples_sax_parser_sax_parser_SOURCES_DIST) \ - $(am__examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES_DIST) \ - $(am__examples_sax_parser_entities_sax_parser_entities_SOURCES_DIST) \ - $(am__examples_schemavalidation_schemavalidation_SOURCES_DIST) \ - $(am__examples_textreader_textreader_SOURCES_DIST) +SOURCES = $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES) +DIST_SOURCES = $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__dist_noinst_DATA_DIST = libxml++config.h.in \ libxml++-$(LIBXMLXX_API_VERSION).pc.in MAINTAINERS \ docs/manual/docbook-customisation.xsl $(wildcard \ docs/manual/html/*.html) docs/manual/libxml++.xml \ - docs/manual/libxml++_without_code.xml examples/README \ - examples/dom_parser/example.xml \ - examples/dom_parser/example_with_namespace.xml \ - examples/dom_parser/example_invalid.xml \ - examples/dom_parser/example.dtd \ - examples/dom_parser_raw/example.xml \ - examples/dom_parser_raw/example.dtd \ - examples/dom_parse_entities/example.xml \ - examples/dom_parse_entities/example.dtd \ - examples/dom_read_write/README \ - examples/dom_read_write/example.xml \ - examples/dom_read_write/example.dtd \ - examples/dom_xpath/example.xml \ - examples/dtdvalidation/example.dtd \ - examples/import_node/example1.xml \ - examples/import_node/example2.xml \ - examples/sax_parser/example.xml \ - examples/sax_parser_entities/example.xml \ - examples/sax_exception/example.xml \ - examples/sax_parser_build_dom/README \ - examples/sax_parser_build_dom/example.xml \ - examples/schemavalidation/example.xml \ - examples/schemavalidation/example.xsd \ - examples/textreader/example.xml MSVC_Net2005/blank.cpp \ + docs/manual/libxml++_without_code.xml MSVC_Net2005/blank.cpp \ MSVC_Net2005/libxml++.sln MSVC_Net2005/README \ MSVC_Net2005/gendef/gendef.cc \ MSVC_Net2005/gendef/gendef.vcproj \ @@ -480,8 +292,14 @@ HEADERS = $(library_exceptions_include_HEADERS) \ $(library_nodes_include_HEADERS) \ $(library_parsers_include_HEADERS) \ $(library_validators_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -491,6 +309,31 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -560,7 +403,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MMDOCTOOLDIR = @MMDOCTOOLDIR@ NM = @NM@ @@ -593,7 +435,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -627,6 +468,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -642,6 +484,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = . examples ACLOCAL_AMFLAGS = -I macros ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal library_configdir = $(libdir)/libxml++-@LIBXMLXX_API_VERSION@/include @@ -747,87 +590,6 @@ library_io_include_HEADERS = $(h_io_sources_public) library_nodes_include_HEADERS = $(h_nodes_sources_public) library_parsers_include_HEADERS = $(h_parsers_sources_public) library_validators_include_HEADERS = $(h_validators_sources_public) -@ENABLE_EXAMPLES_TRUE@examples_dom_build_dom_build_SOURCES = examples/dom_build/main.cc -@ENABLE_EXAMPLES_TRUE@examples_dom_parse_entities_dom_parse_entities_SOURCES = \ -@ENABLE_EXAMPLES_TRUE@ examples/dom_parse_entities/main.cc - -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_dom_parser_SOURCES = examples/dom_parser/main.cc -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_raw_dom_parser_raw_SOURCES = examples/dom_parser_raw/main.cc -@ENABLE_EXAMPLES_TRUE@examples_dom_read_write_dom_read_write_SOURCES = examples/dom_read_write/main.cc -@ENABLE_EXAMPLES_TRUE@examples_dom_xpath_dom_xpath_SOURCES = examples/dom_xpath/main.cc -@ENABLE_EXAMPLES_TRUE@examples_dtdvalidation_dtdvalidation_SOURCES = examples/dtdvalidation/main.cc -@ENABLE_EXAMPLES_TRUE@examples_import_node_import_node_SOURCES = examples/import_node/main.cc -@ENABLE_EXAMPLES_TRUE@examples_sax_exception_sax_exception_SOURCES = examples/sax_exception/main.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_exception/myparser.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_exception/myparser.h - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_sax_parser_SOURCES = examples/sax_parser/main.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser/myparser.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser/myparser.h - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES = \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/main.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgparser.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgparser.h \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgdocument.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgdocument.h \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgelement.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgelement.h \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svgpath.h \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_build_dom/svggroup.h - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_entities_sax_parser_entities_SOURCES = \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_entities/main.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_entities/myparser.cc \ -@ENABLE_EXAMPLES_TRUE@ examples/sax_parser_entities/myparser.h - -@ENABLE_EXAMPLES_TRUE@examples_schemavalidation_schemavalidation_SOURCES = \ -@ENABLE_EXAMPLES_TRUE@ examples/schemavalidation/main.cc - -@ENABLE_EXAMPLES_TRUE@examples_textreader_textreader_SOURCES = examples/textreader/main.cc -@ENABLE_EXAMPLES_TRUE@examples_ldadd = libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) -@ENABLE_EXAMPLES_TRUE@examples_dom_build_dom_build_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dom_parse_entities_dom_parse_entities_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_dom_parser_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dom_parser_raw_dom_parser_raw_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dom_read_write_dom_read_write_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dom_xpath_dom_xpath_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_dtdvalidation_dtdvalidation_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_import_node_import_node_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_sax_exception_sax_exception_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_sax_parser_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_sax_parser_entities_sax_parser_entities_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_schemavalidation_schemavalidation_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - -@ENABLE_EXAMPLES_TRUE@examples_textreader_textreader_LDADD = \ -@ENABLE_EXAMPLES_TRUE@ $(examples_ldadd) - @ENABLE_DOCUMENTATION_TRUE@book_name = $(LIBXMLXX_MODULE_NAME) @ENABLE_DOCUMENTATION_TRUE@doc_input = $(h_sources_public) @ENABLE_DOCUMENTATION_TRUE@doc_outdir = docs/reference @@ -857,30 +619,6 @@ library_validators_include_HEADERS = $(h_validators_sources_public) @ENABLE_DOCUMENTATION_FALSE@ $(manual_html_files) \ @ENABLE_DOCUMENTATION_FALSE@ docs/manual/libxml++.xml \ @ENABLE_DOCUMENTATION_FALSE@ docs/manual/libxml++_without_code.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/README \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser/example_with_namespace.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser/example_invalid.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser/example.dtd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser_raw/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parser_raw/example.dtd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parse_entities/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_parse_entities/example.dtd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_read_write/README \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_read_write/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_read_write/example.dtd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dom_xpath/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/dtdvalidation/example.dtd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/import_node/example1.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/import_node/example2.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/sax_parser/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/sax_parser_entities/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/sax_exception/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/sax_parser_build_dom/README \ -@ENABLE_DOCUMENTATION_FALSE@ examples/sax_parser_build_dom/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/schemavalidation/example.xml \ -@ENABLE_DOCUMENTATION_FALSE@ examples/schemavalidation/example.xsd \ -@ENABLE_DOCUMENTATION_FALSE@ examples/textreader/example.xml \ @ENABLE_DOCUMENTATION_FALSE@ MSVC_Net2005/blank.cpp \ @ENABLE_DOCUMENTATION_FALSE@ MSVC_Net2005/libxml++.sln \ @ENABLE_DOCUMENTATION_FALSE@ MSVC_Net2005/README \ @@ -971,30 +709,6 @@ library_validators_include_HEADERS = $(h_validators_sources_public) @ENABLE_DOCUMENTATION_TRUE@ $(manual_html_files) \ @ENABLE_DOCUMENTATION_TRUE@ docs/manual/libxml++.xml \ @ENABLE_DOCUMENTATION_TRUE@ docs/manual/libxml++_without_code.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/README \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser/example_with_namespace.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser/example_invalid.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser/example.dtd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser_raw/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parser_raw/example.dtd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parse_entities/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_parse_entities/example.dtd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_read_write/README \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_read_write/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_read_write/example.dtd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dom_xpath/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/dtdvalidation/example.dtd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/import_node/example1.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/import_node/example2.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/sax_parser/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/sax_parser_entities/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/sax_exception/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/sax_parser_build_dom/README \ -@ENABLE_DOCUMENTATION_TRUE@ examples/sax_parser_build_dom/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/schemavalidation/example.xml \ -@ENABLE_DOCUMENTATION_TRUE@ examples/schemavalidation/example.xsd \ -@ENABLE_DOCUMENTATION_TRUE@ examples/textreader/example.xml \ @ENABLE_DOCUMENTATION_TRUE@ MSVC_Net2005/blank.cpp \ @ENABLE_DOCUMENTATION_TRUE@ MSVC_Net2005/libxml++.sln \ @ENABLE_DOCUMENTATION_TRUE@ MSVC_Net2005/README \ @@ -1145,7 +859,7 @@ dist_noinst_SCRIPTS = autogen.sh \ web_path_project = /home/groups/l/li/libxmlplusplus/htdocs/ rsync_args = -vz --rsh ssh --recursive --cvs-exclude --exclude="**1.0**" --exclude=".cvsignore" --exclude="Makefile" --exclude="Makefile.in" --exclude=".deps" --exclude=".libs" all: config.h libxml++config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .cc .lo .o .obj @@ -1357,221 +1071,8 @@ libxml++/validators/validator.lo: libxml++/validators/$(am__dirstamp) \ libxml++/libxml++-@LIBXMLXX_API_VERSION@.la: $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libxml___libxml___@LIBXMLXX_API_VERSION@_la_DEPENDENCIES) libxml++/$(am__dirstamp) $(AM_V_CXXLD)$(libxml___libxml___@LIBXMLXX_API_VERSION@_la_LINK) -rpath $(libdir) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_OBJECTS) $(libxml___libxml___@LIBXMLXX_API_VERSION@_la_LIBADD) $(LIBS) -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -examples/dom_build/$(am__dirstamp): - @$(MKDIR_P) examples/dom_build - @: > examples/dom_build/$(am__dirstamp) -examples/dom_build/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_build/$(DEPDIR) - @: > examples/dom_build/$(DEPDIR)/$(am__dirstamp) -examples/dom_build/main.$(OBJEXT): examples/dom_build/$(am__dirstamp) \ - examples/dom_build/$(DEPDIR)/$(am__dirstamp) -examples/dom_build/dom_build$(EXEEXT): $(examples_dom_build_dom_build_OBJECTS) $(examples_dom_build_dom_build_DEPENDENCIES) $(EXTRA_examples_dom_build_dom_build_DEPENDENCIES) examples/dom_build/$(am__dirstamp) - @rm -f examples/dom_build/dom_build$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_build_dom_build_OBJECTS) $(examples_dom_build_dom_build_LDADD) $(LIBS) -examples/dom_parse_entities/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parse_entities - @: > examples/dom_parse_entities/$(am__dirstamp) -examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parse_entities/$(DEPDIR) - @: > examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp) -examples/dom_parse_entities/main.$(OBJEXT): \ - examples/dom_parse_entities/$(am__dirstamp) \ - examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp) -examples/dom_parse_entities/dom_parse_entities$(EXEEXT): $(examples_dom_parse_entities_dom_parse_entities_OBJECTS) $(examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES) $(EXTRA_examples_dom_parse_entities_dom_parse_entities_DEPENDENCIES) examples/dom_parse_entities/$(am__dirstamp) - @rm -f examples/dom_parse_entities/dom_parse_entities$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parse_entities_dom_parse_entities_OBJECTS) $(examples_dom_parse_entities_dom_parse_entities_LDADD) $(LIBS) -examples/dom_parser/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parser - @: > examples/dom_parser/$(am__dirstamp) -examples/dom_parser/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parser/$(DEPDIR) - @: > examples/dom_parser/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser/main.$(OBJEXT): \ - examples/dom_parser/$(am__dirstamp) \ - examples/dom_parser/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser/dom_parser$(EXEEXT): $(examples_dom_parser_dom_parser_OBJECTS) $(examples_dom_parser_dom_parser_DEPENDENCIES) $(EXTRA_examples_dom_parser_dom_parser_DEPENDENCIES) examples/dom_parser/$(am__dirstamp) - @rm -f examples/dom_parser/dom_parser$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parser_dom_parser_OBJECTS) $(examples_dom_parser_dom_parser_LDADD) $(LIBS) -examples/dom_parser_raw/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parser_raw - @: > examples/dom_parser_raw/$(am__dirstamp) -examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_parser_raw/$(DEPDIR) - @: > examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser_raw/main.$(OBJEXT): \ - examples/dom_parser_raw/$(am__dirstamp) \ - examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp) -examples/dom_parser_raw/dom_parser_raw$(EXEEXT): $(examples_dom_parser_raw_dom_parser_raw_OBJECTS) $(examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES) $(EXTRA_examples_dom_parser_raw_dom_parser_raw_DEPENDENCIES) examples/dom_parser_raw/$(am__dirstamp) - @rm -f examples/dom_parser_raw/dom_parser_raw$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_parser_raw_dom_parser_raw_OBJECTS) $(examples_dom_parser_raw_dom_parser_raw_LDADD) $(LIBS) -examples/dom_read_write/$(am__dirstamp): - @$(MKDIR_P) examples/dom_read_write - @: > examples/dom_read_write/$(am__dirstamp) -examples/dom_read_write/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_read_write/$(DEPDIR) - @: > examples/dom_read_write/$(DEPDIR)/$(am__dirstamp) -examples/dom_read_write/main.$(OBJEXT): \ - examples/dom_read_write/$(am__dirstamp) \ - examples/dom_read_write/$(DEPDIR)/$(am__dirstamp) -examples/dom_read_write/dom_read_write$(EXEEXT): $(examples_dom_read_write_dom_read_write_OBJECTS) $(examples_dom_read_write_dom_read_write_DEPENDENCIES) $(EXTRA_examples_dom_read_write_dom_read_write_DEPENDENCIES) examples/dom_read_write/$(am__dirstamp) - @rm -f examples/dom_read_write/dom_read_write$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_read_write_dom_read_write_OBJECTS) $(examples_dom_read_write_dom_read_write_LDADD) $(LIBS) -examples/dom_xpath/$(am__dirstamp): - @$(MKDIR_P) examples/dom_xpath - @: > examples/dom_xpath/$(am__dirstamp) -examples/dom_xpath/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dom_xpath/$(DEPDIR) - @: > examples/dom_xpath/$(DEPDIR)/$(am__dirstamp) -examples/dom_xpath/main.$(OBJEXT): examples/dom_xpath/$(am__dirstamp) \ - examples/dom_xpath/$(DEPDIR)/$(am__dirstamp) -examples/dom_xpath/dom_xpath$(EXEEXT): $(examples_dom_xpath_dom_xpath_OBJECTS) $(examples_dom_xpath_dom_xpath_DEPENDENCIES) $(EXTRA_examples_dom_xpath_dom_xpath_DEPENDENCIES) examples/dom_xpath/$(am__dirstamp) - @rm -f examples/dom_xpath/dom_xpath$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dom_xpath_dom_xpath_OBJECTS) $(examples_dom_xpath_dom_xpath_LDADD) $(LIBS) -examples/dtdvalidation/$(am__dirstamp): - @$(MKDIR_P) examples/dtdvalidation - @: > examples/dtdvalidation/$(am__dirstamp) -examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/dtdvalidation/$(DEPDIR) - @: > examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp) -examples/dtdvalidation/main.$(OBJEXT): \ - examples/dtdvalidation/$(am__dirstamp) \ - examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp) -examples/dtdvalidation/dtdvalidation$(EXEEXT): $(examples_dtdvalidation_dtdvalidation_OBJECTS) $(examples_dtdvalidation_dtdvalidation_DEPENDENCIES) $(EXTRA_examples_dtdvalidation_dtdvalidation_DEPENDENCIES) examples/dtdvalidation/$(am__dirstamp) - @rm -f examples/dtdvalidation/dtdvalidation$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_dtdvalidation_dtdvalidation_OBJECTS) $(examples_dtdvalidation_dtdvalidation_LDADD) $(LIBS) -examples/import_node/$(am__dirstamp): - @$(MKDIR_P) examples/import_node - @: > examples/import_node/$(am__dirstamp) -examples/import_node/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/import_node/$(DEPDIR) - @: > examples/import_node/$(DEPDIR)/$(am__dirstamp) -examples/import_node/main.$(OBJEXT): \ - examples/import_node/$(am__dirstamp) \ - examples/import_node/$(DEPDIR)/$(am__dirstamp) -examples/import_node/import_node$(EXEEXT): $(examples_import_node_import_node_OBJECTS) $(examples_import_node_import_node_DEPENDENCIES) $(EXTRA_examples_import_node_import_node_DEPENDENCIES) examples/import_node/$(am__dirstamp) - @rm -f examples/import_node/import_node$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_import_node_import_node_OBJECTS) $(examples_import_node_import_node_LDADD) $(LIBS) -examples/sax_exception/$(am__dirstamp): - @$(MKDIR_P) examples/sax_exception - @: > examples/sax_exception/$(am__dirstamp) -examples/sax_exception/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/sax_exception/$(DEPDIR) - @: > examples/sax_exception/$(DEPDIR)/$(am__dirstamp) -examples/sax_exception/main.$(OBJEXT): \ - examples/sax_exception/$(am__dirstamp) \ - examples/sax_exception/$(DEPDIR)/$(am__dirstamp) -examples/sax_exception/myparser.$(OBJEXT): \ - examples/sax_exception/$(am__dirstamp) \ - examples/sax_exception/$(DEPDIR)/$(am__dirstamp) -examples/sax_exception/sax_exception$(EXEEXT): $(examples_sax_exception_sax_exception_OBJECTS) $(examples_sax_exception_sax_exception_DEPENDENCIES) $(EXTRA_examples_sax_exception_sax_exception_DEPENDENCIES) examples/sax_exception/$(am__dirstamp) - @rm -f examples/sax_exception/sax_exception$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_exception_sax_exception_OBJECTS) $(examples_sax_exception_sax_exception_LDADD) $(LIBS) -examples/sax_parser/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser - @: > examples/sax_parser/$(am__dirstamp) -examples/sax_parser/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser/$(DEPDIR) - @: > examples/sax_parser/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser/main.$(OBJEXT): \ - examples/sax_parser/$(am__dirstamp) \ - examples/sax_parser/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser/myparser.$(OBJEXT): \ - examples/sax_parser/$(am__dirstamp) \ - examples/sax_parser/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser/sax_parser$(EXEEXT): $(examples_sax_parser_sax_parser_OBJECTS) $(examples_sax_parser_sax_parser_DEPENDENCIES) $(EXTRA_examples_sax_parser_sax_parser_DEPENDENCIES) examples/sax_parser/$(am__dirstamp) - @rm -f examples/sax_parser/sax_parser$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_sax_parser_OBJECTS) $(examples_sax_parser_sax_parser_LDADD) $(LIBS) -examples/sax_parser_build_dom/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser_build_dom - @: > examples/sax_parser_build_dom/$(am__dirstamp) -examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser_build_dom/$(DEPDIR) - @: > examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/main.$(OBJEXT): \ - examples/sax_parser_build_dom/$(am__dirstamp) \ - examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/svgparser.$(OBJEXT): \ - examples/sax_parser_build_dom/$(am__dirstamp) \ - examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/svgdocument.$(OBJEXT): \ - examples/sax_parser_build_dom/$(am__dirstamp) \ - examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/svgelement.$(OBJEXT): \ - examples/sax_parser_build_dom/$(am__dirstamp) \ - examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT): $(examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) $(EXTRA_examples_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) examples/sax_parser_build_dom/$(am__dirstamp) - @rm -f examples/sax_parser_build_dom/sax_parser_build_dom$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(examples_sax_parser_build_dom_sax_parser_build_dom_LDADD) $(LIBS) -examples/sax_parser_entities/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser_entities - @: > examples/sax_parser_entities/$(am__dirstamp) -examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/sax_parser_entities/$(DEPDIR) - @: > examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_entities/main.$(OBJEXT): \ - examples/sax_parser_entities/$(am__dirstamp) \ - examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_entities/myparser.$(OBJEXT): \ - examples/sax_parser_entities/$(am__dirstamp) \ - examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp) -examples/sax_parser_entities/sax_parser_entities$(EXEEXT): $(examples_sax_parser_entities_sax_parser_entities_OBJECTS) $(examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES) $(EXTRA_examples_sax_parser_entities_sax_parser_entities_DEPENDENCIES) examples/sax_parser_entities/$(am__dirstamp) - @rm -f examples/sax_parser_entities/sax_parser_entities$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_sax_parser_entities_sax_parser_entities_OBJECTS) $(examples_sax_parser_entities_sax_parser_entities_LDADD) $(LIBS) -examples/schemavalidation/$(am__dirstamp): - @$(MKDIR_P) examples/schemavalidation - @: > examples/schemavalidation/$(am__dirstamp) -examples/schemavalidation/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/schemavalidation/$(DEPDIR) - @: > examples/schemavalidation/$(DEPDIR)/$(am__dirstamp) -examples/schemavalidation/main.$(OBJEXT): \ - examples/schemavalidation/$(am__dirstamp) \ - examples/schemavalidation/$(DEPDIR)/$(am__dirstamp) -examples/schemavalidation/schemavalidation$(EXEEXT): $(examples_schemavalidation_schemavalidation_OBJECTS) $(examples_schemavalidation_schemavalidation_DEPENDENCIES) $(EXTRA_examples_schemavalidation_schemavalidation_DEPENDENCIES) examples/schemavalidation/$(am__dirstamp) - @rm -f examples/schemavalidation/schemavalidation$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_schemavalidation_schemavalidation_OBJECTS) $(examples_schemavalidation_schemavalidation_LDADD) $(LIBS) -examples/textreader/$(am__dirstamp): - @$(MKDIR_P) examples/textreader - @: > examples/textreader/$(am__dirstamp) -examples/textreader/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) examples/textreader/$(DEPDIR) - @: > examples/textreader/$(DEPDIR)/$(am__dirstamp) -examples/textreader/main.$(OBJEXT): \ - examples/textreader/$(am__dirstamp) \ - examples/textreader/$(DEPDIR)/$(am__dirstamp) -examples/textreader/textreader$(EXEEXT): $(examples_textreader_textreader_OBJECTS) $(examples_textreader_textreader_DEPENDENCIES) $(EXTRA_examples_textreader_textreader_DEPENDENCIES) examples/textreader/$(am__dirstamp) - @rm -f examples/textreader/textreader$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(examples_textreader_textreader_OBJECTS) $(examples_textreader_textreader_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f examples/dom_build/main.$(OBJEXT) - -rm -f examples/dom_parse_entities/main.$(OBJEXT) - -rm -f examples/dom_parser/main.$(OBJEXT) - -rm -f examples/dom_parser_raw/main.$(OBJEXT) - -rm -f examples/dom_read_write/main.$(OBJEXT) - -rm -f examples/dom_xpath/main.$(OBJEXT) - -rm -f examples/dtdvalidation/main.$(OBJEXT) - -rm -f examples/import_node/main.$(OBJEXT) - -rm -f examples/sax_exception/main.$(OBJEXT) - -rm -f examples/sax_exception/myparser.$(OBJEXT) - -rm -f examples/sax_parser/main.$(OBJEXT) - -rm -f examples/sax_parser/myparser.$(OBJEXT) - -rm -f examples/sax_parser_build_dom/main.$(OBJEXT) - -rm -f examples/sax_parser_build_dom/svgdocument.$(OBJEXT) - -rm -f examples/sax_parser_build_dom/svgelement.$(OBJEXT) - -rm -f examples/sax_parser_build_dom/svgparser.$(OBJEXT) - -rm -f examples/sax_parser_entities/main.$(OBJEXT) - -rm -f examples/sax_parser_entities/myparser.$(OBJEXT) - -rm -f examples/schemavalidation/main.$(OBJEXT) - -rm -f examples/textreader/main.$(OBJEXT) -rm -f libxml++/attribute.$(OBJEXT) -rm -f libxml++/attribute.lo -rm -f libxml++/attributedeclaration.$(OBJEXT) @@ -1640,26 +1141,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_build/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_parse_entities/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_parser/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_parser_raw/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_read_write/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dom_xpath/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/dtdvalidation/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/import_node/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_exception/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_exception/$(DEPDIR)/myparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser/$(DEPDIR)/myparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_build_dom/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_build_dom/$(DEPDIR)/svgdocument.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_build_dom/$(DEPDIR)/svgelement.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_build_dom/$(DEPDIR)/svgparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_entities/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/sax_parser_entities/$(DEPDIR)/myparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/schemavalidation/$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@examples/textreader/$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libxml++/$(DEPDIR)/attribute.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libxml++/$(DEPDIR)/attributedeclaration.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libxml++/$(DEPDIR)/attributenode.Plo@am__quote@ @@ -1722,20 +1203,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -rm -rf examples/dom_build/.libs examples/dom_build/_libs - -rm -rf examples/dom_parse_entities/.libs examples/dom_parse_entities/_libs - -rm -rf examples/dom_parser/.libs examples/dom_parser/_libs - -rm -rf examples/dom_parser_raw/.libs examples/dom_parser_raw/_libs - -rm -rf examples/dom_read_write/.libs examples/dom_read_write/_libs - -rm -rf examples/dom_xpath/.libs examples/dom_xpath/_libs - -rm -rf examples/dtdvalidation/.libs examples/dtdvalidation/_libs - -rm -rf examples/import_node/.libs examples/import_node/_libs - -rm -rf examples/sax_exception/.libs examples/sax_exception/_libs - -rm -rf examples/sax_parser/.libs examples/sax_parser/_libs - -rm -rf examples/sax_parser_build_dom/.libs examples/sax_parser_build_dom/_libs - -rm -rf examples/sax_parser_entities/.libs examples/sax_parser_entities/_libs - -rm -rf examples/schemavalidation/.libs examples/schemavalidation/_libs - -rm -rf examples/textreader/.libs examples/textreader/_libs -rm -rf libxml++/.libs libxml++/_libs -rm -rf libxml++/exceptions/.libs libxml++/exceptions/_libs -rm -rf libxml++/io/.libs libxml++/io/_libs @@ -1908,6 +1375,76 @@ uninstall-library_validators_includeHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(library_validators_includedir)'; $(am__uninstall_files_from_dir) +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1918,10 +1455,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in libxml++config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in libxml++config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) config.h.in libxml++config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -1940,7 +1490,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in libxml++config.h.in $(TAGS_DEPENDENCIES fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in libxml++config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in libxml++config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) config.h.in libxml++config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1992,6 +1542,34 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -2123,23 +1701,24 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-am +check: check-recursive @ENABLE_DOCUMENTATION_FALSE@all-local: -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ - $(HEADERS) config.h libxml++config.h all-local -installdirs: +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) config.h \ + libxml++config.h all-local +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(referencedir)" "$(DESTDIR)$(library_configdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(library_exceptions_includedir)" "$(DESTDIR)$(library_includedir)" "$(DESTDIR)$(library_io_includedir)" "$(DESTDIR)$(library_nodes_includedir)" "$(DESTDIR)$(library_parsers_includedir)" "$(DESTDIR)$(library_validators_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -2157,34 +1736,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f examples/dom_build/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_build/$(am__dirstamp) - -rm -f examples/dom_parse_entities/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_parse_entities/$(am__dirstamp) - -rm -f examples/dom_parser/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_parser/$(am__dirstamp) - -rm -f examples/dom_parser_raw/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_parser_raw/$(am__dirstamp) - -rm -f examples/dom_read_write/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_read_write/$(am__dirstamp) - -rm -f examples/dom_xpath/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dom_xpath/$(am__dirstamp) - -rm -f examples/dtdvalidation/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/dtdvalidation/$(am__dirstamp) - -rm -f examples/import_node/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/import_node/$(am__dirstamp) - -rm -f examples/sax_exception/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/sax_exception/$(am__dirstamp) - -rm -f examples/sax_parser/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/sax_parser/$(am__dirstamp) - -rm -f examples/sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/sax_parser_build_dom/$(am__dirstamp) - -rm -f examples/sax_parser_entities/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/sax_parser_entities/$(am__dirstamp) - -rm -f examples/schemavalidation/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/schemavalidation/$(am__dirstamp) - -rm -f examples/textreader/$(DEPDIR)/$(am__dirstamp) - -rm -f examples/textreader/$(am__dirstamp) -rm -f libxml++/$(DEPDIR)/$(am__dirstamp) -rm -f libxml++/$(am__dirstamp) -rm -f libxml++/exceptions/$(DEPDIR)/$(am__dirstamp) @@ -2205,27 +1756,27 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) @ENABLE_DOCUMENTATION_FALSE@uninstall-local: @ENABLE_DOCUMENTATION_FALSE@install-data-local: -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstPROGRAMS mostlyclean-am + mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf examples/dom_build/$(DEPDIR) examples/dom_parse_entities/$(DEPDIR) examples/dom_parser/$(DEPDIR) examples/dom_parser_raw/$(DEPDIR) examples/dom_read_write/$(DEPDIR) examples/dom_xpath/$(DEPDIR) examples/dtdvalidation/$(DEPDIR) examples/import_node/$(DEPDIR) examples/sax_exception/$(DEPDIR) examples/sax_parser/$(DEPDIR) examples/sax_parser_build_dom/$(DEPDIR) examples/sax_parser_entities/$(DEPDIR) examples/schemavalidation/$(DEPDIR) examples/textreader/$(DEPDIR) libxml++/$(DEPDIR) libxml++/exceptions/$(DEPDIR) libxml++/io/$(DEPDIR) libxml++/nodes/$(DEPDIR) libxml++/parsers/$(DEPDIR) libxml++/validators/$(DEPDIR) + -rm -rf libxml++/$(DEPDIR) libxml++/exceptions/$(DEPDIR) libxml++/io/$(DEPDIR) libxml++/nodes/$(DEPDIR) libxml++/parsers/$(DEPDIR) libxml++/validators/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: @@ -2239,49 +1790,49 @@ install-data-am: install-data-local install-dist_referenceDATA \ install-library_validators_includeHEADERS \ install-nodist_pkgconfigDATA -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: install-libLTLIBRARIES -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf examples/dom_build/$(DEPDIR) examples/dom_parse_entities/$(DEPDIR) examples/dom_parser/$(DEPDIR) examples/dom_parser_raw/$(DEPDIR) examples/dom_read_write/$(DEPDIR) examples/dom_xpath/$(DEPDIR) examples/dtdvalidation/$(DEPDIR) examples/import_node/$(DEPDIR) examples/sax_exception/$(DEPDIR) examples/sax_parser/$(DEPDIR) examples/sax_parser_build_dom/$(DEPDIR) examples/sax_parser_entities/$(DEPDIR) examples/schemavalidation/$(DEPDIR) examples/textreader/$(DEPDIR) libxml++/$(DEPDIR) libxml++/exceptions/$(DEPDIR) libxml++/io/$(DEPDIR) libxml++/nodes/$(DEPDIR) libxml++/parsers/$(DEPDIR) libxml++/validators/$(DEPDIR) + -rm -rf libxml++/$(DEPDIR) libxml++/exceptions/$(DEPDIR) libxml++/io/$(DEPDIR) libxml++/nodes/$(DEPDIR) libxml++/parsers/$(DEPDIR) libxml++/validators/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: @@ -2295,16 +1846,18 @@ uninstall-am: uninstall-dist_referenceDATA uninstall-libLTLIBRARIES \ uninstall-library_validators_includeHEADERS uninstall-local \ uninstall-nodist_pkgconfigDATA -.MAKE: all install-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ - clean clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \ - dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local am--refresh check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \ + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ install-data-local install-dist_referenceDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ @@ -2317,11 +1870,12 @@ uninstall-am: uninstall-dist_referenceDATA uninstall-libLTLIBRARIES \ install-library_validators_includeHEADERS install-man \ install-nodist_pkgconfigDATA install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dist_referenceDATA \ - uninstall-libLTLIBRARIES uninstall-library_configDATA \ + tags tags-recursive uninstall uninstall-am \ + uninstall-dist_referenceDATA uninstall-libLTLIBRARIES \ + uninstall-library_configDATA \ uninstall-library_exceptions_includeHEADERS \ uninstall-library_includeHEADERS \ uninstall-library_io_includeHEADERS \ diff --git a/NEWS b/NEWS index 34b67f4..a9ee85c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +2.35.3 (unstable): + +* Node: + - Add eval_to_[boolean|number|string]() methods. + (Kjell Ahlstedt) Bug #316244 + - Fix memory problems in import_node(). + (Kjell Ahlstedt) Bug #672992 +* Build: + - The examples are now built and run during make check. + (Kjell Ahlstedt) Bug #678390 + - Define LIBXMLCPP_EXCEPTIONS_ENABLED unconditionally. + (Kjell Ahlstedt) + 2.35.2 (unstable): * Node: Add get_first_child(). diff --git a/aclocal.m4 b/aclocal.m4 index 0dde6a9..e038852 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1066,165 +1066,104 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -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]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# serial 5 lt~obsolete.m4 -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) +# These exist entirely to fool aclocal when bootstrapping libtool. # +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. # -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) # +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -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 --cflags --libs "$2" 2>&1` - else - $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 - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) #serial 20090814 @@ -1590,6 +1529,164 @@ test "x$mm_all_flags" != x || mm_all_flags=none AC_MSG_RESULT([$mm_all_flags])[]dnl ]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +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]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + 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_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +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` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + m4_include([macros/libtool.m4]) m4_include([macros/ltoptions.m4]) m4_include([macros/ltsugar.m4]) diff --git a/config.h.in b/config.h.in index 920dec8..15feaff 100644 --- a/config.h.in +++ b/config.h.in @@ -39,6 +39,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* This is always set. This is only for backwards compatibility. */ +#undef LIBXMLCPP_EXCEPTIONS_ENABLED + /* Major version number of libxml++. */ #undef LIBXMLXX_MAJOR_VERSION diff --git a/configure b/configure index b58d0df..9efbed0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libxml++ 2.35.2. +# Generated by GNU Autoconf 2.68 for libxml++ 2.35.3. # # Report bugs to . # @@ -174,14 +174,6 @@ test x\$exitcode = x0 || exit 1" 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'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes @@ -545,8 +537,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +ECHO=${lt_ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +$* +_LT_EOF + exit 0 +fi + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi + + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + test -n "$DJDIR" || exec 7<&0 &1 @@ -571,8 +710,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libxml++' PACKAGE_TARNAME='libxml++' -PACKAGE_VERSION='2.35.2' -PACKAGE_STRING='libxml++ 2.35.2' +PACKAGE_VERSION='2.35.3' +PACKAGE_STRING='libxml++ 2.35.3' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B' PACKAGE_URL='http://libxmlplusplus.sourceforge.net/' @@ -628,8 +767,6 @@ XSLTPROC DOXYGEN DOT PERL -ENABLE_EXAMPLES_FALSE -ENABLE_EXAMPLES_TRUE LIBXMLXX_LIBS LIBXMLXX_CFLAGS PKG_CONFIG_LIBDIR @@ -643,9 +780,8 @@ OTOOL LIPO NMEDIT DSYMUTIL -MANIFEST_TOOL +lt_ECHO RANLIB -ac_ct_AR AR LN_S NM @@ -781,9 +917,7 @@ enable_shared with_pic enable_fast_install with_gnu_ld -with_sysroot enable_libtool_lock -enable_examples enable_documentation with_glibmm_doc enable_warnings @@ -1355,7 +1489,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.2 to adapt to many kinds of systems. +\`configure' configures libxml++ 2.35.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1559,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxml++ 2.35.2:";; + short | recursive ) echo "Configuration of libxml++ 2.35.3:";; esac cat <<\_ACEOF @@ -1444,7 +1578,6 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-examples build the examples --disable-documentation do not build or install the documentation --enable-warnings[=min|max|fatal|no] set compiler pedantry level [default=min] @@ -1452,11 +1585,9 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). --with-glibmm-doc=[TAGFILE@]HTMLREFDIR Link to external glibmm documentation [auto] @@ -1557,7 +1688,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxml++ configure 2.35.2 +libxml++ configure 2.35.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2047,7 +2178,7 @@ 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.2, which was +It was created by libxml++ $as_me 2.35.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2869,7 +3000,7 @@ fi # Define the identity of the package. PACKAGE='libxml++' - VERSION='2.35.2' + VERSION='2.35.3' # Some tools Automake needs. @@ -2991,7 +3122,7 @@ fi LIBXMLXX_MODULE_NAME='libxml++-2.6' -LIBXMLXX_VERSION='2.35.2' +LIBXMLXX_VERSION='2.35.3' LIBXMLXX_API_VERSION='2.6' @@ -3005,10 +3136,10 @@ LIBXMLXX_MINOR_VERSION=35 $as_echo "#define LIBXMLXX_MINOR_VERSION 35" >>confdefs.h -LIBXMLXX_MICRO_VERSION=2 +LIBXMLXX_MICRO_VERSION=3 -$as_echo "#define LIBXMLXX_MICRO_VERSION 2" >>confdefs.h +$as_echo "#define LIBXMLXX_MICRO_VERSION 3" >>confdefs.h @@ -3736,8 +3867,8 @@ esac -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.2.6' +macro_revision='1.3012' @@ -3824,75 +3955,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5026,11 +5088,8 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" 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 @@ -5074,7 +5133,7 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" + for ac_prog in "dumpbin -symbols" "link -dump -symbols" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5129,15 +5188,6 @@ esac fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -5157,13 +5207,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5210: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5213: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) + (eval echo "\"\$as_me:5216: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5220,11 +5270,6 @@ else lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5250,11 +5295,6 @@ else lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5294,8 +5334,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5337,8 +5377,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5387,80 +5427,6 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : @@ -5477,11 +5443,6 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5642,18 +5603,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc*) +cegcc) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5683,10 +5642,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5695,11 +5650,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5720,12 +5675,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be Linux ELF. +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) 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 @@ -5802,21 +5757,6 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - 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 @@ -5832,26 +5772,16 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - 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 + # 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5860,7 +5790,7 @@ do 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 - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5870,10 +5800,10 @@ IFS=$as_save_IFS fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -5881,17 +5811,17 @@ 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 +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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5900,7 +5830,7 @@ do 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 - ac_cv_prog_ac_ct_DLLTOOL="dlltool" + ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5910,17 +5840,17 @@ IFS=$as_save_IFS fi fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" + if test "x$ac_ct_AR" = x; then + AR="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -5928,51 +5858,17 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DLLTOOL=$ac_ct_DLLTOOL + AR=$ac_ct_AR fi else - DLLTOOL="$ac_cv_prog_DLLTOOL" + AR="$ac_cv_prog_AR" fi -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -5982,17 +5878,15 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO if test -n "$ac_tool_prefix"; then - for ac_prog in ar - 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 + # 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6001,7 +5895,7 @@ do 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 - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + 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 fi @@ -6011,179 +5905,10 @@ IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6358,27 +6083,15 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - @@ -6486,8 +6199,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6511,7 +6224,6 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6524,7 +6236,6 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6550,8 +6261,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then @@ -6566,18 +6277,6 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - #ifdef __cplusplus extern "C" { #endif @@ -6589,7 +6288,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { +const struct { const char *name; void *address; } @@ -6615,8 +6314,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -6626,8 +6325,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6664,18 +6363,6 @@ else $as_echo "ok" >&6; } fi -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - @@ -6697,42 +6384,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : @@ -6765,7 +6416,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext + echo '#line 6419 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6900,7 +6551,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6911,20 +6562,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6940,123 +6578,6 @@ esac need_locks="$enable_libtool_lock" -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - case $host_os in rhapsody* | darwin*) @@ -7564,13 +7085,7 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7581,7 +7096,6 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7614,41 +7128,6 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7676,34 +7155,700 @@ $as_echo "$lt_cv_ld_force_load" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test "$DSYMUTIL" != ":"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi - ;; - esac + ;; + esac + +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +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 + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + +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 -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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + 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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 + 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$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=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 + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done -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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +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=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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" do ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. @@ -7720,7 +7865,7 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO"; then : else # Broken: fails on valid input. @@ -7734,7 +7879,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else @@ -7752,17 +7897,17 @@ if $ac_preproc_ok; then : fi done - ac_cv_prog_CPP=$CPP + ac_cv_prog_CXXCPP=$CXXCPP fi - CPP=$ac_cv_prog_CPP + CXXCPP=$ac_cv_prog_CXXCPP else - ac_cv_prog_CPP=$CPP + ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. @@ -7779,7 +7924,7 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO"; then : else # Broken: fails on valid input. @@ -7793,7 +7938,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else @@ -7811,8 +7956,7 @@ if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +_lt_caught_CXX_error=yes; } fi ac_ext=c @@ -7821,160 +7965,10 @@ 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 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -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=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - + _lt_caught_CXX_error=yes fi -done - - - - -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf - @@ -7984,7 +7978,7 @@ enable_dlopen=yes enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) 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 @@ -8346,26 +8340,11 @@ fi - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else pic_mode=default fi @@ -8442,11 +8421,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - test -z "$LN_S" && LN_S="ln -s" @@ -8496,6 +8470,19 @@ _ACEOF + + + + + + + + + + + + + case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -8508,6 +8495,23 @@ aix3*) ;; esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + # Global variables: ofile=libtool can_build_shared=yes @@ -8536,7 +8540,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -8745,12 +8749,7 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac + lt_prog_compiler_no_builtin_flag=' -fno-builtin' { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } @@ -8770,15 +8769,15 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8772: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8776: \$? = $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. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -8807,6 +8806,8 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8854,12 +8855,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-fno-common' ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -8902,15 +8897,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-fPIC' ;; esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -8952,7 +8938,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8973,13 +8959,7 @@ lt_prog_compiler_static= lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -8991,40 +8971,25 @@ lt_prog_compiler_static= # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' ;; esac ;; @@ -9056,7 +9021,7 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + f77* | f90* | f95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -9113,17 +9078,13 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } + + + + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -9147,15 +9108,15 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9111: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9115: \$? = $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. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -9184,11 +9145,6 @@ fi - - - - - # # Check to make sure the static flag actually works. # @@ -9208,7 +9164,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -9257,16 +9213,16 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9216: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9220: \$? = $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 # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9312,16 +9268,16 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9271: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9275: \$? = $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 # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -9387,6 +9343,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9430,39 +9387,10 @@ $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 - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -9480,7 +9408,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie fi supports_anon_versioning=no case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -9496,12 +9423,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.19, is reported +*** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. _LT_EOF fi @@ -9537,12 +9463,10 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -9560,11 +9484,6 @@ _LT_EOF fi ;; - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -9580,7 +9499,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -9590,16 +9509,15 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag=' $pic_flag' + tmp_addflag= tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9610,17 +9528,13 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -9636,16 +9550,17 @@ _LT_EOF fi case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) + xlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9654,13 +9569,13 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9678,8 +9593,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9725,8 +9640,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9766,10 +9681,8 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -9831,7 +9744,6 @@ _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 @@ -9857,13 +9769,7 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9876,32 +9782,25 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -9910,13 +9809,7 @@ fi else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9929,42 +9822,30 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -9996,64 +9877,20 @@ fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes ;; darwin* | rhapsody*) @@ -10063,12 +9900,7 @@ fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi + whole_archive_flag_spec='' link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -10076,7 +9908,7 @@ fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -10094,6 +9926,10 @@ fi hardcode_shlibpath_var=no ;; + freebsd1*) + ld_shlibs=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -10106,7 +9942,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -10115,7 +9951,7 @@ fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -10123,7 +9959,7 @@ fi hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -10138,13 +9974,14 @@ fi ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10156,16 +9993,16 @@ fi ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -10177,46 +10014,7 @@ fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi @@ -10244,39 +10042,26 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo (void) { return 0; } +int foo(void) {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi + LDFLAGS="$save_LDFLAGS" else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10285,7 +10070,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10338,17 +10123,17 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -10358,13 +10143,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10377,9 +10162,9 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -10567,50 +10352,44 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } ;; esac fi @@ -10768,6 +10547,11 @@ esac + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10776,23 +10560,16 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -10805,7 +10582,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -10825,13 +10602,7 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -10857,7 +10628,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10866,7 +10637,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10919,7 +10690,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -10931,7 +10702,7 @@ beos*) ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -10950,9 +10721,8 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$cc_basename in - yes,*) - # gcc + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -10973,83 +10743,36 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' ;; *) - # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' ;; esac + dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -11070,7 +10793,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -11078,6 +10801,10 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11085,7 +10812,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -11103,7 +10830,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -11123,26 +10850,12 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - 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=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -11188,14 +10901,12 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -11211,7 +10922,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -11248,9 +10959,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +# This must be Linux ELF. +linux* | k*bsd*-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}' @@ -11258,17 +10969,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11281,17 +10987,13 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -11300,7 +11002,7 @@ fi # 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' ' '` + 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;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -11313,18 +11015,6 @@ 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 @@ -11344,7 +11034,7 @@ netbsd*) ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11413,7 +11103,7 @@ rdos*) ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -11438,7 +11128,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -11462,7 +11152,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11493,7 +11183,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -11503,7 +11193,7 @@ tpf*) ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -11615,11 +11305,6 @@ fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= @@ -11950,7 +11635,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" +#line 11638 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11991,13 +11676,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12006,11 +11685,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -12056,7 +11731,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" +#line 11734 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12097,13 +11772,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -12112,11 +11781,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -12273,145 +11938,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" - 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=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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -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 - -else - _lt_caught_CXX_error=yes -fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -12428,6 +11954,7 @@ export_dynamic_flag_spec_CXX= hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -12437,8 +11964,6 @@ module_cmds_CXX= module_expsym_cmds_CXX= link_all_deplibs_CXX=unknown old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= enable_shared_with_static_runtimes_CXX=no @@ -12494,7 +12019,6 @@ $RM -r conftest* # Allow CC to be a program name with arguments. lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -12512,7 +12036,6 @@ $RM -r conftest* fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS compiler=$CC compiler_CXX=$CC for cc_temp in $compiler""; do @@ -12523,7 +12046,7 @@ $RM -r conftest* *) break;; esac done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` if test -n "$compiler"; then @@ -12652,8 +12175,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -12685,7 +12208,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else GXX=no @@ -12795,13 +12318,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty # executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12814,33 +12331,26 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' @@ -12849,13 +12359,7 @@ fi else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12868,42 +12372,30 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag_CXX=' ${wl}-bernotok' allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -12933,75 +12425,28 @@ fi ;; cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_CXX=' ' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=yes - file_list_spec_CXX='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' - enable_shared_with_static_runtimes_CXX=yes - # Don't use ranlib - old_postinstall_cmds_CXX='chmod 644 $oldlib' - postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - esac - ;; + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; darwin* | rhapsody*) @@ -13009,12 +12454,7 @@ fi hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec_CXX='' - fi + whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes allow_undefined_flag_CXX="$_lt_dar_allow_undefined" case $cc_basename in @@ -13022,7 +12462,7 @@ fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -13056,7 +12496,7 @@ fi esac ;; - freebsd2.*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13075,11 +12515,6 @@ fi gnu*) ;; - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - hpux9*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_separator_CXX=: @@ -13104,11 +12539,11 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -13169,7 +12604,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then @@ -13179,10 +12614,10 @@ fi archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -13212,7 +12647,7 @@ fi case $cc_basename in CC*) # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -13223,9 +12658,9 @@ fi *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' fi fi link_all_deplibs_CXX=yes @@ -13236,7 +12671,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13254,7 +12689,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13291,26 +12726,26 @@ fi pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) + *pgCC\ [1-5]* | *pgcpp\ [1-5]*) prelink_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' old_archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ $RANLIB $oldlib' archive_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 and above use weak symbols + *) # Version 6 will use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -13318,7 +12753,7 @@ fi hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -13337,9 +12772,9 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; - xl* | mpixl* | bgxl*) + xl*) # IBM XL 8.0 on PPC, with GNU ld hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13359,13 +12794,13 @@ fi archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13434,7 +12869,7 @@ fi export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo else ld_shlibs_CXX=no fi @@ -13469,15 +12904,15 @@ fi case $host in osf3*) allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ;; *) allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' ;; @@ -13493,17 +12928,17 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -13513,7 +12948,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -13549,7 +12984,7 @@ fi solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ archive_cmds_need_lc_CXX=yes no_undefined_flag_CXX=' -zdefs' @@ -13570,7 +13005,7 @@ fi esac link_all_deplibs_CXX=yes - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -13590,14 +13025,14 @@ fi if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -13608,7 +13043,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' @@ -13662,10 +13097,6 @@ fi CC*) archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" ;; *) archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -13727,14 +13158,6 @@ private: }; _LT_EOF - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13748,7 +13171,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -13757,22 +13180,13 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 test $p = "-R"; then prev=$p continue + else + prev= fi - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) + case $p in + -L* | -R*) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -13792,10 +13206,8 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 postdeps_CXX="${postdeps_CXX} ${prev}${p}" fi fi - prev= ;; - *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -13831,7 +13243,6 @@ else fi $RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken case $host_os in @@ -13867,7 +13278,7 @@ linux*) solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -13932,6 +13343,8 @@ fi lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -13981,11 +13394,6 @@ lt_prog_compiler_static_CXX= # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static_CXX= - ;; interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -14035,11 +13443,6 @@ lt_prog_compiler_static_CXX= ;; esac ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; dgux*) case $cc_basename in ec++*) @@ -14096,7 +13499,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14129,8 +13532,8 @@ lt_prog_compiler_static_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX='-non_shared' ;; - xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene + xlc* | xlC*) + # IBM XL 8.0 on PPC lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-qpic' lt_prog_compiler_static_CXX='-qstaticlink' @@ -14160,7 +13563,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -14192,7 +13595,7 @@ lt_prog_compiler_static_CXX= ;; solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-Bstatic' @@ -14257,17 +13660,10 @@ case $host_os in lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_prog_compiler_pic_CXX" >&6; } + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. @@ -14291,15 +13687,15 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13690: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13694: \$? = $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. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works_CXX=yes @@ -14325,8 +13721,6 @@ fi - - # # Check to make sure the static flag actually works. # @@ -14346,7 +13740,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works_CXX=yes @@ -14392,16 +13786,16 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13789: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13793: \$? = $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 # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14444,16 +13838,16 @@ 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:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13841: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13845: \$? = $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 # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o_CXX=yes @@ -14504,40 +13898,27 @@ fi $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' case $host_os in aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) export_symbols_cmds_CXX="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 $as_echo "$ld_shlibs_CXX" >&6; } @@ -14569,50 +13950,44 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc_CXX=no - else - lt_cv_archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } - archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + then + archive_cmds_need_lc_CXX=no + else + archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 +$as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac fi @@ -14680,6 +14055,8 @@ esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -14705,7 +14082,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -14714,7 +14091,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -14767,7 +14144,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -14779,7 +14156,7 @@ beos*) ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -14798,9 +14175,8 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$cc_basename in - yes,*) - # gcc + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -14821,82 +14197,36 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' ;; *) - # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' ;; esac + dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -14916,7 +14246,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -14924,6 +14254,10 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -14931,7 +14265,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -14949,7 +14283,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -14969,26 +14303,12 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - 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=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15034,14 +14354,12 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -15057,7 +14375,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -15094,9 +14412,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +# This must be Linux ELF. +linux* | k*bsd*-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}' @@ -15104,17 +14422,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15127,17 +14440,13 @@ main () _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -15146,7 +14455,7 @@ fi # 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' ' '` + 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;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -15159,18 +14468,6 @@ 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 @@ -15190,7 +14487,7 @@ netbsd*) ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -15259,7 +14556,7 @@ rdos*) ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -15284,7 +14581,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -15308,7 +14605,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -15339,7 +14636,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -15349,7 +14646,7 @@ tpf*) ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -15410,8 +14707,6 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= @@ -15459,7 +14754,6 @@ fi fi # test -n "$compiler" CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -15488,8 +14782,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_config_commands="$ac_config_commands libtool" @@ -15507,7 +14799,6 @@ LIBXMLXX_MODULES='libxml-2.0 >= 2.6.1 glibmm-2.4 >= 2.4.0' - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -15636,7 +14927,6 @@ 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 @@ -15653,7 +14943,6 @@ 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 @@ -15673,9 +14962,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 --cflags --libs "$LIBXMLXX_MODULES" 2>&1` + LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXMLXX_MODULES" 2>&1` else - LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXMLXX_MODULES" 2>&1` + LIBXMLXX_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXMLXX_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBXMLXX_PKG_ERRORS" >&5 @@ -15736,23 +15025,6 @@ fi done -# Check whether --enable-examples was given. -if test "${enable_examples+set}" = set; then : - enableval=$enable_examples; enable_examples=$enableval -else - enable_examples=yes -fi - - - if test "x$enable_examples" = xyes; then - ENABLE_EXAMPLES_TRUE= - ENABLE_EXAMPLES_FALSE='#' -else - ENABLE_EXAMPLES_TRUE='#' - ENABLE_EXAMPLES_FALSE= -fi - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 @@ -16224,7 +15496,12 @@ as_fn_error $? "At least Perl 5.6.0 is required to build $PACKAGE_NAME. See \`config.log' for more details" "$LINENO" 5; } fi -ac_config_files="$ac_config_files Makefile docs/reference/Doxyfile MSVC_Net2005/libxml++/libxml++.rc MSVC_Net2008/libxml++/libxml++.rc MSVC_Net2010/libxml++/libxml++.rc libxml++-2.6.pc" +# This is just defined to avoid breaking old code: + +$as_echo "#define LIBXMLCPP_EXCEPTIONS_ENABLED 1" >>confdefs.h + + +ac_config_files="$ac_config_files Makefile examples/Makefile docs/reference/Doxyfile MSVC_Net2005/libxml++/libxml++.rc MSVC_Net2008/libxml++/libxml++.rc MSVC_Net2010/libxml++/libxml++.rc libxml++-2.6.pc" ac_config_commands="$ac_config_commands MSVC_Net2005/libxml++/libxml++config.h" @@ -16371,8 +15648,8 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_EXAMPLES_TRUE}" && test -z "${ENABLE_EXAMPLES_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_EXAMPLES\" was never defined. +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_DOCUMENTATION_TRUE}" && test -z "${ENABLE_DOCUMENTATION_FALSE}"; then @@ -16788,7 +16065,7 @@ 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.2, which was +This file was extended by libxml++ $as_me 2.35.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16855,7 +16132,7 @@ _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.2 +libxml++ config.status 2.35.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16984,212 +16261,186 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' +predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' +postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - # Quote evaled strings. -for var in AS \ -DLLTOOL \ -OBJDUMP \ -SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ +for var in SED \ GREP \ EGREP \ FGREP \ @@ -17201,12 +16452,8 @@ lt_NL2SP \ reload_flag \ deplibs_check_method \ file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ -archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -17216,14 +16463,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ +SHELL \ +ECHO \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ lt_prog_compiler_wl \ +lt_prog_compiler_pic \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ -MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -17237,7 +16484,9 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ +fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -17245,7 +16494,6 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ -install_override_mode \ finish_eval \ old_striplib \ striplib \ @@ -17256,11 +16504,10 @@ predeps \ postdeps \ compiler_lib_search_path \ LD_CXX \ -reload_flag_CXX \ compiler_CXX \ lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_pic_CXX \ lt_prog_compiler_wl_CXX \ +lt_prog_compiler_pic_CXX \ lt_prog_compiler_static_CXX \ lt_cv_prog_compiler_c_o_CXX \ export_dynamic_flag_spec_CXX \ @@ -17270,7 +16517,9 @@ with_gnu_ld_CXX \ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ +fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ file_list_spec_CXX \ @@ -17280,9 +16529,9 @@ postdep_objects_CXX \ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17304,13 +16553,11 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ -postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ old_archive_cmds_CXX \ old_archive_from_new_cmds_CXX \ old_archive_from_expsyms_cmds_CXX \ @@ -17319,11 +16566,10 @@ archive_expsym_cmds_CXX \ module_cmds_CXX \ module_expsym_cmds_CXX \ export_symbols_cmds_CXX \ -prelink_cmds_CXX \ -postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in +prelink_cmds_CXX; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17331,6 +16577,12 @@ postlink_cmds_CXX; do esac done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; +esac + ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -17366,6 +16618,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "docs/reference/Doxyfile") CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; "MSVC_Net2005/libxml++/libxml++.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/libxml++/libxml++.rc" ;; "MSVC_Net2008/libxml++/libxml++.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2008/libxml++/libxml++.rc" ;; @@ -18085,8 +17338,7 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -18123,13 +17375,13 @@ macro_version=$macro_version macro_revision=$macro_revision # Assembler program. -AS=$lt_AS +AS=$AS # DLL creation program. -DLLTOOL=$lt_DLLTOOL +DLLTOOL=$DLLTOOL # Object dumper program. -OBJDUMP=$lt_OBJDUMP +OBJDUMP=$OBJDUMP # Whether or not to build static libraries. build_old_libs=$enable_static @@ -18143,15 +17395,6 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - # The host system. host_alias=$host_alias host=$host @@ -18201,36 +17444,20 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method = "file_magic". +# Command to use when deplibs_check_method == "file_magic". file_magic_cmd=$lt_file_magic_cmd -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - # The archiver. AR=$lt_AR - -# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - # A symbol stripping program. STRIP=$lt_STRIP @@ -18239,9 +17466,6 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - # A C compiler. LTCC=$lt_CC @@ -18260,24 +17484,21 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - # The name of the directory that contains temporary libtool files. objdir=$objdir +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO + # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -18334,9 +17555,6 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -18376,10 +17594,6 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -18392,12 +17606,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - # How to pass a linker flag through the compiler. wl=$lt_lt_prog_compiler_wl +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -18447,6 +17661,10 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -18480,6 +17698,9 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path + # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -18495,9 +17716,6 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -18544,169 +17762,212 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} + +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} + +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} + +# sed scripts: +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[^=]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$@"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF +esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1+=\$2" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1=\$$1\$2" +} + +_LT_EOF + ;; + esac + + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -18718,10 +17979,6 @@ fi # The linker used to build libraries. LD=$lt_LD_CXX -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX - # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds_CXX @@ -18734,12 +17991,12 @@ with_gcc=$GCC_CXX # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - # How to pass a linker flag through the compiler. wl=$lt_lt_prog_compiler_wl_CXX +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static_CXX @@ -18789,6 +18046,10 @@ no_undefined_flag=$lt_no_undefined_flag_CXX # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX @@ -18822,6 +18083,9 @@ inherit_rpath=$inherit_rpath_CXX # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs_CXX +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path_CXX + # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -18837,9 +18101,6 @@ include_expsyms=$lt_include_expsyms_CXX # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds_CXX -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_CXX - # Specify filename containing input files. file_list_spec=$lt_file_list_spec_CXX diff --git a/configure.ac b/configure.ac index 5e65125..5260e85 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libxml++], [2.35.2], +AC_INIT([libxml++], [2.35.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B], [libxml++], [http://libxmlplusplus.sourceforge.net/]) AC_PREREQ([2.59]) @@ -34,14 +34,6 @@ PKG_CHECK_MODULES([LIBXMLXX], [$LIBXMLXX_MODULES]) AC_LANG([C++]) AC_CHECK_HEADERS([string list map], [], [AC_MSG_ERROR([required headers not found])]) -AC_ARG_ENABLE([examples], - [AS_HELP_STRING([--enable-examples], - [build the examples])], - [enable_examples=$enableval], - [enable_examples=yes]) - -AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = xyes]) - MM_ARG_ENABLE_DOCUMENTATION MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4]) @@ -56,7 +48,11 @@ AC_PATH_PROGS([DB2LATEX], [db2latex docbook2latex], [db2latex]) AC_ARG_VAR([DB2LATEX], [path to db2latex utility]) MM_CHECK_PERL() +# This is just defined to avoid breaking old code: +AC_DEFINE([LIBXMLCPP_EXCEPTIONS_ENABLED],[1], [This is always set. This is only for backwards compatibility.]) + AC_CONFIG_FILES([Makefile + examples/Makefile docs/reference/Doxyfile MSVC_Net2005/libxml++/libxml++.rc MSVC_Net2008/libxml++/libxml++.rc diff --git a/docs/manual/html/ch01s02.html b/docs/manual/html/ch01s02.html index 7a1e95b..f286cdc 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 a94c547..e9f49c9 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 6886247..55dc6ba 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 @@ -198,6 +198,7 @@ void MySaxParser::on_fatal_error(const Glib::ustring& text) #include <fstream> #include <iostream> +#include <stdlib.h> #include "myparser.h" @@ -215,6 +216,7 @@ main(int argc, char* argv[]) filepath = "example.xml"; // Parse the entire document in one go: + int return_code = EXIT_SUCCESS; try { MySaxParser parser; @@ -223,7 +225,8 @@ main(int argc, char* argv[]) } catch(const xmlpp::exception& ex) { - std::cout << "libxml++ exception: " << ex.what() << std::endl; + std::cerr << "libxml++ exception: " << ex.what() << std::endl; + return_code = EXIT_FAILURE; } @@ -257,8 +260,7 @@ main(int argc, char* argv[]) */ } - - return 0; + return return_code; } diff --git a/docs/manual/html/ch02s03.html b/docs/manual/html/ch02s03.html index 4f71ee8..97759eb 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 @@ -41,6 +41,7 @@ #include <libxml++/parsers/textreader.h> #include <iostream> +#include <stdlib.h> struct indent { int depth_; @@ -97,8 +98,10 @@ int main(int /* argc */, char** /* argv */) } catch(const std::exception& e) { - std::cout << "Exception caught: " << e.what() << std::endl; + std::cerr << "Exception caught: " << e.what() << std::endl; + return EXIT_FAILURE; } + return EXIT_SUCCESS; } diff --git a/docs/manual/html/chapter-introduction.html b/docs/manual/html/chapter-introduction.html index bbd394d..8a48d77 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 22915ab..493a16a 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 @@ -93,8 +93,8 @@ #endif #include <libxml++/libxml++.h> - #include <iostream> +#include <stdlib.h> void print_node(const xmlpp::Node* node, unsigned int indentation = 0) { @@ -211,7 +211,7 @@ int main(int argc, char* argv[]) << " -t Throw messages in an exception" << std::endl << " -e Write messages to stderr" << std::endl << " -E Do not substitute entities" << std::endl; - return 1; + return EXIT_FAILURE; } argi++; } @@ -240,10 +240,11 @@ int main(int argc, char* argv[]) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/docs/manual/html/index.html b/docs/manual/html/index.html index 5f97372..b610db4 100644 --- a/docs/manual/html/index.html +++ b/docs/manual/html/index.html @@ -43,14 +43,14 @@

+
  • xmlpp::Document::Init
  • xmlpp::Dtd
  • xmlpp::KeepBlanks
  • xmlpp::NonCopyable - +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index b4ecd0a..e8c128a 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -2,7 +2,6 @@ - libxml++: libxml++ Reference Manual @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +

    description

    @@ -74,13 +73,13 @@ basics

    Then use the generated LIBXMLXX_CFLAGS and LIBXMLXX_LIBS variables in the project Makefile.am files. For example: 

     program_CPPFLAGS = $(LIBXMLXX_CFLAGS)
  program_LDADD = $(LIBXMLXX_LIBS)
-
    +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/inherit_graph_0.png b/docs/reference/html/inherit_graph_0.png index 374f7ebf4eb2fc49abc49c3d12fc40aa8dfec7f1..4b5dabde8fe9ce7d0af96bebe6495e022dcf0361 100644 GIT binary patch literal 6879 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 diff --git a/docs/reference/html/inherit_graph_1.png b/docs/reference/html/inherit_graph_1.png index c1abbafc636918b2c8f34e258d8265ccd3d68cd1..3a17fce55583266f4164a418eda1a8846a8ee175 100644 GIT binary patch delta 1011 zcmV1sfiBL{Q4GJ0x0000DNk~Le000130000e2m$~A0QJ?XqLCpLf2~PG zK~!jg?V8U^B4HTE-x-A=i;A()4pI>gMbV+?5E1?bow^AH5%dE}646tKf{^YJf)|g4 zx1gd+1I;DG=n$hwQjn08;xr-oBXfH9@V?B>ZWdd+Tg&!-PV>I=&Uc>q@aQ;<6oe2E z0H8m+fPV!d0z*V#jQYXV)z#6_f6-@^^1%!b58G_E?_;PV91ee8VINI69M)gE@%f6c za37&4>Zcj<9f2VtFhm4~h`_U==1po1_o|#Zvg-=B>(_6Ha4tQE5~v3^Yi6$S)Xu!e?K!bW3^gaT3Wnb zZ?#(e2oW6}9g-v&3;4S77C#>U2EGMUTeoKEM|)D$|z<#MId zX-Sfz(WoE@fj~fSK@fz4e}e;-WdQ&$C8(;pzrQa@(&6EuAP9cHUtiL~!a}K3ipS%T zNJJFHm6etEiKy|=1z$xIAxRPd;QIO+&Bx<$MNuGxg+d`145BsVa@k-ooSmJaHOI%t zf*_y-uh$CzNG6k7a?J#E7A;|ObCc(Jtp=1Y%QD(42m;UZuh)+Nf4}n3_3O|y-P+oU zwo|E;+wIO|GR@7+9LJ%_bULl7YG-FB8V(K)0svyMn5wF$r>72wV{L6M6bikPfY1_n zp1--d(dJRU*=*Kk>g(&@c`?7!5oiNKn9JpiM&sVz9vYsUoSFi;D|1FN$I) z6p|!~rs-m_m`EfTe})l7@s)(1I$~>UtGBmTJ2lF`ySqbs^ZESw`T6@g;>~vrilQKd z4-XIe$)~3$RaF^=sZ=V7L}F=a2|}nSipgXe8yoX@Jef=;l}fo>E=5sLNL^iBcXzkX z=bM|Gt5hm4B>(_un)Y}+*=#l*k1sDTPfkv1=SBH0mn)OWe`K>+r_;HRYK) zD%tJ!)z#IP5+q4#Z*TYe{VdB`tyZ7U_xSjzPmpDKVq(HR$PN<-Y~|AmS@S hz9TS11cr#fd;{D>h_;DHGrj--002ovPDHLkV1oF6&j|nk delta 1040 zcmV+r1n>L!2bBmRiBL{Q4GJ0x0000DNk~Le000100000e2m$~A001i?5|JSlf67Tj zK~!jg?V8O?Dqk4KXGU#mVP#Hg3+cs0<0_~{LEx&|w2KU)f{N%3r9grfN+m4k8MFx`5|oMx0<#gc7uuLRXw?;qodmvw4 zp-@asO{H%I0O;@UZ)s_vX&OP0ta1cF78Vxda=A<<)9dvN!=&#Ji^Yb9hU9WNK@bLm zA(>46asLECP!xsZH~@ekh(I84dV1>f`ACv98jY>3t&vE?WHL=mOu&4dP8W$pD2m$K z+gn~vthOyi2Znt}PcXwxJXKrpTy_m7FvDepEkH>Rx zaNu&eW@cu-;2!~LY;0`2i)6z3rzi?Rkh{A(7(YKhkHun%L}F!S1t!Gfae+W^ad80? zoKENQ@iCO^^?IRD7zhN|Z8PO?f4|=k6V}()Ns?qwkH_O8k?8U9e-W-a91fBs|GRPk zfL5#3YPIQ+ET8{>oxHrf($Z2mK0G|^?(RlWRH;%*RaJ0YU0odv2HB-RAdpBTii?ZcNKsMIS3LYq|KR`t5DJAb z3_ChH0sy$(ZWyO&e;UKEo0}V$v%S5&xw%PElt?6^Y5L^k1jq5Sv$K!nu>Y5rmr!oC zT5D=**h6WW76=5|_K}g1+uPevDAd)}wYa#Li~c`9Ka(UW7K>dj7u$aT!1VNVVPT<4rLx&jX7jsS6NyA*GTG|tYF0T#Q7VMNZ{r|_{{c{`MKeyria~s}2x5@JTuerH7_jTk3 zx7)4JXwoA;`By5H|L~802!d!dnudmk^au+0|G#h<-aohDy8j>5uSj`Vh;$eL0000< KMNUMnLSTXxP6xyQ diff --git a/docs/reference/html/inherit_graph_2.png b/docs/reference/html/inherit_graph_2.png index aa7f545c0f4cae280294fddafa1bd71fd4022a40..c98aa53acdb4f99981227228276b9811c0b8787c 100644 GIT binary patch delta 1440 zcmV;R1z-Bs2cZigiBL{Q4GJ0x0000DNk~Le0001^0000e2m$~A03CVV%#k4!e+5=a zL_t(|ob8-VNE=NU$7iw%Q4wpq`A}n_N-QBQrJxl(`E~FEDQGTY#M*;`mN6brZ$Z)=<$fJq+xtakEKdUZvgnoyNy`{_{Nf zXS0*R6(WQHK>&#Ex&Xp0L7Wx}f5d5_5EJn8($doI?(UtGLWm;y`S}Wk;z|fzMWfN& zQEh~1GBq_7;B4SE4FJ$+G}F`5w_h9~T0jV|2g!X}C=jQG0&!X>5T}I#aat%4r-cG> zS}5F}({{T(CWhnddt_4Z68G=lud1rr+}wNwN|JG}of1)US^mBfG zzP!AgmX?;6m$$RCbJul6pC?bATwGk-TqhEz=jP@V3We9}1prJ;Ogw)4*yr=v?RJGi z(bLmI)3ih)866!pnM}#a$x^9wWMt%WI-Y5~B$Y~~QfX^ztKaYE)DNeZ zpFe*#Ha5y+GMc8}zI}_$z=^}d!xD)^CX_~K7anKR;w)*%Vnv63VC|LuYgvo^>{oEha)>XyREGaCyK@5=H}+_-@lto zrhvvnw!@zuQila_f1P_r=(N}CO;1mM_Uze*4T_#Rwsv&j%rNI2<@WIXQ`?e*OAIQ53tx>guZ1 zY7OQze=k_-=;#P1TCG;4QpvXV?b|ob#zVHlpMFE9BfP^We)ZX5n z-|uIa$j;6N0NCwzRsmi5Lo5DXu+)PG57_w$2?=;WQIuRR=V_du8>aIRp`6R*>g($( zDJjwG^^qyCf4isc?d_D56rNz1jE|2O7Z(EnaH7-c#Brz7nVOmk0FcY&5W=rtzvB4E zj~@dz5c~W4VXlRxyk0N9Tux3-*4EbksM^~n5~mSDuV24zX=$05n6O%{^Yil&i0Jit zx7)qGzTVN%QCnNf6XfUO;$mxS>&=@ti;Iix?d<@7fB5+LmoHx$3lsHk}H;zeO$VQFcp z(P#`7e+;%+#k)`lVQg${Zf>s2<@)sL6Z^?LG&Cd@i&ZLBK|w)TS=syd?{R!^a4<13 zQLR?zFQze@0MSttCg{|LBmhq)uW37k8NcJQ|wgpdHP9ogS{azgl1h|@yh4xHvZ z-iy|mA0ZgznidMgX`w)z77D~^p+KA#3dCulK%5o|9OtexGc%kI_7MJRAiDbBFUV81 u{|48estt6S@UKGd(?WqbEfk2;Lg6=BevUib(#M$q0000^J(M8aLNFDq! zx~M2^adZ%h;6EUOl*Uj+#THUhmx9)+y*GpxVw-xkzE}Hr_nGd#xnKR{axJ6;gb-kg zL;myvsvRr{0TzS+3qn8{D`#hCf6L3uKed!9VR3P>zrSCveh{Q6N;n)AMX}C2*^?Kjl-b_RA z@y?s>0-Mb?KR-V^JL~iLR8ecnTEw?*N4(MIXMvoA@9=o`1ruUKs+9oBuNm2ye`E600aVo4@ntMj{boS@)tB006OAOzU`fc-Ya=VHy^jf4xx9#l?lyYBgSZ zetsrN^6KhJYY+?u%NA758PwF&G(9~XkH@E`ru5KavCuRP03b=yST5{NlBCn=)XF^1 zKRi4X3rj>%6qaT45(r^iTbovOxm=}>mcQCE`dnXM@9*!s-R`BOr82tba=F{vTdf?6 z#k9|68kWfM@o`U2e~&R?S(YG(o0}W0su#+^xSdLQ#NOZE`}+E}wzlr??;9H%&(F{E zw!LXN?-3gv9Ze>akw`=kgq4*Q)3DeAjN_}Sy1l(!S68P!O_C&06qU_pA%qhX6T`#9 zi9|w{<<8E|%AG-ezrVM)Hl>+6>U(KNlef4SM*+{`eH$K%Onv!>xE zL+N+dVzG2}b%n!WtxYdMT zl>`eyP-#It&u223Qo3E zL_t(&f$f@4NGd@Xz;|4O>`)eKS#1TChEa4Y>J}PAosxwP9f}SG5d|)Rr~WKK=l&6N z=@4Z>)S-@bt?(8qWmyTWhy@{qLTJo84D7RQm3iBHX}tNJX20E?`TQ~a&5kU95K;sT zG}%tz$3RTsLQLVJl^vg*ojp7}e`F<I|;^l=;q z|8ErCkvfG7F@*~;g$pr-3o(TYF@*~;h0FJu@_M~mt$a(Mx+{=ENlA&_Zuk5BnFsn} z0zY+5(KL7;J8Cet&-l00aVo=jZ4C{(ik)UsF@FzrU}>kc8|-p5r*2-OS+N z;Ly-eBoZ+ijc&IaLg?{$e`uQKdH&_)MGyo4z|_>#>+7o^2nK^ex26eWm(x-yWQT^)fEbbuCA^u7R%?m((PtG@B37mibkVVRaGr5 zEwi(;QuY9VSS$u1ytudk0L0^Q)J_$I8WctO{eE=g*4CEAVo?mHe;ZxVl-upj&(BXi z8;ivN0GF4S=z^V{ov)ZuS*MDMibh68d_LdU*q9X5Xfy={1*oCXXmmOqYAg0oTU(17 zX0uro#SB4ALZJ}DFsYGnI1C}Iudhdkb#--r)S(QOrbJO(Sy{2!Yz~J*T@OeWIm~3xvTdmgAe@I0|1pwgo_7)x9-`}fC6`{rygm8Fxczk@^<#L^zoE#k;sp!Pv za6CRf`h32bnVErsfegXSB$LVO>+6Y$iR0tr>FH^Tq5uF8!ne0Kole)+*Ecyi84ibU zZf@r1=T+n>p~lqe>gv-B4EYonv1XdT3drs>|^f8N&C*3Qn(?(S}<)0r-q zZtX*>8vr0LFR!hwO%%n`(^K^DR##V>OeTh5g2CYW`g&nuVPj*X)oSH=Ud507jjV2A zR`jo+SdSHh*@F6u75zVin8GCsrka|XlF1}aFsC4M3KwDu7h(z*VhR^x3KwDu7h(z* zh5wcJ_Vxe(G~b^}jsxJw4;IK*L5R;^1<6ej(n0DJF2ocr#1t;S00%@2*wh1ymH+?% M07*qoM6N<$g7S0OCjbBd literal 1581 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 literal 68230 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

    `_pJ-n}bArq9)D`W+C^7!l^7rhaVy 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�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%0AF@I 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 diff --git a/docs/reference/html/inherit_graph_5.png b/docs/reference/html/inherit_graph_5.png index a94a5530a6b18581e583ad5e45917c815558805a..791d076f9b1a3d8ee429bf84f842cb96bfeb7a1f 100644 GIT binary patch literal 68910 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 literal 1939 zcmZ8ic{J2}8~%msjh1S`B5F{*H}Fqm-O2hl%VG-hP} z^O>fT?;mJ9e+rp->@5YZIik#z$@IIYWEG&sFjLjBj+Sa>cI5zwDx?) z*CG*mZ=^^(Oj<@Jt@nL#aWRX<%FN8HbSP0cLk?`bNkY)tZ~oXlmH9y;>xJ}@9F?H} z_64*-fvqkA2NSl+*=JVE{q&3D7A>qfdV6V&J5X6sflRcsv%B7GECu-^sL_AmS01?~ zJsrv*kogleySo(A5-ll6hUKxuR{?A%Nz2XG{7qb`qlUDi3FYTq<_d1~ZL?;h5uh3ko=Q;&Oh*$T~Ya2kCo7M@PrT znr8LqT9-Q%8OjOhid=c%o zaV0!5k|yb?@hizH3=tXfUmlTcxq!Cp91{XC_lBtW&+@w3utdjF z$JY}RZPa~l4e6=H2y5m10h5R?lRZ5>%{S&T(8En^HhZoFWKAGUw%vL*#*111G*s=v ztoPKsjF}iY5ZAFV&TI;v3ShZgT3RY^Exm1EvREVh&Bn$?I{txSJa2t_lkZmU+#Jq# z?Styy(>!_dmzlO(=H})KStqo$S!{N$3TGf+Yo5z>l0%_Tudg-?aCcYcx_3AEr{H!y z9XqO;X!Hbs6V{a>Z?HfzySv-N!^631 zL%_*56(L4bu>$*2sb^b{UK9d4W@nM7>S}6&hwh$A?=%!LRv0d~$rpT82?mBhAbN1o z@VGdb7!+!2XZQ8T9{)`(Ev;AW&K}3!&Q3u3>l*j)Wl;6{$_gftL?%o1hvjlM*5`*E z)$m0X!}B(_wg^SV%ACmXa0y`vZH$;0?J_4vHKa)%H~IE$OT^;aIzr!q)1eQyZzEH7 zKy=k8&j+GCE9fB4L|mz7P1|)Y-MI>SP*PGd3~>-386qe~6hm6K2g^@n{5ZI4j?@F` ziyxkM`#a3R(G<$U!U7SM*X#Ea;9ld};F;m;9ug7~(`lHg`$S1rS4CCzP!bNnQYgC# z2gU0>gYE1xY>yjJ_nzAxmxsgGzWuPtM~iMd*x01W%F^TwLUv+ItB4Q)EG%^F*s<2u z)}*AQ^ddRQQD%Ng$ujxO2Sx47**|phEjIeI6hq%V_i%TgoSZbI&6PTS7Ic9aO(J28 zjEr2f8P(OO<_q=>+R$9i6@h%Fr>6m+Y3ibr)5z%P=-Ake-3{JpaAuy;_ah7yPJMm7 z08d<8e1N+){VehT(Bl_|!*yjTo_!?F{rK@C)2&t+)YloPr*B}ez4do&ZvIO~Mn0p@ zUBJ$g=%CC1fZ1iAXXmK!58z@=w!Wj96iQ3$O`zWK+^X_&E_WdRhT+0oH|-+&O-DyZ zs^keG%BApvKTEvg%i2_uE-?1@!><^?|W<9>&<0lWu7(qvQUa~vB#l+ zLF_UN3Ni?OyYasFFaTurmo3r55L%j=CQ&Q1+siW-(fQWpI@(BpEsJRZ-qWO=0QTu9TmuB5}nCX#}F ze1VOncJ8Tc@7kFeC+U^b8J%@5IDnnpyAzT|Buh zV(~6sd2TgIr(p1EgL9`~Up{@R6Ng2@z$kU~s(U>tap{#eW;^1Fj3P%x(zCKY7{>1J z{YXtc6pwU1e||B-Xgq4`i`?bl^|dwoqBD661|u)e#m!9yER0M%;ZXc>{i|S)M=t$Y zN=cT?Oi#x^ils4HX@UBf-!ByM@ZZnl~g+2ZW?o#|;GdPL+ diff --git a/docs/reference/html/inherit_graph_6.png b/docs/reference/html/inherit_graph_6.png index 30208bc1aaa74f7d223f8ea8c01129ee7cea50f8..344d213c0d7bf49bf2e8a06eff425cccdfeb04fb 100644 GIT binary patch literal 1974 zcmV;n2TAyeP)C>lAzeEaT9dY2mf$Z$;pF-egWHQ+=(gs;ijE;_yoI{?I5CoCQWICPhzZVBtFQ6zI z9fbQN2s1z@L6`wL3BnA}Nf2g$PJ%E4bP|LappziX@ZUMfYPBXLP~5(X51Y+aQ&W?f znaSaBwr}6AR;!nnm*bFxM!@Iuj~_p7x7(Q#86O=T9Vm)kym*m_5T&E6A^lNGnEfnp z*5#Z804Oaj6$*tfUcB&ny*i!FU@)9Ldp3?#7={sdY0YLchGC73jf@LkJK=D6czC#^ zq~zAETWcJ$W5(`0GVi?xn-!Bvj`F#GFGiR2Um!r=WnQ&%i zhEgy+2-VY)c$@?PsH>~1udjDHog$Iw`Sa(5%GTCapU>CT)rF#{N~Ky@Sm^5N5(os~ zXD4A8cJ$~`r_*V%Sj1xSrAwD6gR#yY3t?!{Ml^sycl5aI7R2i)F)x4Rv*O4u|9W_wNY_36CE?4g>-N0|Q&OY$48a z^5jXk+dVTgvwQb$wOUOYNMG2hs;cwn&jSEzYik=C8t@>gbfkolK?FhY8d|MZiA2)g z-cIS-$RMR)dYE+5{QP`QPR`DqJ3Bi&36&^{`u%sOjlxeD3l4{ey#pM9C;MM}EvImoHzcRH~|~ zs)r9BA_y`!H`mhA;&eLkwUu5ohGCSOj95unES5+lLJ)+{=Z}qzUA}x-E|>4!ySKZ$ zd*8l&4u>NY3h{V6qW{K?8%YCc&}y}TKw$s={Rn~p02UV)bvj*reLZF8SP6+5ipAou zU%y5k0#R>T(+K{%#JS_P+wB7b14oV=Q7V=3W%&5Ag z6h(LK+NIHGj7B4ZARdpWyu7@nrNwME8w`fFwzfDl(H^LRYHUhj6hi;IgZ zD=QHM5s5@7iq6l^<6l#s&u2E9NdsvZ8XD4QG*eSkQ&UrBvso^e-@JJnA2A;z*)YDqSwu^z?K`M@LOf4NWkb z%F0Tk(b&_|W4GG_fxz3hZ@as@j~zRPAV@eI4uwLAiHWPLt8d=C!B>5Jom#u*SVSuB=@h6d4} zoH})Ca&q#+hYu)<0svN4R)|KdBrFyyvWE5b^=WBop-^aIV&dDkZ@s;}csC-?KM_oZ zwA!s@pVZ&qFO^F1P5#)}SY~FX*Xxb-{|Mz8k73xgYuEDf@&p1wb93{`$_iyLRw@9% z#Kc5VQBiVoGKa&FNF?XZox^u30D!^4!Q9;3#KgoyhYlGGhQh+ag9i`(rDhV8Nl5)~ z+_;gGlf!1S_w3nYGMVt8$K$E3t>y7}>FMcBO-=Y_ku;FXej}?Cfl)ItjuI zzrab9clUpnTmF!EfpZds8K9FO%mAGPVFu_V2s1z@L6`wL3BnA}Nf2hBc&p^zy?bkU za1DV(LVoTBfAt2k7NURkhU_E=BtGCi3BnA}Nf2g$PJ%GQAM!9X(vtWnb^rhX07*qo IM6N<$f(-S>9smFU literal 2197 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 - libxml++: Class Hierarchy @@ -23,7 +22,7 @@

    @@ -35,7 +34,7 @@ - +

    Go to the textual class hierarchy

    + - - - - -
    - +
    - + +
    + +
    +
    - +
    +
    - +
    +
    - +
    +
    - +
    +
    - +
    -
    +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacemembers.html b/docs/reference/html/namespacemembers.html index 890793a..a5685b5 100644 --- a/docs/reference/html/namespacemembers.html +++ b/docs/reference/html/namespacemembers.html @@ -2,7 +2,6 @@ - libxml++: Namespace Members @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - + +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:50 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacemembers_enum.html b/docs/reference/html/namespacemembers_enum.html index 17ab2c6..d7c866a 100644 --- a/docs/reference/html/namespacemembers_enum.html +++ b/docs/reference/html/namespacemembers_enum.html @@ -2,7 +2,6 @@ - libxml++: Namespace Members @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - + +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:50 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacemembers_eval.html b/docs/reference/html/namespacemembers_eval.html index da493e0..346068b 100644 --- a/docs/reference/html/namespacemembers_eval.html +++ b/docs/reference/html/namespacemembers_eval.html @@ -2,7 +2,6 @@ - libxml++: Namespace Members @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - + +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:50 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacemembers_func.html b/docs/reference/html/namespacemembers_func.html index ffb52a7..b5f55fb 100644 --- a/docs/reference/html/namespacemembers_func.html +++ b/docs/reference/html/namespacemembers_func.html @@ -2,7 +2,6 @@ - libxml++: Namespace Members @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - + +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:50 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacemembers_type.html b/docs/reference/html/namespacemembers_type.html index cf8262a..e6b1adf 100644 --- a/docs/reference/html/namespacemembers_type.html +++ b/docs/reference/html/namespacemembers_type.html @@ -2,7 +2,6 @@ - libxml++: Namespace Members @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - + +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:50 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespaces.html b/docs/reference/html/namespaces.html index 77f024f..d0f833f 100644 --- a/docs/reference/html/namespaces.html +++ b/docs/reference/html/namespaces.html @@ -2,7 +2,6 @@ - libxml++: Namespace List @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    Here is a list of all namespaces with brief descriptions:
    xmlpp
    -
    +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/namespacexmlpp.html b/docs/reference/html/namespacexmlpp.html index faa6a53..5ed6940 100644 --- a/docs/reference/html/namespacexmlpp.html +++ b/docs/reference/html/namespacexmlpp.html @@ -2,7 +2,6 @@ - libxml++: xmlpp Namespace Reference @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    xmlpp Namespace Reference
    - +
      XML_INTERNAL_PREDEFINED_ENTITY = 6
    } + + @@ -190,13 +198,48 @@ Functions + +
    +
    +

    @@ -139,6 +138,15 @@ Enumerations

    enum  XPathResultType {
    +  XPATH_RESULT_UNDEFINED = 0,
    +  XPATH_RESULT_NODESET = 1,
    +  XPATH_RESULT_BOOLEAN = 2,
    +  XPATH_RESULT_NUMBER = 3,
    +  XPATH_RESULT_STRING = 4 +
    + }
     An XPath expression is evaluated to yield a result, which has one of the following four basic types: More...

    Functions

    Glib::ustring format_xml_error (const _xmlError* error=0)
    + + + +
    enum xmlpp::XPathResultType
    +
    +
    + +

    An XPath expression is evaluated to yield a result, which has one of the following four basic types:

    +
      +
    • node-set
      • +
    • boolean
      • +
    • number
      • +
    • string
      • +
    +
    Enumerator:
    + + + + + +
    XPATH_RESULT_UNDEFINED  +
    XPATH_RESULT_NODESET  +
    XPATH_RESULT_BOOLEAN  +
    XPATH_RESULT_NUMBER  +
    XPATH_RESULT_STRING  +
    +
    +
    + +
    +

    Function Documentation

    - + @@ -208,7 +251,7 @@ Functions

    Format an _xmlError struct into a text string, suitable for printing.

    Since libxml++ 2.36:
    -
    Parameters:
    +
    Parameters:
    Glib::ustring xmlpp::format_xml_error Glib::ustring xmlpp::format_xml_error ( const _xmlError *  error = 0)
    errorPointer to an _xmlError struct or 0. If 0, the error returned by xmlGetLastError() is used.
    @@ -223,7 +266,7 @@ Functions
    - + @@ -235,7 +278,7 @@ Functions

    Format a parser error into a text string, suitable for printing.

    Since libxml++ 2.36:
    -
    Parameters:
    +
    Parameters:
    Glib::ustring xmlpp::format_xml_parser_error Glib::ustring xmlpp::format_xml_parser_error ( const _xmlParserCtxt *  parser_context)
    parser_contextPointer to an _xmlParserCtxt struct.
    @@ -245,13 +288,13 @@ Functions
    -
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/pages.html b/docs/reference/html/pages.html index 155f60d..aa2bc62 100644 --- a/docs/reference/html/pages.html +++ b/docs/reference/html/pages.html @@ -2,7 +2,6 @@ - libxml++: Related Pages @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    Here is a list of all related documentation pages:
    -
    +
    -Generated on Thu Mar 22 2012 13:33:21 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/since_2_20.html b/docs/reference/html/since_2_20.html index 3772b26..69e9af7 100644 --- a/docs/reference/html/since_2_20.html +++ b/docs/reference/html/since_2_20.html @@ -2,7 +2,6 @@ - libxml++: New API in libxml++ 2.20 @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    Member xmlpp::Element::get_attribute_value (const Glib::ustring& name, const Glib::ustring& ns_prefix=Glib::ustring()) const
    -
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/since_2_24.html b/docs/reference/html/since_2_24.html index 9924432..2ab159c 100644 --- a/docs/reference/html/since_2_24.html +++ b/docs/reference/html/since_2_24.html @@ -2,7 +2,6 @@ - libxml++: New API in libxml++ 2.24 @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    Member xmlpp::Element::add_child_text (xmlpp::Node* previous_sibling, const Glib::ustring& content=Glib::ustring())
    @@ -66,13 +65,13 @@
    Class xmlpp::SchemaValidator
    -
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/since_2_36.html b/docs/reference/html/since_2_36.html index baffb8b..106c66a 100644 --- a/docs/reference/html/since_2_36.html +++ b/docs/reference/html/since_2_36.html @@ -2,7 +2,6 @@ - libxml++: New API in libxml++ 2.36 @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    Class xmlpp::AttributeDeclaration
    @@ -67,22 +66,34 @@
    Member xmlpp::format_xml_parser_error (const _xmlParserCtxt* parser_context)
    +
    Member xmlpp::Node::eval_to_boolean (const Glib::ustring& xpath, XPathResultType* result_type=0) const
    +
    +
    Member xmlpp::Node::eval_to_boolean (const Glib::ustring& xpath, const PrefixNsMap& namespaces, XPathResultType* result_type=0) const
    +
    +
    Member xmlpp::Node::eval_to_number (const Glib::ustring& xpath, XPathResultType* result_type=0) const
    +
    +
    Member xmlpp::Node::eval_to_number (const Glib::ustring& xpath, const PrefixNsMap& namespaces, XPathResultType* result_type=0) const
    +
    +
    Member xmlpp::Node::eval_to_string (const Glib::ustring& xpath, const PrefixNsMap& namespaces, XPathResultType* result_type=0) const
    +
    +
    Member xmlpp::Node::eval_to_string (const Glib::ustring& xpath, XPathResultType* result_type=0) const
    +
    Member xmlpp::Node::get_first_child (const Glib::ustring& name=Glib::ustring())
    Member xmlpp::Node::get_first_child (const Glib::ustring& name=Glib::ustring()) const
    -
    Member xmlpp::Parser::get_throw_messages () const
    +
    Member xmlpp::Parser::get_throw_messages () const
    -
    Member xmlpp::Parser::set_throw_messages (bool val=true)
    +
    Member xmlpp::Parser::set_throw_messages (bool val=true)
    -
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html index 893fd2f..64624bb 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html @@ -2,7 +2,6 @@ - libxml++: Member List @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    This is the complete list of members for xmlpp::SaxParser::Attribute, including all inherited members. -
    Attribute(Glib::ustring const& n, Glib::ustring const& v)xmlpp::SaxParser::Attribute [inline]
    namexmlpp::SaxParser::Attribute
    valuexmlpp::SaxParser::Attribute
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html index c02c663..9d29d4b 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html @@ -2,7 +2,6 @@ - libxml++: xmlpp::SaxParser::Attribute Struct Reference @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    xmlpp::SaxParser::Attribute Struct Reference
    - +

    Simple structure used in the start_element callback, in which the attributes are a list of name/value pairs. More...

    @@ -77,7 +76,7 @@ Collaboration diagram for xmlpp::SaxParser::Attribute:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -98,7 +97,7 @@ Public Attributes
    - + @@ -150,13 +149,13 @@ Public Attributes
    The documentation for this struct was generated from the following file:
    • parsers/saxparser.h
    - +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html index 3ede2a9..e057686 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html @@ -2,7 +2,6 @@ -libxml++: Member List @@ -23,7 +22,7 @@ @@ -35,7 +34,7 @@
    xmlpp::SaxParser::Attribute::Attribute xmlpp::SaxParser::Attribute::Attribute ( Glib::ustring const &  n,
    libxml++ -  2.35.2 +  2.35.3
    - +
    This is the complete list of members for xmlpp::SaxParser::AttributeHasName, including all inherited members. -
    AttributeHasName(Glib::ustring const& n)xmlpp::SaxParser::AttributeHasName [inline]
    namexmlpp::SaxParser::AttributeHasName
    operator()(Attribute const& attribute)xmlpp::SaxParser::AttributeHasName [inline]
    +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html index 451c22b..8427756 100644 --- a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html +++ b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html @@ -2,7 +2,6 @@ - libxml++: xmlpp::SaxParser::AttributeHasName Struct Reference @@ -23,7 +22,7 @@
    libxml++ -  2.35.2 +  2.35.3
    @@ -35,7 +34,7 @@ - +
    xmlpp::SaxParser::AttributeHasName Struct Reference
    - +

    This functor is a helper to find an attribute by name in an AttributeList using the standard algorithm std::find_if. More...

    @@ -77,7 +76,7 @@ Collaboration diagram for xmlpp::SaxParser::AttributeHasName:
    Collaboration graph
    - +
    [legend]

    List of all members.

    @@ -101,7 +100,7 @@ Public Attributes
    - + @@ -148,13 +147,13 @@ Public Attributes
    The documentation for this struct was generated from the following file:
    • parsers/saxparser.h
    - +
    -Generated on Thu Mar 22 2012 13:33:20 for libxml++ by   +Generated on Thu Jun 21 2012 09:28:49 for libxml++ by   doxygen - 1.7.6.1 + 1.7.5
    diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png b/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName__coll__graph.png index fa50006a0d7d04058b59177045f7111523173615..8394bd628f270f58ea2a1a4faca1c0037abe7f33 100644 GIT binary patch literal 4555 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 H0semgP>2)U literal 4513 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 DIElM! diff --git a/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png b/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute__coll__graph.png index f487e0b5a092c6dbcef43806511e7a94e9fa6e43..af5ed0f41b5ae13def771245ade9d2196cb49eb4 100644 GIT binary patch literal 4639 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 F{{i+LmJ|R0 diff --git a/docs/reference/libxml++-2.6.devhelp2 b/docs/reference/libxml++-2.6.devhelp2 index 77e8ef6..77b649d 100644 --- a/docs/reference/libxml++-2.6.devhelp2 +++ b/docs/reference/libxml++-2.6.devhelp2 @@ -14,7 +14,9 @@ - + + + @@ -57,6 +59,12 @@ + + + + + + @@ -98,6 +106,9 @@ + + + @@ -238,10 +249,16 @@ + + + + + + - + diff --git a/docs/reference/libxml++-2.6.tag b/docs/reference/libxml++-2.6.tag index ff5a0ad..5aa8985 100644 --- a/docs/reference/libxml++-2.6.tag +++ b/docs/reference/libxml++-2.6.tag @@ -1,5 +1,13 @@ + + index + libxml++ Reference Manual + index + features + basics + description + sigc::trackable classsigc_1_1trackable.html @@ -92,6 +100,42 @@ a0fa47f0fb103cf9ea460a2fef3f5be49a374b57b001a4590bc237822002038628 + + XPathResultType + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8 + + + + XPATH_RESULT_UNDEFINED + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8afd5e232d1a67f97fd00a9cdb801cd2ec + + + + XPATH_RESULT_NODESET + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8a6815e8300152cf6c0e1e5eba208f7160 + + + + XPATH_RESULT_BOOLEAN + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8a37a876ebec95a8d875832d60afa7b119 + + + + XPATH_RESULT_NUMBER + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8a8fc1616a061dbf482b74d5366672f295 + + + + XPATH_RESULT_STRING + namespacexmlpp.html + ac91075edf569a213343d7d13ae4be3c8a1086ddb8e1eb046aa2ca95216ec3f8da + + Glib::ustring format_xml_error @@ -224,6 +268,7 @@ xmlpp::Document classxmlpp_1_1Document.html xmlpp::NonCopyable + xmlpp::Document::Init Document @@ -373,6 +418,24 @@ + xmlpp::Document::Init + classxmlpp_1_1Document_1_1Init.html + + + Init + classxmlpp_1_1Document_1_1Init.html + a2022c663a9c3b75aa63f6cb1964e00e1 + () + + + virtual + ~Init + classxmlpp_1_1Document_1_1Init.html + a7b1681b28ce867c2c2713ef3964ce00b + () + + + xmlpp::Dtd classxmlpp_1_1Dtd.html @@ -1318,6 +1381,48 @@ (const Glib::ustring &xpath, const PrefixNsMap &namespaces) const + bool + eval_to_boolean + classxmlpp_1_1Node.html + a676b7cc5db3c19fed65a72bee18ecddb + (const Glib::ustring &xpath, XPathResultType *result_type=0) const + + + bool + eval_to_boolean + classxmlpp_1_1Node.html + aecccaf7c600e523313eb4d9fe322777b + (const Glib::ustring &xpath, const PrefixNsMap &namespaces, XPathResultType *result_type=0) const + + + double + eval_to_number + classxmlpp_1_1Node.html + a7c8a3f5f33d7ee8d8dad1b9333ac3edc + (const Glib::ustring &xpath, XPathResultType *result_type=0) const + + + double + eval_to_number + classxmlpp_1_1Node.html + a484af20daae39fe5db0a1ce2f16cc73e + (const Glib::ustring &xpath, const PrefixNsMap &namespaces, XPathResultType *result_type=0) const + + + Glib::ustring + eval_to_string + classxmlpp_1_1Node.html + a9ecbce3fafb8ab13d227c739c3e789f2 + (const Glib::ustring &xpath, XPathResultType *result_type=0) const + + + Glib::ustring + eval_to_string + classxmlpp_1_1Node.html + ab2a27479f8482aecd5fb67c18b9b1579 + (const Glib::ustring &xpath, const PrefixNsMap &namespaces, XPathResultType *result_type=0) const + + _xmlNode * cobj classxmlpp_1_1Node.html @@ -1342,8 +1447,8 @@ static void free_wrappers classxmlpp_1_1Node.html - a9e92d80344958a33f8e32ade0bd18fa5 - (_xmlNode *attr) + aa47901df78305a685fc9682cd44290d6 + (_xmlNode *node) _xmlNode * @@ -2828,12 +2933,4 @@ - - index - libxml++ Reference Manual - index - features - basics - description - diff --git a/examples/Makefile.am b/examples/Makefile.am new file mode 100644 index 0000000..63e873e --- /dev/null +++ b/examples/Makefile.am @@ -0,0 +1,140 @@ +## Copyright (C) 2012 The libxml++ development team +## +## This file is part of libxml++. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see . + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) +AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) +LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) + +check_PROGRAMS = \ + dom_build/dom_build \ + dom_parse_entities/dom_parse_entities \ + dom_parser/dom_parser \ + dom_parser_raw/dom_parser_raw \ + dom_read_write/dom_read_write \ + dom_xpath/dom_xpath \ + dtdvalidation/dtdvalidation \ + import_node/import_node \ + sax_exception/sax_exception \ + sax_parser/sax_parser \ + sax_parser_build_dom/sax_parser_build_dom \ + sax_parser_entities/sax_parser_entities \ + schemavalidation/schemavalidation \ + textreader/textreader + +# Shell scripts that call the example programs. +check_SCRIPTS = $(addsuffix make-check-sh,$(dir $(check_PROGRAMS))) +TESTS = $(check_SCRIPTS) + +dom_build_dom_build_SOURCES = \ + dom_build/main.cc +dom_parse_entities_dom_parse_entities_SOURCES = \ + dom_parse_entities/main.cc +dom_parser_dom_parser_SOURCES = \ + dom_parser/main.cc +dom_parser_raw_dom_parser_raw_SOURCES = \ + dom_parser_raw/main.cc +dom_read_write_dom_read_write_SOURCES = \ + dom_read_write/main.cc +dom_xpath_dom_xpath_SOURCES = \ + dom_xpath/main.cc +dtdvalidation_dtdvalidation_SOURCES = \ + dtdvalidation/main.cc +import_node_import_node_SOURCES = \ + import_node/main.cc +sax_exception_sax_exception_SOURCES = \ + sax_exception/main.cc \ + sax_exception/myparser.cc \ + sax_exception/myparser.h +sax_parser_sax_parser_SOURCES = \ + sax_parser/main.cc \ + sax_parser/myparser.cc \ + sax_parser/myparser.h +sax_parser_build_dom_sax_parser_build_dom_SOURCES = \ + sax_parser_build_dom/main.cc \ + sax_parser_build_dom/svgparser.cc \ + sax_parser_build_dom/svgparser.h \ + sax_parser_build_dom/svgdocument.cc \ + sax_parser_build_dom/svgdocument.h \ + sax_parser_build_dom/svgelement.cc \ + sax_parser_build_dom/svgelement.h \ + sax_parser_build_dom/svgpath.h \ + sax_parser_build_dom/svggroup.h +sax_parser_entities_sax_parser_entities_SOURCES = \ + sax_parser_entities/main.cc \ + sax_parser_entities/myparser.cc \ + sax_parser_entities/myparser.h +schemavalidation_schemavalidation_SOURCES = \ + schemavalidation/main.cc +textreader_textreader_SOURCES = \ + textreader/main.cc + +dist_noinst_DATA = \ + README \ + dom_parse_entities/example.xml \ + dom_parse_entities/example.dtd \ + dom_parser/example.xml \ + dom_parser/example_with_namespace.xml \ + dom_parser/example_invalid.xml \ + dom_parser/example.dtd \ + dom_parser_raw/example.xml \ + dom_parser_raw/example_invalid.xml \ + dom_parser_raw/example.dtd \ + dom_read_write/README \ + dom_read_write/example.xml \ + dom_read_write/example.dtd \ + dom_xpath/example.xml \ + dtdvalidation/example.dtd \ + import_node/example1.xml \ + import_node/example2.xml \ + sax_exception/example.xml \ + sax_parser/example.xml \ + sax_parser_build_dom/README \ + sax_parser_build_dom/example.xml \ + sax_parser_entities/example.xml \ + schemavalidation/example.xml \ + schemavalidation/example.xsd \ + textreader/example.xml + +# Build the shell scripts that call the example programs. +# +# Some programs can find their input file(s) only if the current directory, +# when they are executed, is the program's own source directory. +# To make these program invocations as consistent as possible, and to avoid +# having to specify parameters for the programs, most programs are executed +# from their own source directory. + +# dom_read_write shall write its output file in the build directory, +# which may or may not be the same as the source directory. +# Here it's necessary to specify parameters when the input file and the output +# file are located in different directories. +dom_read_write/make-check-sh: Makefile + echo '# Generated and used by "make check"' >$@ + echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ + chmod +x $@ + +script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null +standard_scripts = $(filter-out dom_read_write/make-check-sh,$(check_SCRIPTS)) + +# All other script files are generated like so: +$(standard_scripts): Makefile + echo '# Generated and used by "make check"' >$@ + echo '$(subst ,$(subst /make-check-sh,,$@),$(script_template))' >>$@ + chmod +x $@ + +CLEANFILES = \ + dom_read_write/example_output.xml \ + $(check_SCRIPTS) diff --git a/examples/Makefile.in b/examples/Makefile.in new file mode 100644 index 0000000..8d6605a --- /dev/null +++ b/examples/Makefile.in @@ -0,0 +1,1153 @@ +# Makefile.in generated by automake 1.11.3 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +check_PROGRAMS = dom_build/dom_build$(EXEEXT) \ + dom_parse_entities/dom_parse_entities$(EXEEXT) \ + dom_parser/dom_parser$(EXEEXT) \ + dom_parser_raw/dom_parser_raw$(EXEEXT) \ + dom_read_write/dom_read_write$(EXEEXT) \ + dom_xpath/dom_xpath$(EXEEXT) \ + dtdvalidation/dtdvalidation$(EXEEXT) \ + import_node/import_node$(EXEEXT) \ + sax_exception/sax_exception$(EXEEXT) \ + sax_parser/sax_parser$(EXEEXT) \ + sax_parser_build_dom/sax_parser_build_dom$(EXEEXT) \ + sax_parser_entities/sax_parser_entities$(EXEEXT) \ + schemavalidation/schemavalidation$(EXEEXT) \ + textreader/textreader$(EXEEXT) +subdir = examples +DIST_COMMON = README $(dist_noinst_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/macros/libtool.m4 \ + $(top_srcdir)/macros/ltoptions.m4 \ + $(top_srcdir)/macros/ltsugar.m4 \ + $(top_srcdir)/macros/ltversion.m4 \ + $(top_srcdir)/macros/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/libxml++config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__dirstamp = $(am__leading_dot)dirstamp +am_dom_build_dom_build_OBJECTS = dom_build/main.$(OBJEXT) +dom_build_dom_build_OBJECTS = $(am_dom_build_dom_build_OBJECTS) +dom_build_dom_build_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +dom_build_dom_build_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am_dom_parse_entities_dom_parse_entities_OBJECTS = \ + dom_parse_entities/main.$(OBJEXT) +dom_parse_entities_dom_parse_entities_OBJECTS = \ + $(am_dom_parse_entities_dom_parse_entities_OBJECTS) +dom_parse_entities_dom_parse_entities_LDADD = $(LDADD) +dom_parse_entities_dom_parse_entities_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_dom_parser_dom_parser_OBJECTS = dom_parser/main.$(OBJEXT) +dom_parser_dom_parser_OBJECTS = $(am_dom_parser_dom_parser_OBJECTS) +dom_parser_dom_parser_LDADD = $(LDADD) +dom_parser_dom_parser_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_dom_parser_raw_dom_parser_raw_OBJECTS = \ + dom_parser_raw/main.$(OBJEXT) +dom_parser_raw_dom_parser_raw_OBJECTS = \ + $(am_dom_parser_raw_dom_parser_raw_OBJECTS) +dom_parser_raw_dom_parser_raw_LDADD = $(LDADD) +dom_parser_raw_dom_parser_raw_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_dom_read_write_dom_read_write_OBJECTS = \ + dom_read_write/main.$(OBJEXT) +dom_read_write_dom_read_write_OBJECTS = \ + $(am_dom_read_write_dom_read_write_OBJECTS) +dom_read_write_dom_read_write_LDADD = $(LDADD) +dom_read_write_dom_read_write_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_dom_xpath_dom_xpath_OBJECTS = dom_xpath/main.$(OBJEXT) +dom_xpath_dom_xpath_OBJECTS = $(am_dom_xpath_dom_xpath_OBJECTS) +dom_xpath_dom_xpath_LDADD = $(LDADD) +dom_xpath_dom_xpath_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_dtdvalidation_dtdvalidation_OBJECTS = dtdvalidation/main.$(OBJEXT) +dtdvalidation_dtdvalidation_OBJECTS = \ + $(am_dtdvalidation_dtdvalidation_OBJECTS) +dtdvalidation_dtdvalidation_LDADD = $(LDADD) +dtdvalidation_dtdvalidation_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_import_node_import_node_OBJECTS = import_node/main.$(OBJEXT) +import_node_import_node_OBJECTS = \ + $(am_import_node_import_node_OBJECTS) +import_node_import_node_LDADD = $(LDADD) +import_node_import_node_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_sax_exception_sax_exception_OBJECTS = sax_exception/main.$(OBJEXT) \ + sax_exception/myparser.$(OBJEXT) +sax_exception_sax_exception_OBJECTS = \ + $(am_sax_exception_sax_exception_OBJECTS) +sax_exception_sax_exception_LDADD = $(LDADD) +sax_exception_sax_exception_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_sax_parser_sax_parser_OBJECTS = sax_parser/main.$(OBJEXT) \ + sax_parser/myparser.$(OBJEXT) +sax_parser_sax_parser_OBJECTS = $(am_sax_parser_sax_parser_OBJECTS) +sax_parser_sax_parser_LDADD = $(LDADD) +sax_parser_sax_parser_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_sax_parser_build_dom_sax_parser_build_dom_OBJECTS = \ + sax_parser_build_dom/main.$(OBJEXT) \ + sax_parser_build_dom/svgparser.$(OBJEXT) \ + sax_parser_build_dom/svgdocument.$(OBJEXT) \ + sax_parser_build_dom/svgelement.$(OBJEXT) +sax_parser_build_dom_sax_parser_build_dom_OBJECTS = \ + $(am_sax_parser_build_dom_sax_parser_build_dom_OBJECTS) +sax_parser_build_dom_sax_parser_build_dom_LDADD = $(LDADD) +sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_sax_parser_entities_sax_parser_entities_OBJECTS = \ + sax_parser_entities/main.$(OBJEXT) \ + sax_parser_entities/myparser.$(OBJEXT) +sax_parser_entities_sax_parser_entities_OBJECTS = \ + $(am_sax_parser_entities_sax_parser_entities_OBJECTS) +sax_parser_entities_sax_parser_entities_LDADD = $(LDADD) +sax_parser_entities_sax_parser_entities_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_schemavalidation_schemavalidation_OBJECTS = \ + schemavalidation/main.$(OBJEXT) +schemavalidation_schemavalidation_OBJECTS = \ + $(am_schemavalidation_schemavalidation_OBJECTS) +schemavalidation_schemavalidation_LDADD = $(LDADD) +schemavalidation_schemavalidation_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +am_textreader_textreader_OBJECTS = textreader/main.$(OBJEXT) +textreader_textreader_OBJECTS = $(am_textreader_textreader_OBJECTS) +textreader_textreader_LDADD = $(LDADD) +textreader_textreader_DEPENDENCIES = \ + $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \ + $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = +depcomp = $(SHELL) $(top_srcdir)/macros/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(dom_build_dom_build_SOURCES) \ + $(dom_parse_entities_dom_parse_entities_SOURCES) \ + $(dom_parser_dom_parser_SOURCES) \ + $(dom_parser_raw_dom_parser_raw_SOURCES) \ + $(dom_read_write_dom_read_write_SOURCES) \ + $(dom_xpath_dom_xpath_SOURCES) \ + $(dtdvalidation_dtdvalidation_SOURCES) \ + $(import_node_import_node_SOURCES) \ + $(sax_exception_sax_exception_SOURCES) \ + $(sax_parser_sax_parser_SOURCES) \ + $(sax_parser_build_dom_sax_parser_build_dom_SOURCES) \ + $(sax_parser_entities_sax_parser_entities_SOURCES) \ + $(schemavalidation_schemavalidation_SOURCES) \ + $(textreader_textreader_SOURCES) +DIST_SOURCES = $(dom_build_dom_build_SOURCES) \ + $(dom_parse_entities_dom_parse_entities_SOURCES) \ + $(dom_parser_dom_parser_SOURCES) \ + $(dom_parser_raw_dom_parser_raw_SOURCES) \ + $(dom_read_write_dom_read_write_SOURCES) \ + $(dom_xpath_dom_xpath_SOURCES) \ + $(dtdvalidation_dtdvalidation_SOURCES) \ + $(import_node_import_node_SOURCES) \ + $(sax_exception_sax_exception_SOURCES) \ + $(sax_parser_sax_parser_SOURCES) \ + $(sax_parser_build_dom_sax_parser_build_dom_SOURCES) \ + $(sax_parser_entities_sax_parser_entities_SOURCES) \ + $(schemavalidation_schemavalidation_SOURCES) \ + $(textreader_textreader_SOURCES) +DATA = $(dist_noinst_DATA) +ETAGS = etags +CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_FLAGS = @ACLOCAL_FLAGS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DB2LATEX = @DB2LATEX@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCINSTALL_FLAGS = @DOCINSTALL_FLAGS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_TAGFILES = @DOXYGEN_TAGFILES@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXMLXX_API_VERSION = @LIBXMLXX_API_VERSION@ +LIBXMLXX_CFLAGS = @LIBXMLXX_CFLAGS@ +LIBXMLXX_LIBS = @LIBXMLXX_LIBS@ +LIBXMLXX_MAJOR_VERSION = @LIBXMLXX_MAJOR_VERSION@ +LIBXMLXX_MICRO_VERSION = @LIBXMLXX_MICRO_VERSION@ +LIBXMLXX_MINOR_VERSION = @LIBXMLXX_MINOR_VERSION@ +LIBXMLXX_MODULES = @LIBXMLXX_MODULES@ +LIBXMLXX_MODULE_NAME = @LIBXMLXX_MODULE_NAME@ +LIBXMLXX_SO_VERSION = @LIBXMLXX_SO_VERSION@ +LIBXMLXX_VERSION = @LIBXMLXX_VERSION@ +LIBXMLXX_WXXFLAGS = @LIBXMLXX_WXXFLAGS@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MMDOCTOOLDIR = @MMDOCTOOLDIR@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +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@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS) +AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS) +LDADD = $(top_builddir)/libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS) + +# Shell scripts that call the example programs. +check_SCRIPTS = $(addsuffix make-check-sh,$(dir $(check_PROGRAMS))) +TESTS = $(check_SCRIPTS) +dom_build_dom_build_SOURCES = \ + dom_build/main.cc + +dom_parse_entities_dom_parse_entities_SOURCES = \ + dom_parse_entities/main.cc + +dom_parser_dom_parser_SOURCES = \ + dom_parser/main.cc + +dom_parser_raw_dom_parser_raw_SOURCES = \ + dom_parser_raw/main.cc + +dom_read_write_dom_read_write_SOURCES = \ + dom_read_write/main.cc + +dom_xpath_dom_xpath_SOURCES = \ + dom_xpath/main.cc + +dtdvalidation_dtdvalidation_SOURCES = \ + dtdvalidation/main.cc + +import_node_import_node_SOURCES = \ + import_node/main.cc + +sax_exception_sax_exception_SOURCES = \ + sax_exception/main.cc \ + sax_exception/myparser.cc \ + sax_exception/myparser.h + +sax_parser_sax_parser_SOURCES = \ + sax_parser/main.cc \ + sax_parser/myparser.cc \ + sax_parser/myparser.h + +sax_parser_build_dom_sax_parser_build_dom_SOURCES = \ + sax_parser_build_dom/main.cc \ + sax_parser_build_dom/svgparser.cc \ + sax_parser_build_dom/svgparser.h \ + sax_parser_build_dom/svgdocument.cc \ + sax_parser_build_dom/svgdocument.h \ + sax_parser_build_dom/svgelement.cc \ + sax_parser_build_dom/svgelement.h \ + sax_parser_build_dom/svgpath.h \ + sax_parser_build_dom/svggroup.h + +sax_parser_entities_sax_parser_entities_SOURCES = \ + sax_parser_entities/main.cc \ + sax_parser_entities/myparser.cc \ + sax_parser_entities/myparser.h + +schemavalidation_schemavalidation_SOURCES = \ + schemavalidation/main.cc + +textreader_textreader_SOURCES = \ + textreader/main.cc + +dist_noinst_DATA = \ + README \ + dom_parse_entities/example.xml \ + dom_parse_entities/example.dtd \ + dom_parser/example.xml \ + dom_parser/example_with_namespace.xml \ + dom_parser/example_invalid.xml \ + dom_parser/example.dtd \ + dom_parser_raw/example.xml \ + dom_parser_raw/example_invalid.xml \ + dom_parser_raw/example.dtd \ + dom_read_write/README \ + dom_read_write/example.xml \ + dom_read_write/example.dtd \ + dom_xpath/example.xml \ + dtdvalidation/example.dtd \ + import_node/example1.xml \ + import_node/example2.xml \ + sax_exception/example.xml \ + sax_parser/example.xml \ + sax_parser_build_dom/README \ + sax_parser_build_dom/example.xml \ + sax_parser_entities/example.xml \ + schemavalidation/example.xml \ + schemavalidation/example.xsd \ + textreader/example.xml + +script_template = cd "$(srcdir)/" && "$(abs_builddir)//" >/dev/null +standard_scripts = $(filter-out dom_read_write/make-check-sh,$(check_SCRIPTS)) +CLEANFILES = \ + dom_read_write/example_output.xml \ + $(check_SCRIPTS) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu examples/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +dom_build/$(am__dirstamp): + @$(MKDIR_P) dom_build + @: > dom_build/$(am__dirstamp) +dom_build/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_build/$(DEPDIR) + @: > dom_build/$(DEPDIR)/$(am__dirstamp) +dom_build/main.$(OBJEXT): dom_build/$(am__dirstamp) \ + dom_build/$(DEPDIR)/$(am__dirstamp) +dom_build/dom_build$(EXEEXT): $(dom_build_dom_build_OBJECTS) $(dom_build_dom_build_DEPENDENCIES) $(EXTRA_dom_build_dom_build_DEPENDENCIES) dom_build/$(am__dirstamp) + @rm -f dom_build/dom_build$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_build_dom_build_OBJECTS) $(dom_build_dom_build_LDADD) $(LIBS) +dom_parse_entities/$(am__dirstamp): + @$(MKDIR_P) dom_parse_entities + @: > dom_parse_entities/$(am__dirstamp) +dom_parse_entities/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_parse_entities/$(DEPDIR) + @: > dom_parse_entities/$(DEPDIR)/$(am__dirstamp) +dom_parse_entities/main.$(OBJEXT): dom_parse_entities/$(am__dirstamp) \ + dom_parse_entities/$(DEPDIR)/$(am__dirstamp) +dom_parse_entities/dom_parse_entities$(EXEEXT): $(dom_parse_entities_dom_parse_entities_OBJECTS) $(dom_parse_entities_dom_parse_entities_DEPENDENCIES) $(EXTRA_dom_parse_entities_dom_parse_entities_DEPENDENCIES) dom_parse_entities/$(am__dirstamp) + @rm -f dom_parse_entities/dom_parse_entities$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_parse_entities_dom_parse_entities_OBJECTS) $(dom_parse_entities_dom_parse_entities_LDADD) $(LIBS) +dom_parser/$(am__dirstamp): + @$(MKDIR_P) dom_parser + @: > dom_parser/$(am__dirstamp) +dom_parser/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_parser/$(DEPDIR) + @: > dom_parser/$(DEPDIR)/$(am__dirstamp) +dom_parser/main.$(OBJEXT): dom_parser/$(am__dirstamp) \ + dom_parser/$(DEPDIR)/$(am__dirstamp) +dom_parser/dom_parser$(EXEEXT): $(dom_parser_dom_parser_OBJECTS) $(dom_parser_dom_parser_DEPENDENCIES) $(EXTRA_dom_parser_dom_parser_DEPENDENCIES) dom_parser/$(am__dirstamp) + @rm -f dom_parser/dom_parser$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_parser_dom_parser_OBJECTS) $(dom_parser_dom_parser_LDADD) $(LIBS) +dom_parser_raw/$(am__dirstamp): + @$(MKDIR_P) dom_parser_raw + @: > dom_parser_raw/$(am__dirstamp) +dom_parser_raw/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_parser_raw/$(DEPDIR) + @: > dom_parser_raw/$(DEPDIR)/$(am__dirstamp) +dom_parser_raw/main.$(OBJEXT): dom_parser_raw/$(am__dirstamp) \ + dom_parser_raw/$(DEPDIR)/$(am__dirstamp) +dom_parser_raw/dom_parser_raw$(EXEEXT): $(dom_parser_raw_dom_parser_raw_OBJECTS) $(dom_parser_raw_dom_parser_raw_DEPENDENCIES) $(EXTRA_dom_parser_raw_dom_parser_raw_DEPENDENCIES) dom_parser_raw/$(am__dirstamp) + @rm -f dom_parser_raw/dom_parser_raw$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_parser_raw_dom_parser_raw_OBJECTS) $(dom_parser_raw_dom_parser_raw_LDADD) $(LIBS) +dom_read_write/$(am__dirstamp): + @$(MKDIR_P) dom_read_write + @: > dom_read_write/$(am__dirstamp) +dom_read_write/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_read_write/$(DEPDIR) + @: > dom_read_write/$(DEPDIR)/$(am__dirstamp) +dom_read_write/main.$(OBJEXT): dom_read_write/$(am__dirstamp) \ + dom_read_write/$(DEPDIR)/$(am__dirstamp) +dom_read_write/dom_read_write$(EXEEXT): $(dom_read_write_dom_read_write_OBJECTS) $(dom_read_write_dom_read_write_DEPENDENCIES) $(EXTRA_dom_read_write_dom_read_write_DEPENDENCIES) dom_read_write/$(am__dirstamp) + @rm -f dom_read_write/dom_read_write$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_read_write_dom_read_write_OBJECTS) $(dom_read_write_dom_read_write_LDADD) $(LIBS) +dom_xpath/$(am__dirstamp): + @$(MKDIR_P) dom_xpath + @: > dom_xpath/$(am__dirstamp) +dom_xpath/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dom_xpath/$(DEPDIR) + @: > dom_xpath/$(DEPDIR)/$(am__dirstamp) +dom_xpath/main.$(OBJEXT): dom_xpath/$(am__dirstamp) \ + dom_xpath/$(DEPDIR)/$(am__dirstamp) +dom_xpath/dom_xpath$(EXEEXT): $(dom_xpath_dom_xpath_OBJECTS) $(dom_xpath_dom_xpath_DEPENDENCIES) $(EXTRA_dom_xpath_dom_xpath_DEPENDENCIES) dom_xpath/$(am__dirstamp) + @rm -f dom_xpath/dom_xpath$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dom_xpath_dom_xpath_OBJECTS) $(dom_xpath_dom_xpath_LDADD) $(LIBS) +dtdvalidation/$(am__dirstamp): + @$(MKDIR_P) dtdvalidation + @: > dtdvalidation/$(am__dirstamp) +dtdvalidation/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) dtdvalidation/$(DEPDIR) + @: > dtdvalidation/$(DEPDIR)/$(am__dirstamp) +dtdvalidation/main.$(OBJEXT): dtdvalidation/$(am__dirstamp) \ + dtdvalidation/$(DEPDIR)/$(am__dirstamp) +dtdvalidation/dtdvalidation$(EXEEXT): $(dtdvalidation_dtdvalidation_OBJECTS) $(dtdvalidation_dtdvalidation_DEPENDENCIES) $(EXTRA_dtdvalidation_dtdvalidation_DEPENDENCIES) dtdvalidation/$(am__dirstamp) + @rm -f dtdvalidation/dtdvalidation$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(dtdvalidation_dtdvalidation_OBJECTS) $(dtdvalidation_dtdvalidation_LDADD) $(LIBS) +import_node/$(am__dirstamp): + @$(MKDIR_P) import_node + @: > import_node/$(am__dirstamp) +import_node/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) import_node/$(DEPDIR) + @: > import_node/$(DEPDIR)/$(am__dirstamp) +import_node/main.$(OBJEXT): import_node/$(am__dirstamp) \ + import_node/$(DEPDIR)/$(am__dirstamp) +import_node/import_node$(EXEEXT): $(import_node_import_node_OBJECTS) $(import_node_import_node_DEPENDENCIES) $(EXTRA_import_node_import_node_DEPENDENCIES) import_node/$(am__dirstamp) + @rm -f import_node/import_node$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(import_node_import_node_OBJECTS) $(import_node_import_node_LDADD) $(LIBS) +sax_exception/$(am__dirstamp): + @$(MKDIR_P) sax_exception + @: > sax_exception/$(am__dirstamp) +sax_exception/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sax_exception/$(DEPDIR) + @: > sax_exception/$(DEPDIR)/$(am__dirstamp) +sax_exception/main.$(OBJEXT): sax_exception/$(am__dirstamp) \ + sax_exception/$(DEPDIR)/$(am__dirstamp) +sax_exception/myparser.$(OBJEXT): sax_exception/$(am__dirstamp) \ + sax_exception/$(DEPDIR)/$(am__dirstamp) +sax_exception/sax_exception$(EXEEXT): $(sax_exception_sax_exception_OBJECTS) $(sax_exception_sax_exception_DEPENDENCIES) $(EXTRA_sax_exception_sax_exception_DEPENDENCIES) sax_exception/$(am__dirstamp) + @rm -f sax_exception/sax_exception$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(sax_exception_sax_exception_OBJECTS) $(sax_exception_sax_exception_LDADD) $(LIBS) +sax_parser/$(am__dirstamp): + @$(MKDIR_P) sax_parser + @: > sax_parser/$(am__dirstamp) +sax_parser/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sax_parser/$(DEPDIR) + @: > sax_parser/$(DEPDIR)/$(am__dirstamp) +sax_parser/main.$(OBJEXT): sax_parser/$(am__dirstamp) \ + sax_parser/$(DEPDIR)/$(am__dirstamp) +sax_parser/myparser.$(OBJEXT): sax_parser/$(am__dirstamp) \ + sax_parser/$(DEPDIR)/$(am__dirstamp) +sax_parser/sax_parser$(EXEEXT): $(sax_parser_sax_parser_OBJECTS) $(sax_parser_sax_parser_DEPENDENCIES) $(EXTRA_sax_parser_sax_parser_DEPENDENCIES) sax_parser/$(am__dirstamp) + @rm -f sax_parser/sax_parser$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(sax_parser_sax_parser_OBJECTS) $(sax_parser_sax_parser_LDADD) $(LIBS) +sax_parser_build_dom/$(am__dirstamp): + @$(MKDIR_P) sax_parser_build_dom + @: > sax_parser_build_dom/$(am__dirstamp) +sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sax_parser_build_dom/$(DEPDIR) + @: > sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) +sax_parser_build_dom/main.$(OBJEXT): \ + sax_parser_build_dom/$(am__dirstamp) \ + sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) +sax_parser_build_dom/svgparser.$(OBJEXT): \ + sax_parser_build_dom/$(am__dirstamp) \ + sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) +sax_parser_build_dom/svgdocument.$(OBJEXT): \ + sax_parser_build_dom/$(am__dirstamp) \ + sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) +sax_parser_build_dom/svgelement.$(OBJEXT): \ + sax_parser_build_dom/$(am__dirstamp) \ + sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) +sax_parser_build_dom/sax_parser_build_dom$(EXEEXT): $(sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) $(EXTRA_sax_parser_build_dom_sax_parser_build_dom_DEPENDENCIES) sax_parser_build_dom/$(am__dirstamp) + @rm -f sax_parser_build_dom/sax_parser_build_dom$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(sax_parser_build_dom_sax_parser_build_dom_OBJECTS) $(sax_parser_build_dom_sax_parser_build_dom_LDADD) $(LIBS) +sax_parser_entities/$(am__dirstamp): + @$(MKDIR_P) sax_parser_entities + @: > sax_parser_entities/$(am__dirstamp) +sax_parser_entities/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) sax_parser_entities/$(DEPDIR) + @: > sax_parser_entities/$(DEPDIR)/$(am__dirstamp) +sax_parser_entities/main.$(OBJEXT): \ + sax_parser_entities/$(am__dirstamp) \ + sax_parser_entities/$(DEPDIR)/$(am__dirstamp) +sax_parser_entities/myparser.$(OBJEXT): \ + sax_parser_entities/$(am__dirstamp) \ + sax_parser_entities/$(DEPDIR)/$(am__dirstamp) +sax_parser_entities/sax_parser_entities$(EXEEXT): $(sax_parser_entities_sax_parser_entities_OBJECTS) $(sax_parser_entities_sax_parser_entities_DEPENDENCIES) $(EXTRA_sax_parser_entities_sax_parser_entities_DEPENDENCIES) sax_parser_entities/$(am__dirstamp) + @rm -f sax_parser_entities/sax_parser_entities$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(sax_parser_entities_sax_parser_entities_OBJECTS) $(sax_parser_entities_sax_parser_entities_LDADD) $(LIBS) +schemavalidation/$(am__dirstamp): + @$(MKDIR_P) schemavalidation + @: > schemavalidation/$(am__dirstamp) +schemavalidation/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) schemavalidation/$(DEPDIR) + @: > schemavalidation/$(DEPDIR)/$(am__dirstamp) +schemavalidation/main.$(OBJEXT): schemavalidation/$(am__dirstamp) \ + schemavalidation/$(DEPDIR)/$(am__dirstamp) +schemavalidation/schemavalidation$(EXEEXT): $(schemavalidation_schemavalidation_OBJECTS) $(schemavalidation_schemavalidation_DEPENDENCIES) $(EXTRA_schemavalidation_schemavalidation_DEPENDENCIES) schemavalidation/$(am__dirstamp) + @rm -f schemavalidation/schemavalidation$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(schemavalidation_schemavalidation_OBJECTS) $(schemavalidation_schemavalidation_LDADD) $(LIBS) +textreader/$(am__dirstamp): + @$(MKDIR_P) textreader + @: > textreader/$(am__dirstamp) +textreader/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) textreader/$(DEPDIR) + @: > textreader/$(DEPDIR)/$(am__dirstamp) +textreader/main.$(OBJEXT): textreader/$(am__dirstamp) \ + textreader/$(DEPDIR)/$(am__dirstamp) +textreader/textreader$(EXEEXT): $(textreader_textreader_OBJECTS) $(textreader_textreader_DEPENDENCIES) $(EXTRA_textreader_textreader_DEPENDENCIES) textreader/$(am__dirstamp) + @rm -f textreader/textreader$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(textreader_textreader_OBJECTS) $(textreader_textreader_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f dom_build/main.$(OBJEXT) + -rm -f dom_parse_entities/main.$(OBJEXT) + -rm -f dom_parser/main.$(OBJEXT) + -rm -f dom_parser_raw/main.$(OBJEXT) + -rm -f dom_read_write/main.$(OBJEXT) + -rm -f dom_xpath/main.$(OBJEXT) + -rm -f dtdvalidation/main.$(OBJEXT) + -rm -f import_node/main.$(OBJEXT) + -rm -f sax_exception/main.$(OBJEXT) + -rm -f sax_exception/myparser.$(OBJEXT) + -rm -f sax_parser/main.$(OBJEXT) + -rm -f sax_parser/myparser.$(OBJEXT) + -rm -f sax_parser_build_dom/main.$(OBJEXT) + -rm -f sax_parser_build_dom/svgdocument.$(OBJEXT) + -rm -f sax_parser_build_dom/svgelement.$(OBJEXT) + -rm -f sax_parser_build_dom/svgparser.$(OBJEXT) + -rm -f sax_parser_entities/main.$(OBJEXT) + -rm -f sax_parser_entities/myparser.$(OBJEXT) + -rm -f schemavalidation/main.$(OBJEXT) + -rm -f textreader/main.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@dom_build/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dom_parse_entities/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dom_parser/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dom_parser_raw/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dom_read_write/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dom_xpath/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@dtdvalidation/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@import_node/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_exception/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_exception/$(DEPDIR)/myparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser/$(DEPDIR)/myparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_build_dom/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_build_dom/$(DEPDIR)/svgdocument.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_build_dom/$(DEPDIR)/svgelement.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_build_dom/$(DEPDIR)/svgparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_entities/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@sax_parser_entities/$(DEPDIR)/myparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@schemavalidation/$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@textreader/$(DEPDIR)/main.Po@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + -rm -rf dom_build/.libs dom_build/_libs + -rm -rf dom_parse_entities/.libs dom_parse_entities/_libs + -rm -rf dom_parser/.libs dom_parser/_libs + -rm -rf dom_parser_raw/.libs dom_parser_raw/_libs + -rm -rf dom_read_write/.libs dom_read_write/_libs + -rm -rf dom_xpath/.libs dom_xpath/_libs + -rm -rf dtdvalidation/.libs dtdvalidation/_libs + -rm -rf import_node/.libs import_node/_libs + -rm -rf sax_exception/.libs sax_exception/_libs + -rm -rf sax_parser/.libs sax_parser/_libs + -rm -rf sax_parser_build_dom/.libs sax_parser_build_dom/_libs + -rm -rf sax_parser_entities/.libs sax_parser_entities/_libs + -rm -rf schemavalidation/.libs schemavalidation/_libs + -rm -rf textreader/.libs textreader/_libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile $(DATA) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f dom_build/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_build/$(am__dirstamp) + -rm -f dom_parse_entities/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_parse_entities/$(am__dirstamp) + -rm -f dom_parser/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_parser/$(am__dirstamp) + -rm -f dom_parser_raw/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_parser_raw/$(am__dirstamp) + -rm -f dom_read_write/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_read_write/$(am__dirstamp) + -rm -f dom_xpath/$(DEPDIR)/$(am__dirstamp) + -rm -f dom_xpath/$(am__dirstamp) + -rm -f dtdvalidation/$(DEPDIR)/$(am__dirstamp) + -rm -f dtdvalidation/$(am__dirstamp) + -rm -f import_node/$(DEPDIR)/$(am__dirstamp) + -rm -f import_node/$(am__dirstamp) + -rm -f sax_exception/$(DEPDIR)/$(am__dirstamp) + -rm -f sax_exception/$(am__dirstamp) + -rm -f sax_parser/$(DEPDIR)/$(am__dirstamp) + -rm -f sax_parser/$(am__dirstamp) + -rm -f sax_parser_build_dom/$(DEPDIR)/$(am__dirstamp) + -rm -f sax_parser_build_dom/$(am__dirstamp) + -rm -f sax_parser_entities/$(DEPDIR)/$(am__dirstamp) + -rm -f sax_parser_entities/$(am__dirstamp) + -rm -f schemavalidation/$(DEPDIR)/$(am__dirstamp) + -rm -f schemavalidation/$(am__dirstamp) + -rm -f textreader/$(DEPDIR)/$(am__dirstamp) + -rm -f textreader/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf dom_build/$(DEPDIR) dom_parse_entities/$(DEPDIR) dom_parser/$(DEPDIR) dom_parser_raw/$(DEPDIR) dom_read_write/$(DEPDIR) dom_xpath/$(DEPDIR) dtdvalidation/$(DEPDIR) import_node/$(DEPDIR) sax_exception/$(DEPDIR) sax_parser/$(DEPDIR) sax_parser_build_dom/$(DEPDIR) sax_parser_entities/$(DEPDIR) schemavalidation/$(DEPDIR) textreader/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf dom_build/$(DEPDIR) dom_parse_entities/$(DEPDIR) dom_parser/$(DEPDIR) dom_parser_raw/$(DEPDIR) dom_read_write/$(DEPDIR) dom_xpath/$(DEPDIR) dtdvalidation/$(DEPDIR) import_node/$(DEPDIR) sax_exception/$(DEPDIR) sax_parser/$(DEPDIR) sax_parser_build_dom/$(DEPDIR) sax_parser_entities/$(DEPDIR) schemavalidation/$(DEPDIR) textreader/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am + + +# Build the shell scripts that call the example programs. +# +# Some programs can find their input file(s) only if the current directory, +# when they are executed, is the program's own source directory. +# To make these program invocations as consistent as possible, and to avoid +# having to specify parameters for the programs, most programs are executed +# from their own source directory. + +# dom_read_write shall write its output file in the build directory, +# which may or may not be the same as the source directory. +# Here it's necessary to specify parameters when the input file and the output +# file are located in different directories. +dom_read_write/make-check-sh: Makefile + echo '# Generated and used by "make check"' >$@ + echo 'dom_read_write/dom_read_write "$(srcdir)/dom_read_write/example.xml" dom_read_write/example_output.xml >/dev/null' >>$@ + chmod +x $@ + +# All other script files are generated like so: +$(standard_scripts): Makefile + echo '# Generated and used by "make check"' >$@ + echo '$(subst ,$(subst /make-check-sh,,$@),$(script_template))' >>$@ + chmod +x $@ + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/examples/dom_build/main.cc b/examples/dom_build/main.cc index 367620e..63f9ec7 100644 --- a/examples/dom_build/main.cc +++ b/examples/dom_build/main.cc @@ -25,6 +25,7 @@ #include #include +#include int main(int /* argc */, char** /* argv */) @@ -72,9 +73,10 @@ main(int /* argc */, char** /* argv */) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/dom_parse_entities/main.cc b/examples/dom_parse_entities/main.cc index 9f67a59..1525f51 100644 --- a/examples/dom_parse_entities/main.cc +++ b/examples/dom_parse_entities/main.cc @@ -24,8 +24,8 @@ #endif #include - #include +#include void print_node(const xmlpp::Node* node, bool substitute_entities, unsigned int indentation = 0) { @@ -78,6 +78,7 @@ int main(int argc, char* argv[]) filepath = "example.xml"; // Parse first without, then with, entity substitution. + int return_code = EXIT_SUCCESS; bool substitute_entities = false; while (true) { @@ -101,7 +102,8 @@ int main(int argc, char* argv[]) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return_code = EXIT_FAILURE; } if (substitute_entities) break; @@ -109,6 +111,6 @@ int main(int argc, char* argv[]) substitute_entities = true; } - return 0; + return return_code; } diff --git a/examples/dom_parser/main.cc b/examples/dom_parser/main.cc index 54785f3..40cb9b6 100644 --- a/examples/dom_parser/main.cc +++ b/examples/dom_parser/main.cc @@ -24,8 +24,8 @@ #endif #include - #include +#include void print_node(const xmlpp::Node* node, unsigned int indentation = 0) { @@ -142,7 +142,7 @@ int main(int argc, char* argv[]) << " -t Throw messages in an exception" << std::endl << " -e Write messages to stderr" << std::endl << " -E Do not substitute entities" << std::endl; - return 1; + return EXIT_FAILURE; } argi++; } @@ -171,9 +171,10 @@ int main(int argc, char* argv[]) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/dom_parser_raw/example_invalid.xml b/examples/dom_parser_raw/example_invalid.xml new file mode 100644 index 0000000..ac42269 --- /dev/null +++ b/examples/dom_parser_raw/example_invalid.xml @@ -0,0 +1,16 @@ + + +]> + + + + Some content. "Some quoted content." + + + + Some content. &wwwmurrayc; + + + + diff --git a/examples/dom_parser_raw/main.cc b/examples/dom_parser_raw/main.cc index 0db852f..77d783b 100644 --- a/examples/dom_parser_raw/main.cc +++ b/examples/dom_parser_raw/main.cc @@ -24,7 +24,7 @@ #include #include #include - +#include void print_node(const xmlpp::Node* node, unsigned int indentation = 0) { @@ -109,9 +109,10 @@ int main(int argc, char* argv[]) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/dom_read_write/main.cc b/examples/dom_read_write/main.cc index 0ac5628..bf7f3fe 100644 --- a/examples/dom_read_write/main.cc +++ b/examples/dom_read_write/main.cc @@ -24,9 +24,8 @@ #endif #include - #include - +#include int main(int argc, char* argv[]) @@ -62,9 +61,10 @@ main(int argc, char* argv[]) } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/dom_xpath/example.xml b/examples/dom_xpath/example.xml index 7e10580..6dfa280 100644 --- a/examples/dom_xpath/example.xml +++ b/examples/dom_xpath/example.xml @@ -11,8 +11,9 @@ Another section
    A sub-section - This paragraph refers to , - , and . + This paragraph refers to 3 sections: + , , and + .
    - \ No newline at end of file + diff --git a/examples/dom_xpath/main.cc b/examples/dom_xpath/main.cc index f8722e0..d2c2d8e 100644 --- a/examples/dom_xpath/main.cc +++ b/examples/dom_xpath/main.cc @@ -24,24 +24,83 @@ #endif #include - +#include #include +Glib::ustring result_type_to_ustring(xmlpp::XPathResultType result_type) +{ + switch (result_type) + { + case xmlpp::XPATH_RESULT_NODESET: return "nodeset"; + case xmlpp::XPATH_RESULT_BOOLEAN: return "boolean"; + case xmlpp::XPATH_RESULT_NUMBER: return "number"; + case xmlpp::XPATH_RESULT_STRING: return "string"; + + case xmlpp::XPATH_RESULT_UNDEFINED: + default: + return "undefined"; + } +} -void xpath_test(const xmlpp::Node* node, const Glib::ustring& xpath) +bool xpath_test(const xmlpp::Node* node, const Glib::ustring& xpath) { + bool result = true; std::cout << std::endl; //Separate tests by an empty line. std::cout << "searching with xpath '" << xpath << "' in root node: " << std::endl; - xmlpp::NodeSet set = node->find(xpath); - - std::cout << set.size() << " nodes have been found:" << std::endl; + try + { + xmlpp::NodeSet set = node->find(xpath); + + std::cout << set.size() << " nodes have been found:" << std::endl; + + //Print the structural paths and the values: + for(xmlpp::NodeSet::iterator i = set.begin(); i != set.end(); ++i) + { + std::cout << " " << (*i)->get_path(); + + xmlpp::Attribute* attribute = dynamic_cast(*i); + if (attribute) + std::cout << ", value=\"" << attribute->get_value() << "\""; - //Print the structural paths: - for(xmlpp::NodeSet::iterator i = set.begin(); i != set.end(); ++i) + xmlpp::ContentNode* content_node = dynamic_cast(*i); + if (content_node) + std::cout << ", content=\"" << content_node->get_content() << "\""; + + xmlpp::EntityReference* entity_reference = dynamic_cast(*i); + if (entity_reference) + std::cout << ", text=\"" << entity_reference->get_original_text() << "\""; + + xmlpp::Element* element = dynamic_cast(*i); + if (element) + { + xmlpp::TextNode* text_node = element->get_child_text(); + if (text_node) + std::cout << ", child_text=\"" << text_node->get_content() << "\""; + } + std::cout << std::endl; + } + } + catch (const xmlpp::exception& ex) + { + std::cerr << "Exception caught from find: " << ex.what() << std::endl; + result = false; + } + + try { - std::cout << " " << (*i)->get_path() << std::endl; + xmlpp::XPathResultType result_type; + std::cout << "Boolean=" << (node->eval_to_boolean(xpath) ? "true" : "false") + << ", Number=" << node->eval_to_number(xpath, &result_type) + << ", String=\"" << node->eval_to_string(xpath) << "\""; + std::cout << ", Result_type=" << result_type_to_ustring(result_type) << std::endl; } + catch (const xmlpp::exception& ex) + { + std::cerr << "Exception caught from eval: " << ex.what() << std::endl; + result = false; + } + return result; } int main(int argc, char* argv[]) @@ -51,11 +110,12 @@ int main(int argc, char* argv[]) std::locale::global(std::locale("")); std::string filepath; - if(argc > 1 ) + if (argc > 1) filepath = argv[1]; //Allow the user to specify a different XML file to parse. else filepath = "example.xml"; + bool result = true; try { xmlpp::DomParser parser(filepath); @@ -66,10 +126,23 @@ int main(int argc, char* argv[]) if(root) { // Find all sections, no matter where: - xpath_test(root, "//section"); + result &= xpath_test(root, "//section"); // Find the title node (if there is one): - xpath_test(root, "title"); + result &= xpath_test(root, "title"); + + // Find all literal text, in any paragraph: + result &= xpath_test(root, "//para/literal"); + + // Evaluate some XPath expressions with result types other than nodeset: + // These tests shall fail. + std::cerr << "Expecting 3 exceptions" << std::endl; + result &= !xpath_test(root, "boolean(//para/literal)"); + result &= !xpath_test(root, "number(//para/literal)+2"); + result &= !xpath_test(root, "concat(string(title),\" !\")"); + + // Don't find anything: + result &= xpath_test(root, "/wont_find"); std::cout << std::endl; @@ -82,15 +155,16 @@ int main(int argc, char* argv[]) std::cout << "searching for unresolved internal references " << "(see docbook manual):" << std::endl; - xpath_test(root, "//xref/@linkend"); + result &= xpath_test(root, "//@id"); + result &= xpath_test(root, "//xref/@linkend"); } } } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + result = false; } - return 0; + return result ? EXIT_SUCCESS : EXIT_FAILURE; } - diff --git a/examples/dtdvalidation/main.cc b/examples/dtdvalidation/main.cc index 84b0511..b235b14 100644 --- a/examples/dtdvalidation/main.cc +++ b/examples/dtdvalidation/main.cc @@ -25,8 +25,8 @@ #endif #include - #include +#include int main(int argc, char* argv[]) { @@ -40,6 +40,7 @@ int main(int argc, char* argv[]) else dtdfilepath = "example.dtd"; + int return_code = EXIT_SUCCESS; xmlpp::Document document; /* xmlpp::Element* nodeRoot = */document.create_root_node("incorrect"); @@ -49,12 +50,13 @@ int main(int argc, char* argv[]) try { - validator.validate( &document ); - std::cout << "Validation successful" << std::endl; + validator.validate( &document ); // Shall fail + std::cerr << "Validation successful (not expected)" << std::endl; + return_code = EXIT_FAILURE; } catch( const xmlpp::validity_error& ) { - std::cout << "Error validating the document" << std::endl; + std::cout << "Error validating the document (expected)" << std::endl; } /* xmlpp::Element* nodeRoot2 = */document.create_root_node("example"); @@ -70,12 +72,15 @@ int main(int argc, char* argv[]) } catch( const xmlpp::validity_error& ) { - std::cout << "Error validating the document" << std::endl; + std::cerr << "Error validating the document" << std::endl; + return_code = EXIT_FAILURE; } } catch( const xmlpp::parse_error& ) { std::cerr << "Error parsing the dtd" << std::endl; + return_code = EXIT_FAILURE; } + return return_code; } diff --git a/examples/import_node/example1.xml b/examples/import_node/example1.xml index d8ead55..febf49d 100644 --- a/examples/import_node/example1.xml +++ b/examples/import_node/example1.xml @@ -1,6 +1,6 @@ - -content + +content more content even more content diff --git a/examples/import_node/example2.xml b/examples/import_node/example2.xml index c4f030b..adf538b 100644 --- a/examples/import_node/example2.xml +++ b/examples/import_node/example2.xml @@ -1,5 +1,5 @@ - + added content from other document grand child content diff --git a/examples/import_node/main.cc b/examples/import_node/main.cc index 22abfb4..8c210d4 100644 --- a/examples/import_node/main.cc +++ b/examples/import_node/main.cc @@ -18,27 +18,49 @@ int main (int /* argc */, char** /* argv */) DomParser example1("example1.xml"); DomParser example2("example2.xml"); - Document *doc1 = example1.get_document(); - Document *doc2 = example2.get_document(); + Document* doc1 = example1.get_document(); + Document* doc2 = example2.get_document(); - Element *root1 = doc1->get_root_node(); - Element *root2 = doc2->get_root_node(); + Element* root1 = doc1->get_root_node(); + Element* root2 = doc2->get_root_node(); // find the first "child" element in example2 - Node::NodeList child_list = root2->get_children("child"); - Node *node_to_add = child_list.front(); + Node::NodeList child_list2 = root2->get_children("child"); + Node* node_to_add = child_list2.front(); // import the node under the root element (recursive is default) root1->import_node(node_to_add); + + // Import an attribute that will replace an existing attribute in the root element. + Attribute* attribute_to_add = root2->get_attribute("name"); + root1->import_node(attribute_to_add); + + // Import an attribute that will be added to the root element. + attribute_to_add = root2->get_attribute("type"); + root1->import_node(attribute_to_add); + // Find the first text child of the first "child" element in example2. + Element* first_child2 = dynamic_cast(child_list2.front()); + if (!first_child2) + { + cerr << "first_child2 == 0" << endl; + return EXIT_FAILURE; + } + TextNode* text_to_add = first_child2->get_child_text(); + + // Import the text under the first "child" element in example1. + // Adjacent text nodes are merged. + Node* first_child1 = root1->get_first_child("child"); + first_child1->import_node(text_to_add); + // print out the new doc1 string doc1_string = doc1->write_to_string_formatted(); cout << doc1_string; - return EXIT_SUCCESS; } catch (std::exception& ex) { cerr << "Caught exception " << ex.what() << endl; return EXIT_FAILURE; } + return EXIT_SUCCESS; } diff --git a/examples/sax_exception/main.cc b/examples/sax_exception/main.cc index e64610a..f5b2c57 100644 --- a/examples/sax_exception/main.cc +++ b/examples/sax_exception/main.cc @@ -29,6 +29,7 @@ #include "myparser.h" #include +#include int main(int /* argc */, char** /* argv */) { @@ -42,11 +43,18 @@ int main(int /* argc */, char** /* argv */) { parser.parse_file("example.xml"); } + catch(const MyException& ex) + { + std::cout << "Exception caught (expected): " << ex.what() << std::endl; + return EXIT_SUCCESS; + } catch(const std::exception& ex) { - std::cout << "Exception caught: " << ex.what() << std::endl; + std::cerr << "Exception caught: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + std::cerr << "No exception caught" << std::endl; + return EXIT_FAILURE; } diff --git a/examples/sax_parser/main.cc b/examples/sax_parser/main.cc index bf1c088..ffe82e6 100644 --- a/examples/sax_parser/main.cc +++ b/examples/sax_parser/main.cc @@ -25,6 +25,7 @@ #include #include +#include #include "myparser.h" @@ -42,6 +43,7 @@ main(int argc, char* argv[]) filepath = "example.xml"; // Parse the entire document in one go: + int return_code = EXIT_SUCCESS; try { MySaxParser parser; @@ -50,7 +52,8 @@ main(int argc, char* argv[]) } catch(const xmlpp::exception& ex) { - std::cout << "libxml++ exception: " << ex.what() << std::endl; + std::cerr << "libxml++ exception: " << ex.what() << std::endl; + return_code = EXIT_FAILURE; } @@ -84,7 +87,6 @@ main(int argc, char* argv[]) */ } - - return 0; + return return_code; } diff --git a/examples/sax_parser_build_dom/main.cc b/examples/sax_parser_build_dom/main.cc index c2f019d..a033c87 100644 --- a/examples/sax_parser_build_dom/main.cc +++ b/examples/sax_parser_build_dom/main.cc @@ -27,6 +27,7 @@ #include #include +#include #include "svgparser.h" #include "svgdocument.h" @@ -70,9 +71,10 @@ main(int argc, char* argv[]) } catch(const xmlpp::exception& ex) { - std::cout << "libxml++ exception: " << ex.what() << std::endl; + std::cerr << "libxml++ exception: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/sax_parser_entities/main.cc b/examples/sax_parser_entities/main.cc index 7075fce..1466c8d 100644 --- a/examples/sax_parser_entities/main.cc +++ b/examples/sax_parser_entities/main.cc @@ -25,6 +25,7 @@ #include #include +#include #include "myparser.h" @@ -49,9 +50,10 @@ main(int argc, char* argv[]) } catch(const xmlpp::exception& ex) { - std::cout << "libxml++ exception: " << ex.what() << std::endl; + std::cerr << "libxml++ exception: " << ex.what() << std::endl; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } diff --git a/examples/schemavalidation/main.cc b/examples/schemavalidation/main.cc index 2206660..1c5d38a 100644 --- a/examples/schemavalidation/main.cc +++ b/examples/schemavalidation/main.cc @@ -25,9 +25,8 @@ #endif #include - #include - +#include int main(int argc, char* argv[]) { @@ -39,35 +38,39 @@ int main(int argc, char* argv[]) docfilepath("example.xml"); if(argc!=1 && argc!=3) + { std::cout << "usage : " << argv[0] << " [document schema]" << std::endl; - else + return EXIT_FAILURE; + } + + if(argc == 3) { - if(argc == 3) - { - docfilepath = argv[1]; - schemafilepath = argv[2]; - } + docfilepath = argv[1]; + schemafilepath = argv[2]; + } + + try + { + xmlpp::DomParser parser(docfilepath); + xmlpp::SchemaValidator validator(schemafilepath); try { - xmlpp::DomParser parser(docfilepath); - xmlpp::SchemaValidator validator(schemafilepath); - - try - { - validator.validate( parser.get_document() ); - std::cout << "Valid document" << std::endl; - } - catch( const xmlpp::validity_error& error) - { - std::cout << "Error validating the document" << std::endl; - std::cout << error.what(); - } + validator.validate( parser.get_document() ); + std::cout << "Valid document" << std::endl; } - catch( const xmlpp::parse_error& ) + catch( const xmlpp::validity_error& error) { - std::cerr << "Error parsing the schema" << std::endl; + std::cerr << "Error validating the document" << std::endl; + std::cerr << error.what(); + return EXIT_FAILURE; } } + catch( const xmlpp::parse_error& error) + { + std::cerr << "Error parsing the schema: " << error.what() << std::endl; + return EXIT_FAILURE; + } + return EXIT_SUCCESS; } diff --git a/examples/textreader/main.cc b/examples/textreader/main.cc index a6957e7..5b97f32 100644 --- a/examples/textreader/main.cc +++ b/examples/textreader/main.cc @@ -27,6 +27,7 @@ #include #include +#include struct indent { int depth_; @@ -83,7 +84,9 @@ int main(int /* argc */, char** /* argv */) } catch(const std::exception& e) { - std::cout << "Exception caught: " << e.what() << std::endl; + std::cerr << "Exception caught: " << e.what() << std::endl; + return EXIT_FAILURE; } + return EXIT_SUCCESS; } diff --git a/libxml++/nodes/node.cc b/libxml++/nodes/node.cc index 9555e9d..8f2344a 100644 --- a/libxml++/nodes/node.cc +++ b/libxml++/nodes/node.cc @@ -22,6 +22,93 @@ #include +namespace // anonymous +{ +// Common part of xmlpp::Node::eval_to_[boolean|number|string] +xmlXPathObject* eval_common(const Glib::ustring& xpath, + const xmlpp::Node::PrefixNsMap* namespaces, + xmlpp::XPathResultType* result_type, xmlNode* node) +{ + xmlXPathContext* ctxt = xmlXPathNewContext(node->doc); + ctxt->node = node; + + if (namespaces) + { + for (xmlpp::Node::PrefixNsMap::const_iterator it = namespaces->begin(); + it != namespaces->end(); ++it) + xmlXPathRegisterNs(ctxt, + reinterpret_cast(it->first.c_str()), + reinterpret_cast(it->second.c_str())); + } + + xmlXPathObject* xpath_value = xmlXPathEvalExpression( + reinterpret_cast(xpath.c_str()), ctxt); + + xmlXPathFreeContext(ctxt); + + if (!xpath_value) + { + if (result_type) + *result_type = xmlpp::XPATH_RESULT_UNDEFINED; + + throw xmlpp::exception("Invalid XPath: " + xpath); + } + + if (result_type) + { + if (xpath_value->type == XPATH_NODESET || + xpath_value->type == XPATH_BOOLEAN || + xpath_value->type == XPATH_NUMBER || + xpath_value->type == XPATH_STRING) + *result_type = static_cast(xpath_value->type); + else + *result_type = xmlpp::XPATH_RESULT_UNDEFINED; + } + + return xpath_value; +} + +// Common part of all overloaded xmlpp::Node::eval_to_boolean() methods. +bool eval_common_to_boolean(const Glib::ustring& xpath, + const xmlpp::Node::PrefixNsMap* namespaces, + xmlpp::XPathResultType* result_type, xmlNode* node) +{ + xmlXPathObject* xpath_value = eval_common(xpath, namespaces, result_type, node); + const int result = xmlXPathCastToBoolean(xpath_value); + xmlXPathFreeObject(xpath_value); + return static_cast(result); +} + +// Common part of all overloaded xmlpp::Node::eval_to_number() methods. +double eval_common_to_number(const Glib::ustring& xpath, + const xmlpp::Node::PrefixNsMap* namespaces, + xmlpp::XPathResultType* result_type, xmlNode* node) +{ + xmlXPathObject* xpath_value = eval_common(xpath, namespaces, result_type, node); + const double result = xmlXPathCastToNumber(xpath_value); + xmlXPathFreeObject(xpath_value); + return result; +} + +// Common part of all overloaded xmlpp::Node::eval_to_string() methods. +Glib::ustring eval_common_to_string(const Glib::ustring& xpath, + const xmlpp::Node::PrefixNsMap* namespaces, + xmlpp::XPathResultType* result_type, xmlNode* node) +{ + xmlXPathObject* xpath_value = eval_common(xpath, namespaces, result_type, node); + xmlChar* result = xmlXPathCastToString(xpath_value); + xmlXPathFreeObject(xpath_value); + if (result) + { + const Glib::ustring uresult(reinterpret_cast(result)); + xmlFree(result); + return uresult; + } + return Glib::ustring(); +} + +} // anonymous namespace + namespace xmlpp { @@ -231,8 +318,22 @@ Node* Node::import_node(const Node* node, bool recursive) throw exception("Unable to import node"); } + if (imported_node->type == XML_ATTRIBUTE_NODE && impl_->type == XML_ELEMENT_NODE) + { + xmlAttr* old_attr = xmlHasNsProp(impl_, imported_node->name, + imported_node->ns ? imported_node->ns->href : 0); + if (old_attr && old_attr->type != XML_ATTRIBUTE_DECL) + { + // *this has an attribute with the same name as the imported attribute. + // xmlAddChild() will delete the existing attribute. + // Delete the C++ wrapper before the call to xmlAddChild(). + Node::free_wrappers(reinterpret_cast(old_attr)); + } + } + //Add the node: - xmlNode* added_node = xmlAddChild(this->cobj(),imported_node); + xmlNode* added_node = xmlAddChild(this->cobj(), imported_node); + if (!added_node) { Node::free_wrappers(imported_node); @@ -241,8 +342,11 @@ Node* Node::import_node(const Node* node, bool recursive) throw exception("Unable to add imported node to current node"); } - Node::create_wrapper(imported_node); - return static_cast(imported_node->_private); + // Usually added_node == imported_node, but a text node is merged with an + // adjacent text node. In that case, xmlAddChild() frees imported_node, and + // added_node is a pointer to the old text node. + Node::create_wrapper(added_node); + return static_cast(added_node->_private); } Glib::ustring Node::get_name() const @@ -307,6 +411,12 @@ static NodeSet find_impl(xmlXPathContext* ctxt, const Glib::ustring& xpath) for (int i = 0; i != count; ++i) { xmlNode* cnode = xmlXPathNodeSetItem(nodeset, i); + if(!cnode) + { + std::cerr << "Node::find_impl: The xmlNode was null." << std::endl; + continue; + } + if(cnode->type == XML_NAMESPACE_DECL) { //In this case we would cast it to a xmlNs*, @@ -356,6 +466,39 @@ NodeSet Node::find(const Glib::ustring& xpath, return find_impl(ctxt, xpath); } +bool Node::eval_to_boolean(const Glib::ustring& xpath, XPathResultType* result_type) const +{ + return eval_common_to_boolean(xpath, 0, result_type, impl_); +} + +bool Node::eval_to_boolean(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type) const +{ + return eval_common_to_boolean(xpath, &namespaces, result_type, impl_); +} + +double Node::eval_to_number(const Glib::ustring& xpath, XPathResultType* result_type) const +{ + return eval_common_to_number(xpath, 0, result_type, impl_); +} + +double Node::eval_to_number(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type) const +{ + return eval_common_to_number(xpath, &namespaces, result_type, impl_); +} + +Glib::ustring Node::eval_to_string(const Glib::ustring& xpath, XPathResultType* result_type) const +{ + return eval_common_to_string(xpath, 0, result_type, impl_); +} + +Glib::ustring Node::eval_to_string(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type) const +{ + return eval_common_to_string(xpath, &namespaces, result_type, impl_); +} + Glib::ustring Node::get_namespace_prefix() const { if(impl_->type == XML_DOCUMENT_NODE || impl_->type == XML_ENTITY_DECL) diff --git a/libxml++/nodes/node.h b/libxml++/nodes/node.h index 06d2753..b54fdb3 100644 --- a/libxml++/nodes/node.h +++ b/libxml++/nodes/node.h @@ -30,6 +30,23 @@ class Attribute; class Node; typedef std::vector NodeSet; +// xmlpp::XPathResultType is similar to xmlXPathObjectType in libxml2. +/** An XPath expression is evaluated to yield a result, which + * has one of the following four basic types: + * - node-set + * - boolean + * - number + * - string + */ +enum XPathResultType +{ + XPATH_RESULT_UNDEFINED = 0, + XPATH_RESULT_NODESET = 1, + XPATH_RESULT_BOOLEAN = 2, + XPATH_RESULT_NUMBER = 3, + XPATH_RESULT_STRING = 4 +}; + /** Represents XML Nodes. * You should never new or delete Nodes. The Parser will create and manage them for you. */ @@ -111,13 +128,13 @@ public: Node* get_first_child(const Glib::ustring& name = Glib::ustring()); /** Obtain the list of child nodes. You may optionally obtain a list of only the child nodes which have a certain name. - * @param name The names of the child nodes to get. If you do not specigy a name, then the list will contain all nodes, regardless of their names. + * @param name The names of the child nodes to get. If you do not specify a name, then the list will contain all nodes, regardless of their names. * @returns The list of child nodes. */ NodeList get_children(const Glib::ustring& name = Glib::ustring()); /** Obtain the list of child nodes. You may optionally obtain a list of only the child nodes which have a certain name. - * @param name The names of the child nodes to get. If you do not specigy a name, then the list will contain all nodes, regardless of their names. + * @param name The names of the child nodes to get. If you do not specify a name, then the list will contain all nodes, regardless of their names. * @returns The list of child nodes. */ const NodeList get_children(const Glib::ustring& name = Glib::ustring()) const; @@ -163,9 +180,16 @@ public: void remove_child(Node* node); /** Import node(s) from another document under this node, without affecting the source node. + * + * If the imported node is an attribute node, and this node has an attribute with + * the same name as the imported attribute, the existing attribute is destroyed + * before the imported attribute is added. Any pointer to a destroyed attribute + * node becomes invalid. + * * @param node The node to copy and insert under the current node. * @param recursive Whether to import the child nodes also. Defaults to true. - * @returns The newly-created node. + * @returns Usually the newly created node, but adjacent text nodes are merged, + * and the old text node with merged contents is returned. * @throws exception */ Node* import_node(const Node* node, bool recursive = true); @@ -176,7 +200,7 @@ public: */ Glib::ustring get_path() const; - /** Find nodes from a XPath expression. + /** Find nodes from an XPath expression. * @param xpath The XPath of the nodes. * @throws exception */ @@ -186,13 +210,91 @@ public: */ typedef std::map PrefixNsMap; - /** Find nodes from a XPath expression. + /** Find nodes from an XPath expression. * @param xpath The XPath of the nodes. * @param namespaces A map of namespace prefixes to namespace URIs to be used while finding. * @throws exception */ NodeSet find(const Glib::ustring& xpath, const PrefixNsMap& namespaces) const; + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param[out] result_type Result type of the XPath expression before conversion + * to boolean. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type boolean, + * it is converted to boolean. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + bool eval_to_boolean(const Glib::ustring& xpath, XPathResultType* result_type = 0) const; + + + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param namespaces A map of namespace prefixes to namespace URIs to be used while evaluating. + * @param[out] result_type Result type of the XPath expression before conversion + * to boolean. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type boolean, + * it is converted to boolean. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + bool eval_to_boolean(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type = 0) const; + + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param[out] result_type Result type of the XPath expression before conversion + * to number. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type number, + * it is converted to number. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + double eval_to_number(const Glib::ustring& xpath, XPathResultType* result_type = 0) const; + + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param namespaces A map of namespace prefixes to namespace URIs to be used while evaluating. + * @param[out] result_type Result type of the XPath expression before conversion + * to number. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type number, + * it is converted to number. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + double eval_to_number(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type = 0) const; + + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param[out] result_type Result type of the XPath expression before conversion + * to string. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type string, + * it is converted to string. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + Glib::ustring eval_to_string(const Glib::ustring& xpath, XPathResultType* result_type = 0) const; + + /** Evaluate an XPath expression. + * @param xpath The XPath expression. + * @param namespaces A map of namespace prefixes to namespace URIs to be used while evaluating. + * @param[out] result_type Result type of the XPath expression before conversion + * to string. If 0, the result type is not returned. + * @returns The value of the XPath expression. If the value is not of type string, + * it is converted to string. + * @throws xmlpp::exception If the XPath expression cannot be evaluated. + * + * @newin{2,36} + */ + Glib::ustring eval_to_string(const Glib::ustring& xpath, const PrefixNsMap& namespaces, + XPathResultType* result_type = 0) const; ///Access the underlying libxml implementation. _xmlNode* cobj(); @@ -204,7 +306,7 @@ public: * * This is only for use by the libxml++ implementation. * - * @para node A pointer to an xmlNode or a "derived" struct, such as xmlDoc, xmlAttr, etc. + * @param node A pointer to an xmlNode or a "derived" struct, such as xmlDoc, xmlAttr, etc. */ static void create_wrapper(_xmlNode* node); @@ -212,9 +314,9 @@ public: * recursively destroy the C++ instances for any children. * * This is only for use by the libxml++ implementation. - * @para node A pointer to an xmlNode or a "derived" struct, such as xmlDoc, xmlAttr, etc. + * @param node A pointer to an xmlNode or a "derived" struct, such as xmlDoc, xmlAttr, etc. */ - static void free_wrappers(_xmlNode* attr); + static void free_wrappers(_xmlNode* node); protected: diff --git a/macros/config.guess b/macros/config.guess index d622a44..49ba16f 100755 --- a/macros/config.guess +++ b/macros/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,7 +17,9 @@ timestamp='2012-02-10' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -861,13 +863,6 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -1325,9 +1320,6 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/macros/config.sub b/macros/config.sub index c894da4..d6b6b3c 100755 --- a/macros/config.sub +++ b/macros/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,7 +21,9 @@ timestamp='2012-02-10' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -130,10 +132,6 @@ case $maybe_os in os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -249,7 +247,6 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ - | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -322,7 +319,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -335,10 +332,7 @@ case $basic_machine in strongarm | thumb | xscale) basic_machine=arm-unknown ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; + xscaleeb) basic_machine=armeb-unknown ;; @@ -361,7 +355,6 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ - | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/macros/libtool.m4 b/macros/libtool.m4 index 828104c..39ba996 100644 --- a/macros/libtool.m4 +++ b/macros/libtool.m4 @@ -1,8 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +10,7 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -39,7 +37,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 57 LT_INIT +# serial 56 LT_INIT # LT_PREREQ(VERSION) @@ -68,7 +66,6 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -85,8 +82,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -123,7 +118,7 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ]) @@ -143,11 +138,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -170,13 +160,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -192,6 +179,7 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -205,6 +193,23 @@ aix3*) ;; esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + # Global variables: ofile=libtool can_build_shared=yes @@ -245,28 +250,6 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -425,7 +408,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -435,7 +418,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -534,20 +517,12 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -558,9 +533,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -568,38 +543,16 @@ for var in lt_decl_all_varnames([[ \ esac done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\[$]0 --fallback-echo"')dnl " + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` + ;; +esac + _LT_OUTPUT_LIBTOOL_INIT ]) -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -609,11 +562,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. -cat >>"$CONFIG_LT" <<\_LTEOF lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE + +exec AS_MESSAGE_FD>&1 exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -639,7 +601,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -684,13 +646,15 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec AS_MESSAGE_LOG_FD>>config.log + $lt_cl_success || AS_EXIT(1) +fi ])# LT_OUTPUT @@ -753,12 +717,15 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_XSI_SHELLFNS - _LT_PROG_REPLACE_SHELLFNS + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -803,7 +770,6 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -825,31 +791,6 @@ m4_defun([_LT_LANG], ])# _LT_LANG -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -880,10 +821,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -894,13 +831,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -986,13 +921,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1000,7 +929,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1012,34 +940,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -1067,7 +967,7 @@ _LT_EOF else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test "$DSYMUTIL" != ":"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1077,8 +977,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1087,13 +987,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi + _LT_TAGVAR(whole_archive_flag_spec, $1)='' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -1101,7 +995,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1117,141 +1011,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], fi ]) -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_SHELL_INIT # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' +[_LT_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +ECHO=${lt_ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} fi -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +[$]* +_LT_EOF + exit 0 +fi -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(lt_ECHO) +]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], + [An echo program that does not interpret backslashes]) +])# _LT_PROG_ECHO_BACKSLASH - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1281,7 +1236,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1374,27 +1329,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1412,47 +1354,14 @@ need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR +[AC_CHECK_TOOL(AR, ar, false) +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1]) AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1471,27 +1380,18 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1516,15 +1416,15 @@ AC_CACHE_CHECK([$1], [$2], -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD 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. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1564,7 +1464,7 @@ AC_CACHE_CHECK([$1], [$2], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1627,11 +1527,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1657,11 +1552,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1701,8 +1591,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1753,7 +1643,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" +[#line __oline__ "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1794,13 +1684,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1809,11 +1693,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -1989,16 +1869,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -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:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2157,7 +2037,6 @@ m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2166,23 +2045,16 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2195,7 +2067,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2215,13 +2087,7 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2247,7 +2113,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2256,7 +2122,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2309,7 +2175,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2321,7 +2187,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -2340,9 +2206,8 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$cc_basename in - yes,*) - # gcc + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2363,83 +2228,36 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' ;; *) - # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' ;; esac + dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2460,7 +2278,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -2468,6 +2286,10 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2475,7 +2297,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[23]].*) objformat=aout ;; + freebsd[[123]]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2493,7 +2315,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2513,26 +2335,12 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - 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=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2578,14 +2386,12 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 ;; interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2601,7 +2407,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -2638,9 +2444,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +# This must be Linux ELF. +linux* | k*bsd*-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}' @@ -2648,21 +2454,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2671,7 +2472,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # 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' ' '` + 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;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -2684,18 +2485,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) 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 @@ -2715,7 +2504,7 @@ netbsd*) ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2784,7 +2573,7 @@ rdos*) ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2809,7 +2598,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -2833,7 +2622,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2864,7 +2653,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2874,7 +2663,7 @@ tpf*) ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -2916,8 +2705,6 @@ _LT_DECL([], [library_names_spec], [1], The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -3030,7 +2817,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -3152,11 +2938,6 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3165,8 +2946,8 @@ case $host_os in fi ;; esac -_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_TAGDECL([], [reload_cmds], [2])dnl +_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_DECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3218,18 +2999,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc*) +cegcc) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3259,10 +3038,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3271,11 +3046,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3296,12 +3071,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be Linux ELF. +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) 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 @@ -3375,21 +3150,6 @@ tpf*) ;; esac ]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - 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 @@ -3397,11 +3157,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + [Command to use when deplibs_check_method == "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3458,19 +3214,7 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3483,13 +3227,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3504,67 +3248,6 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - # LT_LIB_M # -------- @@ -3573,7 +3256,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3601,12 +3284,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3623,7 +3301,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3691,8 +3368,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3716,7 +3393,6 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3729,7 +3405,6 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3751,7 +3426,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3763,18 +3438,6 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - #ifdef __cplusplus extern "C" { #endif @@ -3786,7 +3449,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { +const struct { const char *name; void *address; } @@ -3812,15 +3475,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3853,13 +3516,6 @@ else AC_MSG_RESULT(ok) fi -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3870,8 +3526,6 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,6 +3537,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= +AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3933,11 +3588,6 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3987,12 +3637,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; dgux*) case $cc_basename in ec++*) @@ -4049,7 +3693,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4082,8 +3726,8 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene + xlc* | xlC*) + # IBM XL 8.0 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -4113,7 +3757,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4145,7 +3789,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4249,12 +3893,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -4297,15 +3935,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -4348,7 +3977,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4369,13 +3998,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4387,40 +4010,25 @@ m4_if([$1], [CXX], [ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; esac ;; @@ -4452,7 +4060,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + f77* | f90* | f95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4509,11 +4117,9 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) +AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the PIC flag actually works. @@ -4532,8 +4138,6 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4554,7 +4158,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4563,40 +4166,27 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4611,6 +4201,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4655,39 +4246,10 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4705,7 +4267,6 @@ dnl Note also adjust exclude_expsyms for C++ above. fi supports_anon_versioning=no case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4721,12 +4282,11 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.19, is reported +*** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. _LT_EOF fi @@ -4762,12 +4322,10 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4785,11 +4343,6 @@ _LT_EOF fi ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4805,7 +4358,7 @@ _LT_EOF _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4815,16 +4368,15 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag=' $pic_flag' + tmp_addflag= tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4835,17 +4387,13 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4861,16 +4409,17 @@ _LT_EOF fi case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) + xlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4879,13 +4428,13 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4903,8 +4452,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4950,8 +4499,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4991,10 +4540,8 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -5056,7 +4603,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5082,9 +4628,9 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5093,19 +4639,14 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -5137,64 +4678,20 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) @@ -5207,6 +4704,10 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5219,7 +4720,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5228,7 +4729,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5236,7 +4737,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -5251,13 +4752,14 @@ _LT_EOF ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5269,16 +4771,16 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -5290,14 +4792,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi @@ -5325,34 +4820,19 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE(int foo(void) {}, + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + ) + LDFLAGS="$save_LDFLAGS" else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5361,7 +4841,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5414,17 +4894,17 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5434,13 +4914,13 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5453,9 +4933,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5631,38 +5111,36 @@ 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. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ;; esac fi @@ -5699,6 +5177,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5724,6 +5205,8 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [fix_srcfile_path], [1], + [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5734,8 +5217,6 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5829,15 +5310,14 @@ CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl +# _LT_PROG_CXX +# ------------ +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +# compiler, we have our own version here. +m4_defun([_LT_PROG_CXX], +[ +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +AC_PROG_CXX if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then @@ -5845,6 +5325,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" && else _lt_caught_CXX_error=yes fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_CXX + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5856,6 +5352,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5865,8 +5362,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5898,7 +5393,6 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5916,7 +5410,6 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5938,8 +5431,8 @@ if test "$_lt_caught_CXX_error" != yes; then # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5971,7 +5464,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else GXX=no @@ -6080,10 +5573,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -6092,19 +5585,14 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -6134,75 +5622,28 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -6225,7 +5666,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd2.*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6244,11 +5685,6 @@ if test "$_lt_caught_CXX_error" != yes; then gnu*) ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -6273,11 +5709,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6338,7 +5774,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then @@ -6348,10 +5784,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6381,7 +5817,7 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6392,9 +5828,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6423,7 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6460,26 +5896,26 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 and above use weak symbols + *) # Version 6 will use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -6487,7 +5923,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -6506,9 +5942,9 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; - xl* | mpixl* | bgxl*) + xl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6528,13 +5964,13 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6603,7 +6039,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6638,15 +6074,15 @@ if test "$_lt_caught_CXX_error" != yes; then case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6662,17 +6098,17 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6682,7 +6118,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6718,7 +6154,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6739,7 +6175,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6759,14 +6195,14 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6777,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6831,10 +6267,6 @@ if test "$_lt_caught_CXX_error" != yes; then CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6890,7 +6322,6 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6905,29 +6336,6 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6936,7 +6344,6 @@ func_stripname_cnf () # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6986,20 +6393,7 @@ public class foo { } }; _LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF ]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -7011,7 +6405,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -7020,22 +6414,13 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue + else + prev= fi - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) + case $p in + -L* | -R*) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -7055,10 +6440,8 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi - prev= ;; - *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -7094,7 +6477,6 @@ else fi $RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -7131,7 +6513,7 @@ linux*) solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -7175,16 +6557,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], ])# _LT_SYS_HIDDEN_LIBDEPS +# _LT_PROG_F77 +# ------------ +# Since AC_PROG_F77 is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_F77], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +AC_PROG_F77 +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_F77 + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_F77], []) + + # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi +[AC_REQUIRE([_LT_PROG_F77])dnl +AC_LANG_PUSH(Fortran 77) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -7194,6 +6592,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7202,8 +6601,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -7243,9 +6640,7 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} - CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7299,24 +6694,38 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG +# _LT_PROG_FC +# ----------- +# Since AC_PROG_FC is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_FC], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +AC_PROG_FC +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_FC + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_FC], []) + + # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi +[AC_REQUIRE([_LT_PROG_FC])dnl +AC_LANG_PUSH(Fortran) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -7326,6 +6735,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7334,8 +6744,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -7375,9 +6783,7 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} - CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -7433,8 +6839,7 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS + CC="$lt_save_CC" fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -7471,12 +6876,10 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS +lt_save_CC="$CC" lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -7486,8 +6889,6 @@ _LT_CC_BASENAME([$compiler]) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7507,82 +6908,10 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS +CC="$lt_save_CC" ])# _LT_LANG_GCJ_CONFIG -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7614,11 +6943,9 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} -CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7631,8 +6958,7 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS +CC="$lt_save_CC" ])# _LT_LANG_RC_CONFIG @@ -7652,13 +6978,6 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7698,15 +7017,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) # _LT_DECL_SED # ------------ @@ -7800,8 +7110,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7840,162 +7150,208 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) +# _LT_PROG_XSI_SHELLFNS +# --------------------- +# Bourne and XSI compatible variants of some useful shell functions. +m4_defun([_LT_PROG_XSI_SHELLFNS], +[case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi +dnl func_dirname_and_basename +dnl A portable version of this function is already defined in general.m4sh +dnl so there is no need for it here. -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]+=\$[2]" +} +_LT_EOF ;; -esac + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} + +_LT_EOF + ;; + esac ]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/macros/ltmain.sh b/macros/ltmain.sh old mode 100644 new mode 100755 index c2852d8..b36c4ad --- a/macros/ltmain.sh +++ b/macros/ltmain.sh @@ -1,9 +1,9 @@ +# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.4.2 +# ltmain.sh (GNU libtool) 2.2.6 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,57 +32,50 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# MODE-ARGS vary depending on the MODE. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . -PROGRAM=libtool +PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION=2.2.6 TIMESTAMP="" -package_revision=1.3337 +package_revision=1.3012 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -98,15 +91,10 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - # NLS nuisances: We save the old values to restore during execute mode. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -119,28 +107,24 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL $lt_unset CDPATH -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="echo"} +: ${EGREP="/usr/bin/grep -E"} +: ${FGREP="/usr/bin/grep -F"} +: ${GREP="/usr/bin/grep"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} +: ${SED="/opt/local/bin/gsed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -160,27 +144,6 @@ IFS=" $lt_nl" dirname="s,/[^/]*$,," basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -195,183 +158,33 @@ func_basename () # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` } -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# Generated shell functions inserted here. - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" # The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -383,7 +196,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} + IFS=: for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -402,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -439,7 +243,7 @@ opt_warning=: # name if it has been set yet. func_echo () { - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + $ECHO "$progname${mode+: }$mode: $*" } # func_verbose arg... @@ -454,25 +258,18 @@ func_verbose () : } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -529,9 +326,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -581,7 +378,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "X$my_tmpdir" | $Xsed } @@ -595,7 +392,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -622,7 +419,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ + my_arg=`$ECHO "X$1" | $Xsed \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -691,39 +488,15 @@ func_show_eval_locale () fi } -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} + + # func_version # Echo version message to standard output and exit. func_version () { - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -736,28 +509,22 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { + $SED -n '/^# Usage:/,/# -h/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - echo + $ECHO $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. +# func_help +# Echo long help message to standard output and exit. func_help () { - $opt_debug - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -767,18 +534,11 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + }' < "$progpath" + exit $? } # func_missing_arg argname @@ -786,106 +546,63 @@ func_help () # exit_cmd. func_missing_arg () { - $opt_debug - - func_error "missing argument for $1." + func_error "missing argument for $1" exit_cmd=exit } +exit_cmd=: -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation -exit_cmd=: +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -919,16 +636,16 @@ func_config () # Display the features supported by this script. func_features () { - echo "host: $host" + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $ECHO "enable shared libraries" else - echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $ECHO "enable static libraries" else - echo "disable static libraries" + $ECHO "disable static libraries" fi exit $? @@ -975,209 +692,117 @@ func_enable_tag () esac } -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do + # Parse non-mode specific arguments: + while test "$#" -gt 0; do opt="$1" shift + case $opt in - --debug|-x) opt_debug='set -x' + --config) func_config ;; + + --debug) preserve_args="$preserve_args $opt" func_echo "enabling shell trace mode" + opt_debug='set -x' $opt_debug ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" + + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" shift ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac + + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" shift ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here shift ;; - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} shift ;; - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; esac done - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -1185,44 +810,82 @@ func_enable_tag "$optarg" opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ;; esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + exit $EXIT_MISMATCH + fi +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } +## ----------- ## +## Main. ## +## ----------- ## +$opt_help || { + # Sanity checks first: + func_check_version_match - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$mode' for more information." +} -## ----------- ## -## Main. ## -## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1287,9 +950,12 @@ func_ltwrapper_executable_p () # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi } # func_ltwrapper_p file @@ -1335,37 +1001,6 @@ func_source () } -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1378,15 +1013,13 @@ func_infer_tag () if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1397,13 +1030,11 @@ func_infer_tag () CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1466,486 +1097,6 @@ EOF } } - -################################################## -# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -################################################## - -# func_convert_core_file_wine_to_w32 ARG -# Helper function used by file name conversion functions when $build is *nix, -# and $host is mingw, cygwin, or some other w32 environment. Relies on a -# correctly configured wine environment available, with the winepath program -# in $build's $PATH. -# -# ARG is the $build file name to be converted to w32 format. -# Result is available in $func_convert_core_file_wine_to_w32_result, and will -# be empty on error (or when ARG is empty) -func_convert_core_file_wine_to_w32 () -{ - $opt_debug - func_convert_core_file_wine_to_w32_result="$1" - if test -n "$1"; then - # Unfortunately, winepath does not exit with a non-zero error code, so we - # are forced to check the contents of stdout. On the other hand, if the - # command is not found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both error code of - # zero AND non-empty stdout, which explains the odd construction: - func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - # func_mode_compile arg... func_mode_compile () { @@ -1986,12 +1137,12 @@ func_mode_compile () ;; -pie | -fpie | -fPIE) - func_append pie_flag " $arg" + pie_flag="$pie_flag $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" + later="$later $arg" continue ;; @@ -2012,14 +1163,15 @@ func_mode_compile () save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_append_quoted lastarg "$arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - func_append base_compile " $lastarg" + base_compile="$base_compile $lastarg" continue ;; @@ -2035,7 +1187,8 @@ func_mode_compile () esac # case $arg_mode # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in @@ -2060,7 +1213,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx) func_xform "$libobj" libobj=$func_xform_result ;; @@ -2135,7 +1288,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -2166,16 +1319,17 @@ compiler." $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - func_append removelist " $output_obj" + removelist="$removelist $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" + removelist="$removelist $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -2195,7 +1349,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - func_append command " -o $lobj" + command="$command -o $lobj" fi func_show_eval_locale "$command" \ @@ -2242,11 +1396,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - func_append command " -o $obj" + command="$command -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" + command="$command$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -2291,13 +1445,13 @@ compiler." } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $opt_mode in + case $mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -2328,11 +1482,10 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -2385,7 +1538,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -2405,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -2435,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -2473,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" ;; esac - echo + $ECHO $ECHO "Try \`$progname --help' for more information about other modes." + + exit $? } -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help # func_mode_execute arg... @@ -2523,16 +1643,13 @@ func_mode_execute () func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $opt_dlopen; do + for file in $execute_dlfiles; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -2554,7 +1671,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" + dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -2595,7 +1712,7 @@ func_mode_execute () for file do case $file in - -* | *.la | *.lo ) ;; + -*) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -2611,7 +1728,8 @@ func_mode_execute () ;; esac # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" done if test "X$opt_dry_run" = Xfalse; then @@ -2636,66 +1754,29 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" + $ECHO "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test "$mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libs= - libdirs= + libdirs="$nonopt" admincmds= - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2705,7 +1786,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " + $opt_dry_run || eval "$cmds" || admincmds="$admincmds $cmds" fi done @@ -2714,55 +1795,53 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + $ECHO + + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test "$mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2773,7 +1852,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2787,12 +1866,7 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac + install_prog="$install_prog$func_quote_for_eval_result" # We need to accept at least all the BSD install flags. dest= @@ -2802,12 +1876,10 @@ func_mode_install () install_type= isdir=no stripme= - no_mode=: for arg do - arg2= if test -n "$dest"; then - func_append files " $dest" + files="$files $dest" dest=$arg continue fi @@ -2815,9 +1887,10 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - if $install_cp; then :; else - prev=$arg - fi + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac ;; -g | -m | -o) prev=$arg @@ -2831,10 +1904,6 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi prev= else dest=$arg @@ -2845,11 +1914,7 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" + install_prog="$install_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2858,13 +1923,6 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2919,13 +1977,10 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - func_append staticlibs " $file" + staticlibs="$staticlibs $file" ;; *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2939,23 +1994,23 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; + *) future_libdirs="$future_libdirs $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - func_append dir "$objdir" + dir="$dir$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2968,9 +2023,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2988,7 +2043,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -3028,7 +2083,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ;; *.lo) @@ -3128,7 +2183,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -3147,7 +2202,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -3166,7 +2221,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -3202,13 +2257,11 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + func_show_eval "$old_striplib $oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3227,7 +2280,7 @@ func_mode_install () fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test "$mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3270,22 +2323,6 @@ func_generate_dlsyms () extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - /* External symbol declarations for the compiler. */\ " @@ -3295,11 +2332,10 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -3335,7 +2371,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -3348,52 +2384,10 @@ extern \"C\" { func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } done $opt_dry_run || { @@ -3421,19 +2415,36 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac + + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist +$lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -3446,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -3473,7 +2484,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3489,7 +2500,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; + *) symtab_cflags="$symtab_cflags $arg" ;; esac done @@ -3504,16 +2515,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -3527,8 +2538,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi } @@ -3538,7 +2549,6 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -3549,11 +2559,9 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ / I /{ @@ -3582,131 +2590,6 @@ func_win32_libid () $ECHO "$win32_libid_type" } -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} # func_extract_an_archive dir oldlib @@ -3715,18 +2598,7 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -3797,7 +2669,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -3812,30 +2684,25 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" } -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. + +# func_emit_wrapper_part1 [arg=no] # -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () { - func_emit_wrapper_arg1=${1-no} + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 + fi $ECHO "\ #! $SHELL @@ -3851,6 +2718,7 @@ func_emit_wrapper () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -3881,135 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $ECHO "\ # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -4019,13 +2783,30 @@ func_exec_program () esac fi - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done +" +} +# end: func_emit_wrapper_part1 + +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -4033,7 +2814,7 @@ func_exec_program () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -4088,18 +2869,6 @@ func_exec_program () if test -f \"\$progdir/\$program\"; then" - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -4108,28 +2877,253 @@ func_exec_program () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var " fi + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } +# end: func_emit_wrapper_part2 + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} + + +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -4147,71 +3141,41 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. + + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. */ EOF cat <<"EOF" -#ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif #include #include #ifdef _MSC_VER # include # include # include +# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); +# endif # endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ #endif +#include +#include +#include +#include +#include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4228,7 +3192,14 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -/* path handling portability macros */ +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif + #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -4259,6 +3230,10 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -4271,13 +3246,22 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} #else -static int lt_debug = 0; +# define LTWRAPPER_DEBUGPRINTF(args) #endif -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ +const char *program_name = NULL; void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -4287,27 +3271,41 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); +void lt_fatal (const char *message, ...); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); + +static const char *script_text_part1 = +EOF + + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); for (i = 0; i < newargc; i++) { - lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", - i, nonnull (newargz[i])); + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); } EOF @@ -4523,14 +3560,11 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ - newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - lt_debugprintf (__FILE__, __LINE__, - "(main) failed to launch target \"%s\": %s\n", - lt_argv_zero, nonnull (strerror (errno))); + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); return 127; } return rval; @@ -4552,7 +3586,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal (__FILE__, __LINE__, "memory exhausted"); + lt_fatal ("Memory exhausted"); return p; } @@ -4586,8 +3620,8 @@ check_executable (const char *path) { struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4604,8 +3638,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4631,8 +3665,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -4685,8 +3719,7 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -4711,8 +3744,7 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -4738,9 +3770,8 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -4762,9 +3793,8 @@ chase_symlinks (const char *pathspec) } else { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); } } XFREE (tmp_pathspec); @@ -4777,8 +3807,7 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); + lt_fatal ("Could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -4804,25 +3833,11 @@ strendzap (char *str, const char *pat) return str; } -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, +lt_error_core (int exit_status, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + fprintf (stderr, "%s: %s: ", program_name, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -4831,32 +3846,20 @@ lt_error_core (int exit_status, const char *file, } void -lt_fatal (const char *file, int line, const char *message, ...) +lt_fatal (const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); va_end (ap); } -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - void lt_setenv (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -4901,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; + + p = strchr (arg, (int)'='); + + if (!p) + return 1; + + *value = xstrdup (++p); + + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; + + return 0; +} + +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } + + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + void lt_update_exe_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4925,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4937,158 +4023,11 @@ lt_update_lib_path (const char *name, const char *value) } } -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} EOF } # end: func_emit_cwrapperexe_src -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - # func_mode_link arg... func_mode_link () { @@ -5133,7 +4072,6 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no - bindir= dlfiles= dlprefiles= dlself=no @@ -5226,11 +4164,6 @@ func_mode_link () esac case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -5262,9 +4195,9 @@ func_mode_link () ;; *) if test "$prev" = dlfiles; then - func_append dlfiles " $arg" + dlfiles="$dlfiles $arg" else - func_append dlprefiles " $arg" + dlprefiles="$dlprefiles $arg" fi prev= continue @@ -5288,7 +4221,7 @@ func_mode_link () *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ;; esac ;; @@ -5307,7 +4240,7 @@ func_mode_link () moreargs= for fil in `cat "$save_arg"` do -# func_append moreargs " $fil" +# moreargs="$moreargs $fil" arg=$fil # A libtool-controlled object. @@ -5336,7 +4269,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5348,7 +4281,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5418,12 +4351,12 @@ func_mode_link () if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) func_append rpath " $arg" ;; + *) rpath="$rpath $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) func_append xrpath " $arg" ;; + *) xrpath="$xrpath $arg" ;; esac fi prev= @@ -5435,28 +4368,28 @@ func_mode_link () continue ;; weak) - func_append weak_libs " $arg" + weak_libs="$weak_libs $arg" prev= continue ;; xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - func_append compiler_flags " $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -5492,11 +4425,6 @@ func_mode_link () continue ;; - -bindir) - prev=bindir - continue - ;; - -dlopen) prev=dlfiles continue @@ -5547,16 +4475,15 @@ func_mode_link () ;; -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -5568,30 +4495,24 @@ func_mode_link () ;; esac case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; + *" -L$dir "*) ;; *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; + *) dllsearchpath="$dllsearchpath:$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -5601,7 +4522,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) # These systems don't actually have a C or math library (as such) continue ;; @@ -5615,7 +4536,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -5635,7 +4556,7 @@ func_mode_link () ;; esac fi - func_append deplibs " $arg" + deplibs="$deplibs $arg" continue ;; @@ -5647,22 +4568,21 @@ func_mode_link () # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" + -model|-arch|-isysroot) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; esac continue ;; @@ -5729,17 +4649,13 @@ func_mode_link () # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac continue ;; @@ -5792,8 +4708,8 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5808,9 +4724,9 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5838,27 +4754,23 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - func_append compiler_flags " $arg" + compiler_flags="$compiler_flags $arg" continue ;; @@ -5870,7 +4782,7 @@ func_mode_link () *.$objext) # A standard object. - func_append objs " $arg" + objs="$objs $arg" ;; *.lo) @@ -5901,7 +4813,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5913,7 +4825,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5958,25 +4870,24 @@ func_mode_link () *.$libext) # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" continue ;; *.la) # A libtool-controlled library. - func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" + dlfiles="$dlfiles $arg" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" + dlprefiles="$dlprefiles $arg" prev= else - func_append deplibs " $func_resolve_sysroot_result" + deplibs="$deplibs $arg" fi continue ;; @@ -6014,7 +4925,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` else shlib_search_path= fi @@ -6023,8 +4934,6 @@ func_mode_link () func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -6045,12 +4954,12 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append libs " $deplib" + libs="$libs $deplib" done if test "$linkmode" = lib; then @@ -6063,9 +4972,9 @@ func_mode_link () if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; esac - func_append pre_post_deps " $pre_post_dep" + pre_post_deps="$pre_post_deps $pre_post_dep" done fi pre_post_deps= @@ -6124,10 +5033,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6135,19 +5041,17 @@ func_mode_link () for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= - func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; + *.la) func_source "$lib" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` case " $weak_libs " in *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; + *) deplibs="$deplibs $deplib" ;; esac done done @@ -6163,17 +5067,16 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append compiler_flags " $deplib" + compiler_flags="$compiler_flags $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6258,7 +5161,7 @@ func_mode_link () if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6271,8 +5174,7 @@ func_mode_link () test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; prog) if test "$pass" = conv; then @@ -6286,8 +5188,7 @@ func_mode_link () finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -6298,21 +5199,17 @@ func_mode_link () -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result + dir=$func_stripname_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; + *.la) lib="$deplib" ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -6330,7 +5227,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -6340,15 +5237,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - echo + $ECHO $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -6375,11 +5272,11 @@ func_mode_link () if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - func_append newdlprefiles " $deplib" + newdlprefiles="$newdlprefiles $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append newdlfiles " $deplib" + newdlfiles="$newdlfiles $deplib" fi fi continue @@ -6421,20 +5318,20 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi if test "$pass" = conv; then @@ -6445,36 +5342,30 @@ func_mode_link () func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done continue fi # $pass = conv # Get the name of the library we link against. linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi + for l in $old_library $library_names; do + linklib="$l" + done if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -6491,9 +5382,9 @@ func_mode_link () # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" + dlprefiles="$dlprefiles $lib $dependency_libs" else - func_append newdlfiles " $lib" + newdlfiles="$newdlfiles $lib" fi continue fi # $pass = dlopen @@ -6515,14 +5406,14 @@ func_mode_link () # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir="$libdir" + absdir="$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -6530,12 +5421,12 @@ func_mode_link () dir="$ladir" absdir="$abs_ladir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -6546,46 +5437,20 @@ func_mode_link () if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi fi # $pass = dlpreopen if test -z "$libdir"; then @@ -6603,7 +5468,7 @@ func_mode_link () if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" + newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -6616,8 +5481,7 @@ func_mode_link () for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; esac # Need to link against all dependency_libs? @@ -6628,12 +5492,12 @@ func_mode_link () # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $deplib" + tmp_libs="$tmp_libs $deplib" done # for deplib continue fi # $linkmode = prog... @@ -6648,7 +5512,7 @@ func_mode_link () # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; + *) temp_rpath="$temp_rpath$absdir:" ;; esac fi @@ -6660,7 +5524,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6669,7 +5533,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6694,12 +5558,12 @@ func_mode_link () case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=no ;; *) if test "$installed" = no; then - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi ;; @@ -6716,7 +5580,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo + $ECHO if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -6734,7 +5598,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6743,7 +5607,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6797,7 +5661,7 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= @@ -6819,9 +5683,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -6848,12 +5712,12 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6875,7 +5739,7 @@ func_mode_link () if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -6889,13 +5753,13 @@ func_mode_link () test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= @@ -6909,7 +5773,7 @@ func_mode_link () elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -6926,7 +5790,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6961,21 +5825,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo + $ECHO $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -7003,46 +5867,37 @@ func_mode_link () temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; + *) xrpath="$xrpath $temp_xrpath";; esac;; - *) func_append temp_deplibs " $libdir";; + *) temp_deplibs="$temp_deplibs $libdir";; esac done dependency_libs="$temp_deplibs" fi - func_append newlib_search_path " $absdir" + newlib_search_path="$newlib_search_path $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $func_resolve_sysroot_result" + tmp_libs="$tmp_libs $deplib" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do - path= case $deplib in -L*) path="$deplib" ;; *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -7069,8 +5924,8 @@ func_mode_link () if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -7103,7 +5958,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -7120,7 +5975,7 @@ func_mode_link () for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; + *) lib_search_path="$lib_search_path $dir" ;; esac done newlib_search_path= @@ -7178,10 +6033,10 @@ func_mode_link () -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -7197,7 +6052,7 @@ func_mode_link () ;; esac if test -n "$i" ; then - func_append tmp_libs " $i" + tmp_libs="$tmp_libs $i" fi done dependency_libs=$tmp_libs @@ -7238,7 +6093,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - func_append objs "$old_deplibs" + objs="$objs$old_deplibs" ;; lib) @@ -7271,10 +6126,10 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" + libobjs="$libobjs $objs" fi fi @@ -7333,14 +6188,13 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in - # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|qnx|sunos) + freebsd-aout|freebsd-elf|sunos) current="$number_major" revision="$number_minor" age="0" @@ -7352,9 +6206,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) @@ -7453,7 +6304,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) # correct to gnu/linux during the next big refactor + linux) func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -7476,7 +6327,7 @@ func_mode_link () done # Make executables depend on our current version. - func_append verstring ":${current}.0" + verstring="$verstring:${current}.0" ;; qnx) @@ -7544,10 +6395,10 @@ func_mode_link () fi func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" + libobjs="$libobjs $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$opt_mode" != relink; then + if test "$mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7563,7 +6414,7 @@ func_mode_link () continue fi fi - func_append removelist " $p" + removelist="$removelist $p" ;; *) ;; esac @@ -7574,28 +6425,27 @@ func_mode_link () # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" + oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" + temp_xrpath="$temp_xrpath -R$libdir" case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -7609,7 +6459,7 @@ func_mode_link () for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; + *) dlfiles="$dlfiles $lib" ;; esac done @@ -7619,19 +6469,19 @@ func_mode_link () for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; + *) dlprefiles="$dlprefiles $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -7648,7 +6498,7 @@ func_mode_link () *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" + deplibs="$deplibs -lc" fi ;; esac @@ -7697,7 +6547,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7708,21 +6558,21 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which I believe you do not have" - echo "*** because a test_compile did reveal that the linker did not use it for" - echo "*** its dynamic dependency list that programs get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which I believe you do not have" + $ECHO "*** because a test_compile did reveal that the linker did not use it for" + $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7740,7 +6590,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7751,29 +6601,29 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because a test_compile did reveal that the linker did not use this one" - echo "*** as a dynamic dependency that programs can get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because a test_compile did reveal that the linker did not use this one" + $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $ECHO "*** make it link in! You will probably need to install it or some" + $ECHO "*** library that it depends on before this library will be fully" + $ECHO "*** functional. Installing it before continuing would be even better." fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7790,27 +6640,15 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` - if test -n "$file_magic_glob"; then - libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` - else - libnameglob=$libname - fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then - shopt -s nocaseglob - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7827,13 +6665,13 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7842,12 +6680,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -7858,7 +6696,7 @@ EOF ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. @@ -7874,7 +6712,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac @@ -7885,9 +6723,9 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7896,12 +6734,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -7912,32 +6750,32 @@ EOF ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` done fi - case $tmp_deplibs in - *[!\ \ ]*) - echo + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $ECHO "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $ECHO "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - ;; - esac + fi ;; esac versuffix=$versuffix_save @@ -7949,23 +6787,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -7975,16 +6813,16 @@ EOF build_libtool_libs=no fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -8001,9 +6839,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8016,7 +6854,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8026,10 +6864,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done deplibs="$new_libs" @@ -8041,22 +6879,15 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -8065,18 +6896,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" + dep_rpath="$dep_rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi done @@ -8084,13 +6915,17 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -8098,7 +6933,7 @@ EOF fi shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8124,18 +6959,18 @@ EOF linknames= for link do - func_append linknames " $link" + linknames="$linknames $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" + delfiles="$delfiles $export_symbols" fi orig_export_symbols= @@ -8166,45 +7001,13 @@ EOF $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do + for cmd in $cmds; do IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -8226,7 +7029,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -8238,7 +7041,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8248,7 +7051,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - func_append tmp_deplibs " $test_deplib" + tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done @@ -8268,21 +7071,21 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" + linker_flags="$linker_flags $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -8327,8 +7130,7 @@ EOF save_libobjs=$libobjs fi save_output=$output - func_basename "$output" - output_la=$func_basename_result + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -8341,16 +7143,13 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output + $ECHO 'INPUT (' > $output for obj in $save_libobjs do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result + $ECHO ')' >> $output + delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -8364,12 +7163,10 @@ EOF fi for obj do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -8393,19 +7190,17 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" else # All subsequent reloadable object files will link in # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" + objlist=$obj func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -8415,12 +7210,11 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - func_append delfiles " $output" + delfiles="$delfiles $output" else output= @@ -8454,7 +7248,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8475,7 +7269,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -8487,7 +7281,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8528,10 +7322,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -8547,7 +7341,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8559,7 +7353,7 @@ EOF IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8640,21 +7434,18 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -8714,8 +7505,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac @@ -8726,14 +7517,14 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8747,7 +7538,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8757,17 +7548,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done compile_deplibs="$new_libs" - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -8775,7 +7566,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done fi @@ -8794,18 +7585,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi case $host in @@ -8814,12 +7605,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; + *) dllsearchpath="$dllsearchpath:$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -8845,18 +7636,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; esac fi done @@ -8870,8 +7661,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -8883,15 +7674,15 @@ EOF wrappers_required=yes case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -8900,19 +7691,13 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8935,7 +7720,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8943,7 +7728,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8953,18 +7738,11 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - exit $EXIT_SUCCESS fi @@ -8979,7 +7757,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -8991,19 +7769,13 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Now create the wrapper script. func_verbose "creating $output" @@ -9021,7 +7793,18 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -9101,7 +7884,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" + oldobjs="$oldobjs $symfileobj" fi fi addlibs="$old_convenience" @@ -9109,10 +7892,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. @@ -9123,10 +7906,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -9142,9 +7925,9 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - echo "copying selected object files to avoid basename conflicts..." + $ECHO "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -9168,30 +7951,18 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" ;; - *) func_append oldobjs " $obj" ;; + *) oldobjs="$oldobjs $obj" ;; esac done fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -9265,7 +8036,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -9285,23 +8056,12 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" + newdependency_libs="$newdependency_libs $libdir/$name" ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -9315,9 +8075,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + newdlfiles="$newdlfiles $libdir/$name" ;; - *) func_append newdlfiles " $lib" ;; + *) newdlfiles="$newdlfiles $lib" ;; esac done dlfiles="$newdlfiles" @@ -9334,7 +8094,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + newdlprefiles="$newdlprefiles $libdir/$name" ;; esac done @@ -9346,7 +8106,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlfiles " $abs" + newdlfiles="$newdlfiles $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -9355,33 +8115,15 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlprefiles " $abs" + newdlprefiles="$newdlprefiles $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -9440,7 +8182,7 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && +{ test "$mode" = link || test "$mode" = relink; } && func_mode_link ${1+"$@"} @@ -9460,9 +8202,9 @@ func_mode_uninstall () for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; + *) files="$files $arg" ;; esac done @@ -9471,23 +8213,24 @@ func_mode_uninstall () rmdirs= + origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - odir="$objdir" + objdir="$origobjdir" else - odir="$dir/$objdir" + objdir="$dir/$origobjdir" fi func_basename "$file" name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + test "$mode" = uninstall && objdir="$dir" - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + # Remember objdir for removal later, being careful to avoid duplicates + if test "$mode" = clean; then case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; + *" $objdir "*) ;; + *) rmdirs="$rmdirs $objdir" ;; esac fi @@ -9513,17 +8256,18 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - func_append rmfiles " $odir/$n" + rmfiles="$rmfiles $objdir/$n" done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - case "$opt_mode" in + case "$mode" in clean) - case " $library_names " in + case " $library_names " in + # " " in the beginning catches empty $dlname *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -9551,19 +8295,19 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" + rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" + rmfiles="$rmfiles $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test "$mode" = clean ; then noexename=$name case $file in *.exe) @@ -9573,7 +8317,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - func_append rmfiles " $file" + rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. @@ -9582,7 +8326,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -9590,12 +8334,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" + rmfiles="$rmfiles $objdir/lt-$name" fi if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + rmfiles="$rmfiles $objdir/lt-${noexename}.c" fi fi fi @@ -9603,6 +8347,7 @@ func_mode_uninstall () esac func_show_eval "$RM $rmfiles" 'exit_status=1' done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -9614,16 +8359,16 @@ func_mode_uninstall () exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && +{ test "$mode" = uninstall || test "$mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$opt_mode" && { +test -z "$mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/macros/ltoptions.m4 b/macros/ltoptions.m4 index 5d9acd8..34151a3 100644 --- a/macros/ltoptions.m4 +++ b/macros/ltoptions.m4 @@ -1,14 +1,13 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 6 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -134,13 +133,13 @@ case $host in esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl +_LT_DECL([], [AS], [0], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@ -326,24 +325,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [AS_HELP_STRING([--with-pic], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], + [pic_mode="$withval"], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/macros/ltversion.m4 b/macros/ltversion.m4 index 07a8602..b8e154f 100644 --- a/macros/ltversion.m4 +++ b/macros/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# @configure_input@ +# Generated from ltversion.in. -# serial 3337 ltversion.m4 +# serial 3012 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.2.6]) +m4_define([LT_PACKAGE_REVISION], [1.3012]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.2.6' +macro_revision='1.3012' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/macros/lt~obsolete.m4 b/macros/lt~obsolete.m4 index c573da9..637bb20 100644 --- a/macros/lt~obsolete.m4 +++ b/macros/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 5 lt~obsolete.m4 +# serial 4 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -- 2.7.4
    xmlpp::SaxParser::AttributeHasName::AttributeHasName xmlpp::SaxParser::AttributeHasName::AttributeHasName ( Glib::ustring const &  n)